aboutsummaryrefslogtreecommitdiff
path: root/pd/src/d_global.c
diff options
context:
space:
mode:
Diffstat (limited to 'pd/src/d_global.c')
-rw-r--r--pd/src/d_global.c158
1 files changed, 104 insertions, 54 deletions
diff --git a/pd/src/d_global.c b/pd/src/d_global.c
index d764ee1b..ea6615be 100644
--- a/pd/src/d_global.c
+++ b/pd/src/d_global.c
@@ -7,7 +7,7 @@
#include "m_pd.h"
#include <string.h>
-#define DEFSENDVS 64 /* LATER get send to get this from canvas */
+#define DEFSENDVS 64 /* LATER get send to get this from canvas */
/* ----------------------------- send~ ----------------------------- */
static t_class *sigsend_class;
@@ -40,9 +40,9 @@ static t_int *sigsend_perform(t_int *w)
int n = (int)(w[3]);
while (n--)
{
- *out = (PD_BADFLOAT(*in) ? 0 : *in);
- out++;
- in++;
+ *out = (PD_BIGORSMALL(*in) ? 0 : *in);
+ out++;
+ in++;
}
return (w+4);
}
@@ -50,7 +50,7 @@ static t_int *sigsend_perform(t_int *w)
static void sigsend_dsp(t_sigsend *x, t_signal **sp)
{
if (x->x_n == sp[0]->s_n)
- dsp_add(sigsend_perform, 3, sp[0]->s_vec, x->x_vec, sp[0]->s_n);
+ dsp_add(sigsend_perform, 3, sp[0]->s_vec, x->x_vec, sp[0]->s_n);
else error("sigsend %s: unexpected vector size", x->x_sym->s_name);
}
@@ -63,7 +63,7 @@ static void sigsend_free(t_sigsend *x)
static void sigsend_setup(void)
{
sigsend_class = class_new(gensym("send~"), (t_newmethod)sigsend_new,
- (t_method)sigsend_free, sizeof(t_sigsend), 0, A_DEFSYM, 0);
+ (t_method)sigsend_free, sizeof(t_sigsend), 0, A_DEFSYM, 0);
class_addcreator((t_newmethod)sigsend_new, gensym("s~"), A_DEFSYM, 0);
CLASS_MAINSIGNALIN(sigsend_class, t_sigsend, x_f);
class_addmethod(sigsend_class, (t_method)sigsend_dsp, gensym("dsp"), 0);
@@ -83,7 +83,7 @@ typedef struct _sigreceive
static void *sigreceive_new(t_symbol *s)
{
t_sigreceive *x = (t_sigreceive *)pd_new(sigreceive_class);
- x->x_n = DEFSENDVS; /* LATER find our vector size correctly */
+ x->x_n = DEFSENDVS; /* LATER find our vector size correctly */
x->x_sym = s;
x->x_wherefrom = 0;
outlet_new(&x->x_obj, &s_signal);
@@ -98,13 +98,39 @@ static t_int *sigreceive_perform(t_int *w)
t_float *in = x->x_wherefrom;
if (in)
{
- while (n--)
- *out++ = *in++;
+ while (n--)
+ *out++ = *in++;
}
else
{
- while (n--)
- *out++ = 0;
+ while (n--)
+ *out++ = 0;
+ }
+ return (w+4);
+}
+
+/* tb: vectorized receive function */
+static t_int *sigreceive_perf8(t_int *w)
+{
+ t_sigreceive *x = (t_sigreceive *)(w[1]);
+ t_float *out = (t_float *)(w[2]);
+ int n = (int)(w[3]);
+ t_float *in = x->x_wherefrom;
+ if (in)
+ {
+ for (; n; n -= 8, in += 8, out += 8)
+ {
+ out[0] = in[0]; out[1] = in[1]; out[2] = in[2]; out[3] = in[3];
+ out[4] = in[4]; out[5] = in[5]; out[6] = in[6]; out[7] = in[7];
+ }
+ }
+ else
+ {
+ for (; n; n -= 8, in += 8, out += 8)
+ {
+ out[0] = 0; out[1] = 0; out[2] = 0; out[3] = 0;
+ out[4] = 0; out[5] = 0; out[6] = 0; out[7] = 0;
+ }
}
return (w+4);
}
@@ -112,21 +138,21 @@ static t_int *sigreceive_perform(t_int *w)
static void sigreceive_set(t_sigreceive *x, t_symbol *s)
{
t_sigsend *sender = (t_sigsend *)pd_findbyclass((x->x_sym = s),
- sigsend_class);
+ sigsend_class);
if (sender)
{
- if (sender->x_n == x->x_n)
- x->x_wherefrom = sender->x_vec;
- else
- {
- pd_error(x, "receive~ %s: vector size mismatch", x->x_sym->s_name);
- x->x_wherefrom = 0;
- }
+ if (sender->x_n == x->x_n)
+ x->x_wherefrom = sender->x_vec;
+ else
+ {
+ pd_error(x, "receive~ %s: vector size mismatch", x->x_sym->s_name);
+ x->x_wherefrom = 0;
+ }
}
else
{
- pd_error(x, "receive~ %s: no matching send", x->x_sym->s_name);
- x->x_wherefrom = 0;
+ pd_error(x, "receive~ %s: no matching send", x->x_sym->s_name);
+ x->x_wherefrom = 0;
}
}
@@ -134,26 +160,29 @@ static void sigreceive_dsp(t_sigreceive *x, t_signal **sp)
{
if (sp[0]->s_n != x->x_n)
{
- pd_error(x, "receive~ %s: vector size mismatch", x->x_sym->s_name);
+ pd_error(x, "receive~ %s: vector size mismatch", x->x_sym->s_name);
}
else
{
- sigreceive_set(x, x->x_sym);
- dsp_add(sigreceive_perform, 3,
- x, sp[0]->s_vec, sp[0]->s_n);
+ sigreceive_set(x, x->x_sym);
+ if (sp[0]->s_n&7)
+ dsp_add(sigreceive_perform, 3,
+ x, sp[0]->s_vec, sp[0]->s_n);
+ else dsp_add(sigreceive_perf8, 3,
+ x, sp[0]->s_vec, sp[0]->s_n);
}
}
static void sigreceive_setup(void)
{
sigreceive_class = class_new(gensym("receive~"),
- (t_newmethod)sigreceive_new, 0,
- sizeof(t_sigreceive), 0, A_DEFSYM, 0);
+ (t_newmethod)sigreceive_new, 0,
+ sizeof(t_sigreceive), 0, A_DEFSYM, 0);
class_addcreator((t_newmethod)sigreceive_new, gensym("r~"), A_DEFSYM, 0);
class_addmethod(sigreceive_class, (t_method)sigreceive_set, gensym("set"),
- A_SYMBOL, 0);
+ A_SYMBOL, 0);
class_addmethod(sigreceive_class, (t_method)sigreceive_dsp, gensym("dsp"),
- 0);
+ 0);
class_sethelpsymbol(sigreceive_class, gensym("send~"));
}
@@ -189,10 +218,32 @@ static t_int *sigcatch_perform(t_int *w)
return (w+4);
}
+/* tb: vectorized catch function */
+static t_int *sigcatch_perf8(t_int *w)
+{
+ t_float *in = (t_float *)(w[1]);
+ t_float *out = (t_float *)(w[2]);
+ int n = (int)(w[3]);
+ for (; n; n -= 8, in += 8, out += 8)
+ {
+ out[0] = in[0]; out[1] = in[1]; out[2] = in[2]; out[3] = in[3];
+ out[4] = in[4]; out[5] = in[5]; out[6] = in[6]; out[7] = in[7];
+
+ in[0] = 0; in[1] = 0; in[2] = 0; in[3] = 0;
+ in[4] = 0; in[5] = 0; in[6] = 0; in[7] = 0;
+ }
+ return (w+4);
+}
+
static void sigcatch_dsp(t_sigcatch *x, t_signal **sp)
{
if (x->x_n == sp[0]->s_n)
- dsp_add(sigcatch_perform, 3, x->x_vec, sp[0]->s_vec, sp[0]->s_n);
+ {
+ if(sp[0]->s_n&7)
+ dsp_add(sigcatch_perform, 3, x->x_vec, sp[0]->s_vec, sp[0]->s_n);
+ else
+ dsp_add(sigcatch_perf8, 3, x->x_vec, sp[0]->s_vec, sp[0]->s_n);
+ }
else error("sigcatch %s: unexpected vector size", x->x_sym->s_name);
}
@@ -205,7 +256,7 @@ static void sigcatch_free(t_sigcatch *x)
static void sigcatch_setup(void)
{
sigcatch_class = class_new(gensym("catch~"), (t_newmethod)sigcatch_new,
- (t_method)sigcatch_free, sizeof(t_sigcatch), CLASS_NOINLET, A_DEFSYM, 0);
+ (t_method)sigcatch_free, sizeof(t_sigcatch), CLASS_NOINLET, A_DEFSYM, 0);
class_addmethod(sigcatch_class, (t_method)sigcatch_dsp, gensym("dsp"), 0);
class_sethelpsymbol(sigcatch_class, gensym("throw~"));
}
@@ -240,12 +291,12 @@ static t_int *sigthrow_perform(t_int *w)
t_float *out = x->x_whereto;
if (out)
{
- while (n--)
- {
- *out += (PD_BADFLOAT(*in) ? 0 : *in);
- out++;
- in++;
- }
+ while (n--)
+ {
+ *out += (PD_BIGORSMALL(*in) ? 0 : *in);
+ out++;
+ in++;
+ }
}
return (w+4);
}
@@ -253,21 +304,21 @@ static t_int *sigthrow_perform(t_int *w)
static void sigthrow_set(t_sigthrow *x, t_symbol *s)
{
t_sigcatch *catcher = (t_sigcatch *)pd_findbyclass((x->x_sym = s),
- sigcatch_class);
+ sigcatch_class);
if (catcher)
{
- if (catcher->x_n == x->x_n)
- x->x_whereto = catcher->x_vec;
- else
- {
- pd_error(x, "throw~ %s: vector size mismatch", x->x_sym->s_name);
- x->x_whereto = 0;
- }
+ if (catcher->x_n == x->x_n)
+ x->x_whereto = catcher->x_vec;
+ else
+ {
+ pd_error(x, "throw~ %s: vector size mismatch", x->x_sym->s_name);
+ x->x_whereto = 0;
+ }
}
else
{
- pd_error(x, "throw~ %s: no matching catch", x->x_sym->s_name);
- x->x_whereto = 0;
+ pd_error(x, "throw~ %s: no matching catch", x->x_sym->s_name);
+ x->x_whereto = 0;
}
}
@@ -275,23 +326,22 @@ static void sigthrow_dsp(t_sigthrow *x, t_signal **sp)
{
if (sp[0]->s_n != x->x_n)
{
- pd_error(x, "throw~ %s: vector size mismatch", x->x_sym->s_name);
+ pd_error(x, "throw~ %s: vector size mismatch", x->x_sym->s_name);
}
else
{
- sigthrow_set(x, x->x_sym);
- dsp_add(sigthrow_perform, 3,
- x, sp[0]->s_vec, sp[0]->s_n);
+ sigthrow_set(x, x->x_sym);
+ dsp_add(sigthrow_perform, 3,
+ x, sp[0]->s_vec, sp[0]->s_n);
}
}
static void sigthrow_setup(void)
{
sigthrow_class = class_new(gensym("throw~"), (t_newmethod)sigthrow_new, 0,
- sizeof(t_sigthrow), 0, A_DEFSYM, 0);
- class_addcreator((t_newmethod)sigthrow_new, gensym("r~"), A_DEFSYM, 0);
+ sizeof(t_sigthrow), 0, A_DEFSYM, 0);
class_addmethod(sigthrow_class, (t_method)sigthrow_set, gensym("set"),
- A_SYMBOL, 0);
+ A_SYMBOL, 0);
CLASS_MAINSIGNALIN(sigthrow_class, t_sigthrow, x_f);
class_addmethod(sigthrow_class, (t_method)sigthrow_dsp, gensym("dsp"), 0);
}
generated by cgit v1.2.1 (git 2.18.0) at 2024-06-29 04:07:38 +0000