From 739a8290a8b05645a2d055aed8e5eb76ba2e24e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?IOhannes=20m=20zm=C3=B6lnig?= Date: Fri, 28 Aug 2015 17:55:26 +0000 Subject: one-true indentation svn path=/trunk/externals/zexy/; revision=17537 --- src/sgn~.c | 120 +++++++++++++++++++++++++++++++++++++++++++------------------ 1 file changed, 86 insertions(+), 34 deletions(-) (limited to 'src/sgn~.c') diff --git a/src/sgn~.c b/src/sgn~.c index 5341694..3bba110 100644 --- a/src/sgn~.c +++ b/src/sgn~.c @@ -1,4 +1,4 @@ -/* +/* * sgn~: sign of a signal * * (c) 1999-2011 IOhannes m zmölnig, forum::für::umläute, institute of electronic music and acoustics (iem) @@ -7,20 +7,19 @@ * 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 . */ #include "zexySIMD.h" -typedef struct _sgnTilde -{ +typedef struct _sgnTilde { t_object x_obj; } t_sgnTilde; @@ -37,11 +36,15 @@ static t_int *sgnTilde_perform(t_int *w) t_sample x; while (n--) { x=*in++; - if (x>0.) *out++=1.; - else if (x<0.) *out++=-1.; - else *out++=0.; + if (x>0.) { + *out++=1.; + } else if (x<0.) { + *out++=-1.; + } else { + *out++=0.; + } } - + return (w+4); } static t_int *sgnTilde_perform8(t_int *w) @@ -51,26 +54,74 @@ static t_int *sgnTilde_perform8(t_int *w) int n = (int)(w[3])>>3; t_sample x; - while(n--){ + while(n--) { /* weirdly enough, the if/else/if/else is a lot faster than ()?:(()?:) */ - if ((x=in[0])>0.) out[0]=1.; else if(x<0.) out[0]=-1.; else out[0]=0.; - if ((x=in[1])>0.) out[1]=1.; else if(x<0.) out[1]=-1.; else out[1]=0.; - if ((x=in[2])>0.) out[2]=1.; else if(x<0.) out[2]=-1.; else out[2]=0.; - if ((x=in[3])>0.) out[3]=1.; else if(x<0.) out[3]=-1.; else out[3]=0.; - if ((x=in[4])>0.) out[4]=1.; else if(x<0.) out[4]=-1.; else out[4]=0.; - if ((x=in[5])>0.) out[5]=1.; else if(x<0.) out[5]=-1.; else out[5]=0.; - if ((x=in[6])>0.) out[6]=1.; else if(x<0.) out[6]=-1.; else out[6]=0.; - if ((x=in[7])>0.) out[7]=1.; else if(x<0.) out[7]=-1.; else out[7]=0.; + if ((x=in[0])>0.) { + out[0]=1.; + } else if(x<0.) { + out[0]=-1.; + } else { + out[0]=0.; + } + if ((x=in[1])>0.) { + out[1]=1.; + } else if(x<0.) { + out[1]=-1.; + } else { + out[1]=0.; + } + if ((x=in[2])>0.) { + out[2]=1.; + } else if(x<0.) { + out[2]=-1.; + } else { + out[2]=0.; + } + if ((x=in[3])>0.) { + out[3]=1.; + } else if(x<0.) { + out[3]=-1.; + } else { + out[3]=0.; + } + if ((x=in[4])>0.) { + out[4]=1.; + } else if(x<0.) { + out[4]=-1.; + } else { + out[4]=0.; + } + if ((x=in[5])>0.) { + out[5]=1.; + } else if(x<0.) { + out[5]=-1.; + } else { + out[5]=0.; + } + if ((x=in[6])>0.) { + out[6]=1.; + } else if(x<0.) { + out[6]=-1.; + } else { + out[6]=0.; + } + if ((x=in[7])>0.) { + out[7]=1.; + } else if(x<0.) { + out[7]=-1.; + } else { + out[7]=0.; + } in+=8; out+=8; } - + return (w+4); } #ifdef __SSE__ -static int l_bitmask[]={0x80000000, 0x80000000, 0x80000000, 0x80000000}; /* sign bitmask */ +static int l_bitmask[]= {0x80000000, 0x80000000, 0x80000000, 0x80000000}; /* sign bitmask */ static t_int *sgnTilde_performSSE(t_int *w) { __m128 *in = (__m128 *)(w[1]); @@ -111,17 +162,17 @@ static void sgnTilde_dsp(t_sgnTilde *x, t_signal **sp) { #ifdef __SSE__ if( - Z_SIMD_CHKBLOCKSIZE(sp[0]->s_n) && - Z_SIMD_CHKALIGN(sp[0]->s_vec) && - Z_SIMD_CHKALIGN(sp[1]->s_vec) && - ZEXY_TYPE_EQUAL(t_sample, float) && /* currently SSE2 code is only for float (not for double) */ - zexy_testSSE(sgnTilde_perform, - sgnTilde_performSSE, - 1,1) - ) - { - dsp_add(sgnTilde_performSSE, 3, sp[0]->s_vec, sp[1]->s_vec, sp[0]->s_n); - } else + Z_SIMD_CHKBLOCKSIZE(sp[0]->s_n) && + Z_SIMD_CHKALIGN(sp[0]->s_vec) && + Z_SIMD_CHKALIGN(sp[1]->s_vec) && + ZEXY_TYPE_EQUAL(t_sample, float) + && /* currently SSE2 code is only for float (not for double) */ + zexy_testSSE(sgnTilde_perform, + sgnTilde_performSSE, + 1,1) + ) { + dsp_add(sgnTilde_performSSE, 3, sp[0]->s_vec, sp[1]->s_vec, sp[0]->s_n); + } else #endif if (sp[0]->s_n & 7) { dsp_add(sgnTilde_perform , 3, sp[0]->s_vec, sp[1]->s_vec, sp[0]->s_n); @@ -140,7 +191,7 @@ static void *sgnTilde_new(void) { t_sgnTilde *x = (t_sgnTilde *)pd_new(sgnTilde_class); outlet_new(&x->x_obj, gensym("signal")); - + return (x); } @@ -150,8 +201,9 @@ void sgn_tilde_setup(void) sizeof(t_sgnTilde), 0, A_DEFFLOAT, 0); class_addmethod(sgnTilde_class, nullfn, gensym("signal"), 0); class_addmethod(sgnTilde_class, (t_method)sgnTilde_dsp, gensym("dsp"), 0); - - class_addmethod(sgnTilde_class, (t_method)sgnTilde_helper, gensym("help"), 0); + + class_addmethod(sgnTilde_class, (t_method)sgnTilde_helper, gensym("help"), + 0); class_sethelpsymbol(sgnTilde_class, gensym("zigbinops")); zexy_register("sgn~"); } -- cgit v1.2.1