aboutsummaryrefslogtreecommitdiff
path: root/src/0x7c0x7c0x7e.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/0x7c0x7c0x7e.c')
-rw-r--r--src/0x7c0x7c0x7e.c178
1 files changed, 97 insertions, 81 deletions
diff --git a/src/0x7c0x7c0x7e.c b/src/0x7c0x7c0x7e.c
index e0cc4dd..f31fba0 100644
--- a/src/0x7c0x7c0x7e.c
+++ b/src/0x7c0x7c0x7e.c
@@ -1,4 +1,4 @@
-/*
+/*
* ||~: logical OR for signals
*
* (c) 1999-2011 IOhannes m zmölnig, forum::für::umläute, institute of electronic music and acoustics (iem)
@@ -7,12 +7,12 @@
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License along
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
@@ -22,14 +22,12 @@
/* ----------------------------- oror_tilde ----------------------------- */
static t_class *oror_tilde_class, *scalaroror_tilde_class;
-typedef struct _oror_tilde
-{
+typedef struct _oror_tilde {
t_object x_obj;
t_float x_f;
} t_oror_tilde;
-typedef struct _scalaroror_tilde
-{
+typedef struct _scalaroror_tilde {
t_object x_obj;
t_float x_f;
t_float x_g; /* inlet value */
@@ -37,24 +35,24 @@ typedef struct _scalaroror_tilde
static void *oror_tilde_new(t_symbol* UNUSED(s), int argc, t_atom *argv)
{
- if (argc > 1) post("||~: extra arguments ignored");
- if (argc)
- {
- t_scalaroror_tilde *x = (t_scalaroror_tilde *)pd_new(scalaroror_tilde_class);
- floatinlet_new(&x->x_obj, &x->x_g);
- x->x_g = atom_getfloatarg(0, argc, argv);
- outlet_new(&x->x_obj, gensym("signal"));
- x->x_f = 0;
- return (x);
- }
- else
- {
- t_oror_tilde *x = (t_oror_tilde *)pd_new(oror_tilde_class);
- inlet_new(&x->x_obj, &x->x_obj.ob_pd, gensym("signal"), gensym("signal"));
- outlet_new(&x->x_obj, gensym("signal"));
- x->x_f = 0;
- return (x);
- }
+ if (argc > 1) {
+ post("||~: extra arguments ignored");
+ }
+ if (argc) {
+ t_scalaroror_tilde *x = (t_scalaroror_tilde *)pd_new(
+ scalaroror_tilde_class);
+ floatinlet_new(&x->x_obj, &x->x_g);
+ x->x_g = atom_getfloatarg(0, argc, argv);
+ outlet_new(&x->x_obj, gensym("signal"));
+ x->x_f = 0;
+ return (x);
+ } else {
+ t_oror_tilde *x = (t_oror_tilde *)pd_new(oror_tilde_class);
+ inlet_new(&x->x_obj, &x->x_obj.ob_pd, gensym("signal"), gensym("signal"));
+ outlet_new(&x->x_obj, gensym("signal"));
+ x->x_f = 0;
+ return (x);
+ }
}
static t_int *oror_tilde_perform(t_int *w)
@@ -63,7 +61,9 @@ static t_int *oror_tilde_perform(t_int *w)
t_float *in2 = (t_float *)(w[2]);
t_float *out = (t_float *)(w[3]);
int n = (int)(w[4]);
- while (n--) *out++ = (int)*in1++ || (int)*in2++;
+ while (n--) {
+ *out++ = (int)*in1++ || (int)*in2++;
+ }
return (w+5);
}
@@ -73,17 +73,22 @@ static t_int *oror_tilde_perf8(t_int *w)
t_float *in2 = (t_float *)(w[2]);
t_float *out = (t_float *)(w[3]);
int n = (int)(w[4]);
- for (; n; n -= 8, in1 += 8, in2 += 8, out += 8)
- {
- int f0 = in1[0], f1 = in1[1], f2 = in1[2], f3 = in1[3];
- int f4 = in1[4], f5 = in1[5], f6 = in1[6], f7 = in1[7];
-
- int g0 = in2[0], g1 = in2[1], g2 = in2[2], g3 = in2[3];
- int g4 = in2[4], g5 = in2[5], g6 = in2[6], g7 = in2[7];
-
- out[0] = f0 || g0; out[1] = f1 || g1; out[2] = f2 || g2; out[3] = f3 || g3;
- out[4] = f4 || g4; out[5] = f5 || g5; out[6] = f6 || g6; out[7] = f7 || g7;
- }
+ for (; n; n -= 8, in1 += 8, in2 += 8, out += 8) {
+ int f0 = in1[0], f1 = in1[1], f2 = in1[2], f3 = in1[3];
+ int f4 = in1[4], f5 = in1[5], f6 = in1[6], f7 = in1[7];
+
+ int g0 = in2[0], g1 = in2[1], g2 = in2[2], g3 = in2[3];
+ int g4 = in2[4], g5 = in2[5], g6 = in2[6], g7 = in2[7];
+
+ out[0] = f0 || g0;
+ out[1] = f1 || g1;
+ out[2] = f2 || g2;
+ out[3] = f3 || g3;
+ out[4] = f4 || g4;
+ out[5] = f5 || g5;
+ out[6] = f6 || g6;
+ out[7] = f7 || g7;
+ }
return (w+5);
}
@@ -93,7 +98,9 @@ static t_int *scalaroror_tilde_perform(t_int *w)
int f = *(t_float *)(w[2]);
t_float *out = (t_float *)(w[3]);
int n = (int)(w[4]);
- while (n--) *out++ = (int)*in++ || f;
+ while (n--) {
+ *out++ = (int)*in++ || f;
+ }
return (w+5);
}
@@ -103,14 +110,19 @@ static t_int *scalaroror_tilde_perf8(t_int *w)
int g = *(t_float *)(w[2]);
t_float *out = (t_float *)(w[3]);
int n = (int)(w[4]);
- for (; n; n -= 8, in += 8, out += 8)
- {
- int f0 = in[0], f1 = in[1], f2 = in[2], f3 = in[3];
- int f4 = in[4], f5 = in[5], f6 = in[6], f7 = in[7];
-
- out[0] = f0 || g; out[1] = f1 || g; out[2] = f2 || g; out[3] = f3 || g;
- out[4] = f4 || g; out[5] = f5 || g; out[6] = f6 || g; out[7] = f7 || g;
- }
+ for (; n; n -= 8, in += 8, out += 8) {
+ int f0 = in[0], f1 = in[1], f2 = in[2], f3 = in[3];
+ int f4 = in[4], f5 = in[5], f6 = in[6], f7 = in[7];
+
+ out[0] = f0 || g;
+ out[1] = f1 || g;
+ out[2] = f2 || g;
+ out[3] = f3 || g;
+ out[4] = f4 || g;
+ out[5] = f5 || g;
+ out[6] = f6 || g;
+ out[7] = f7 || g;
+ }
return (w+5);
}
@@ -149,7 +161,7 @@ static t_int *oror_tilde_performSSE(t_int *w)
in1+=4;
in2+=4;
out+=4;
- }
+ }
return (w+5);
}
@@ -200,21 +212,21 @@ static void oror_tilde_dsp(t_oror_tilde* UNUSED(x), t_signal **sp)
#ifdef __SSE__
if(
- 0 && /* disabled for now since SSE2 code not compatible with [||] */
- Z_SIMD_CHKBLOCKSIZE(n)&&
- Z_SIMD_CHKALIGN(in1)&&
- Z_SIMD_CHKALIGN(in2)&&
- Z_SIMD_CHKALIGN(out)&&
- ZEXY_TYPE_EQUAL(t_sample, float)
- )
- {
- dsp_add(oror_tilde_performSSE, 4, in1, in2, out, n);
- } else
+ 0 && /* disabled for now since SSE2 code not compatible with [||] */
+ Z_SIMD_CHKBLOCKSIZE(n)&&
+ Z_SIMD_CHKALIGN(in1)&&
+ Z_SIMD_CHKALIGN(in2)&&
+ Z_SIMD_CHKALIGN(out)&&
+ ZEXY_TYPE_EQUAL(t_sample, float)
+ ) {
+ dsp_add(oror_tilde_performSSE, 4, in1, in2, out, n);
+ } else
#endif
- if(n&7)
- dsp_add(oror_tilde_perform, 4, in1, in2, out, n);
- else
- dsp_add(oror_tilde_perf8, 4, in1, in2, out, n);
+ if(n&7) {
+ dsp_add(oror_tilde_perform, 4, in1, in2, out, n);
+ } else {
+ dsp_add(oror_tilde_perf8, 4, in1, in2, out, n);
+ }
}
static void scalaroror_tilde_dsp(t_scalaroror_tilde *x, t_signal **sp)
@@ -225,19 +237,19 @@ static void scalaroror_tilde_dsp(t_scalaroror_tilde *x, t_signal **sp)
#ifdef __SSE__
if(
- Z_SIMD_CHKBLOCKSIZE(n)&&
- Z_SIMD_CHKALIGN(in)&&
- Z_SIMD_CHKALIGN(out)&&
- ZEXY_TYPE_EQUAL(t_sample, float)
- )
- {
- dsp_add(scalaroror_tilde_performSSE, 4, in, &x->x_g, out, n);
- } else
+ Z_SIMD_CHKBLOCKSIZE(n)&&
+ Z_SIMD_CHKALIGN(in)&&
+ Z_SIMD_CHKALIGN(out)&&
+ ZEXY_TYPE_EQUAL(t_sample, float)
+ ) {
+ dsp_add(scalaroror_tilde_performSSE, 4, in, &x->x_g, out, n);
+ } else
#endif
- if (n&7)
- dsp_add(scalaroror_tilde_perform, 4, in, &x->x_g, out, n);
- else
- dsp_add(scalaroror_tilde_perf8, 4, in, &x->x_g, out, n);
+ if (n&7) {
+ dsp_add(scalaroror_tilde_perform, 4, in, &x->x_g, out, n);
+ } else {
+ dsp_add(scalaroror_tilde_perf8, 4, in, &x->x_g, out, n);
+ }
}
static void oror_tilde_help(t_object*x)
@@ -248,18 +260,22 @@ static void oror_tilde_help(t_object*x)
void setup_0x7c0x7c0x7e(void)
{
oror_tilde_class = class_new(gensym("||~"), (t_newmethod)oror_tilde_new, 0,
- sizeof(t_oror_tilde), 0, A_GIMME, 0);
- class_addmethod(oror_tilde_class, (t_method)oror_tilde_dsp, gensym("dsp"), 0);
+ sizeof(t_oror_tilde), 0, A_GIMME, 0);
+ class_addmethod(oror_tilde_class, (t_method)oror_tilde_dsp, gensym("dsp"),
+ 0);
CLASS_MAINSIGNALIN(oror_tilde_class, t_oror_tilde, x_f);
- class_addmethod (oror_tilde_class, (t_method)oror_tilde_help, gensym("help"), A_NULL);
+ class_addmethod (oror_tilde_class, (t_method)oror_tilde_help,
+ gensym("help"), A_NULL);
class_sethelpsymbol(oror_tilde_class, gensym("zigbinops"));
scalaroror_tilde_class = class_new(gensym("||~"), 0, 0,
- sizeof(t_scalaroror_tilde), 0, 0);
+ sizeof(t_scalaroror_tilde), 0, 0);
CLASS_MAINSIGNALIN(scalaroror_tilde_class, t_scalaroror_tilde, x_f);
- class_addmethod(scalaroror_tilde_class, (t_method)scalaroror_tilde_dsp, gensym("dsp"),
- 0);
- class_addmethod (scalaroror_tilde_class, (t_method)oror_tilde_help, gensym("help"), A_NULL);
+ class_addmethod(scalaroror_tilde_class, (t_method)scalaroror_tilde_dsp,
+ gensym("dsp"),
+ 0);
+ class_addmethod (scalaroror_tilde_class, (t_method)oror_tilde_help,
+ gensym("help"), A_NULL);
class_sethelpsymbol(scalaroror_tilde_class, gensym("zigbinops"));
zexy_register("||~");
@@ -268,6 +284,6 @@ void setup_0x7c0x7c0x7e(void)
#ifndef ZEXY_LIBRARY
void setup(void)
{
- setup_0x7c0x7c0x7e();
+ setup_0x7c0x7c0x7e();
}
#endif