From e53d6d4bea5980d9d117b98ad853809161bc4e9b Mon Sep 17 00:00:00 2001 From: Mark Borgerding Date: Sun, 19 Apr 2020 10:02:16 -0400 Subject: [PATCH] changed tabs to spaces for consistency and fix compiler warnings. Removed assert call (would require assert.h inclusion somewhere). --- _kiss_fft_guts.h | 42 +++++++++++++++++++++--------------------- kiss_fft.c | 2 +- kiss_fft.h | 2 +- tools/kiss_fftnd.c | 4 ++-- tools/kiss_fftndr.c | 8 ++++---- 5 files changed, 29 insertions(+), 29 deletions(-) diff --git a/_kiss_fft_guts.h b/_kiss_fft_guts.h index ed27a3b..3f8fef6 100644 --- a/_kiss_fft_guts.h +++ b/_kiss_fft_guts.h @@ -55,8 +55,8 @@ struct kiss_fft_state{ #if defined(CHECK_OVERFLOW) # define CHECK_OVERFLOW_OP(a,op,b) \ - if ( (SAMPPROD)(a) op (SAMPPROD)(b) > SAMP_MAX || (SAMPPROD)(a) op (SAMPPROD)(b) < SAMP_MIN ) { \ - fprintf(stderr,"WARNING:overflow @ " __FILE__ "(%d): (%d " #op" %d) = %ld\n",__LINE__,(a),(b),(SAMPPROD)(a) op (SAMPPROD)(b) ); } + if ( (SAMPPROD)(a) op (SAMPPROD)(b) > SAMP_MAX || (SAMPPROD)(a) op (SAMPPROD)(b) < SAMP_MIN ) { \ + fprintf(stderr,"WARNING:overflow @ " __FILE__ "(%d): (%d " #op" %d) = %ld\n",__LINE__,(a),(b),(SAMPPROD)(a) op (SAMPPROD)(b) ); } #endif @@ -70,11 +70,11 @@ struct kiss_fft_state{ (m).i = sround( smul((a).r,(b).i) + smul((a).i,(b).r) ); }while(0) # define DIVSCALAR(x,k) \ - (x) = sround( smul( x, SAMP_MAX/k ) ) + (x) = sround( smul( x, SAMP_MAX/k ) ) # define C_FIXDIV(c,div) \ - do { DIVSCALAR( (c).r , div); \ - DIVSCALAR( (c).i , div); }while (0) + do { DIVSCALAR( (c).r , div); \ + DIVSCALAR( (c).i , div); }while (0) # define C_MULBYSCALAR( c, s ) \ do{ (c).r = sround( smul( (c).r , s ) ) ;\ @@ -98,28 +98,28 @@ struct kiss_fft_state{ #define C_ADD( res, a,b)\ do { \ - CHECK_OVERFLOW_OP((a).r,+,(b).r)\ - CHECK_OVERFLOW_OP((a).i,+,(b).i)\ - (res).r=(a).r+(b).r; (res).i=(a).i+(b).i; \ + CHECK_OVERFLOW_OP((a).r,+,(b).r)\ + CHECK_OVERFLOW_OP((a).i,+,(b).i)\ + (res).r=(a).r+(b).r; (res).i=(a).i+(b).i; \ }while(0) #define C_SUB( res, a,b)\ do { \ - CHECK_OVERFLOW_OP((a).r,-,(b).r)\ - CHECK_OVERFLOW_OP((a).i,-,(b).i)\ - (res).r=(a).r-(b).r; (res).i=(a).i-(b).i; \ + CHECK_OVERFLOW_OP((a).r,-,(b).r)\ + CHECK_OVERFLOW_OP((a).i,-,(b).i)\ + (res).r=(a).r-(b).r; (res).i=(a).i-(b).i; \ }while(0) #define C_ADDTO( res , a)\ do { \ - CHECK_OVERFLOW_OP((res).r,+,(a).r)\ - CHECK_OVERFLOW_OP((res).i,+,(a).i)\ - (res).r += (a).r; (res).i += (a).i;\ + CHECK_OVERFLOW_OP((res).r,+,(a).r)\ + CHECK_OVERFLOW_OP((res).i,+,(a).i)\ + (res).r += (a).r; (res).i += (a).i;\ }while(0) #define C_SUBFROM( res , a)\ do {\ - CHECK_OVERFLOW_OP((res).r,-,(a).r)\ - CHECK_OVERFLOW_OP((res).i,-,(a).i)\ - (res).r -= (a).r; (res).i -= (a).i; \ + CHECK_OVERFLOW_OP((res).r,-,(a).r)\ + CHECK_OVERFLOW_OP((res).i,-,(a).i)\ + (res).r -= (a).r; (res).i -= (a).i; \ }while(0) @@ -138,10 +138,10 @@ struct kiss_fft_state{ #endif #define kf_cexp(x,phase) \ - do{ \ - (x)->r = KISS_FFT_COS(phase);\ - (x)->i = KISS_FFT_SIN(phase);\ - }while(0) + do{ \ + (x)->r = KISS_FFT_COS(phase);\ + (x)->i = KISS_FFT_SIN(phase);\ + }while(0) /* a debugging function */ diff --git a/kiss_fft.c b/kiss_fft.c index 9548c4f..073df1c 100644 --- a/kiss_fft.c +++ b/kiss_fft.c @@ -332,7 +332,7 @@ void kf_factor(int n,int * facbuf) * */ kiss_fft_cfg kiss_fft_alloc(int nfft,int inverse_fft,void * mem,size_t * lenmem ) { - KISS_FFT_ALIGN_CHECK(mem) + KISS_FFT_ALIGN_CHECK(mem) kiss_fft_cfg st=NULL; size_t memneeded = KISS_FFT_ALIGN_SIZE_UP(sizeof(struct kiss_fft_state) diff --git a/kiss_fft.h b/kiss_fft.h index 305b015..25bb720 100644 --- a/kiss_fft.h +++ b/kiss_fft.h @@ -37,7 +37,7 @@ extern "C" { # define kiss_fft_scalar __m128 # ifndef KISS_FFT_MALLOC # define KISS_FFT_MALLOC(nbytes) _mm_malloc(nbytes,16) -# define KISS_FFT_ALIGN_CHECK(ptr) assert((((uintptr_t) ptr) & 0xF) == 0); +# define KISS_FFT_ALIGN_CHECK(ptr) # define KISS_FFT_ALIGN_SIZE_UP(size) ((size + 15UL) & ~0xFUL) # endif # ifndef KISS_FFT_FREE diff --git a/tools/kiss_fftnd.c b/tools/kiss_fftnd.c index 1376493..5d5b089 100644 --- a/tools/kiss_fftnd.c +++ b/tools/kiss_fftnd.c @@ -19,7 +19,7 @@ struct kiss_fftnd_state{ kiss_fftnd_cfg kiss_fftnd_alloc(const int *dims,int ndims,int inverse_fft,void*mem,size_t*lenmem) { - KISS_FFT_ALIGN_CHECK(mem) + KISS_FFT_ALIGN_CHECK(mem) kiss_fftnd_cfg st = NULL; int i; @@ -47,7 +47,7 @@ kiss_fftnd_cfg kiss_fftnd_alloc(const int *dims,int ndims,int inverse_fft,void*m if (!ptr) return NULL; /*malloc failed or buffer too small */ - st = (kiss_fftnd_cfg) ptr; + st = (kiss_fftnd_cfg) ptr; st->dimprod = dimprod; st->ndims = ndims; ptr += KISS_FFT_ALIGN_SIZE_UP(sizeof(struct kiss_fftnd_state)); diff --git a/tools/kiss_fftndr.c b/tools/kiss_fftndr.c index bbf24e3..e979d03 100644 --- a/tools/kiss_fftndr.c +++ b/tools/kiss_fftndr.c @@ -29,14 +29,14 @@ static int prod(const int *dims, int ndims) kiss_fftndr_cfg kiss_fftndr_alloc(const int *dims,int ndims,int inverse_fft,void*mem,size_t*lenmem) { - KISS_FFT_ALIGN_CHECK(mem) + KISS_FFT_ALIGN_CHECK(mem) kiss_fftndr_cfg st = NULL; size_t nr=0 , nd=0,ntmp=0; int dimReal = dims[ndims-1]; int dimOther = prod(dims,ndims-1); size_t memneeded; - char * ptr = NULL; + char * ptr = NULL; (void)kiss_fftr_alloc(dimReal,inverse_fft,NULL,&nr); (void)kiss_fftnd_alloc(dims,ndims-1,inverse_fft,NULL,&nd); @@ -55,8 +55,8 @@ kiss_fftndr_cfg kiss_fftndr_alloc(const int *dims,int ndims,int inverse_fft,void } if (ptr==NULL) return NULL; - - st = (kiss_fftndr_cfg) ptr; + + st = (kiss_fftndr_cfg) ptr; memset( st , 0 , memneeded); ptr += KISS_FFT_ALIGN_SIZE_UP(sizeof(struct kiss_fftndr_state));