mirror/kissfft
1
0
Fork 0
mirror of https://github.com/mborgerding/kissfft.git synced 2025-05-27 21:20:27 -04:00
Code Issues Packages Projects Releases Wiki Activity

changed tabs to spaces for consistency and fix compiler warnings. Removed assert call (would require assert.h inclusion somewhere).

Browse Source
This commit is contained in:
Mark Borgerding 2020-04-19 10:02:16 -04:00
parent 07ccd8162e
commit e53d6d4bea
5 changed files with 29 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
_kiss_fft_guts.h
View File

@ -55,8 +55,8 @@ struct kiss_fft_state{
#if defined(CHECK_OVERFLOW) #if defined(CHECK_OVERFLOW)
# define CHECK_OVERFLOW_OP(a,op,b) \ # define CHECK_OVERFLOW_OP(a,op,b) \
if ( (SAMPPROD)(a) op (SAMPPROD)(b) > SAMP_MAX || (SAMPPROD)(a) op (SAMPPROD)(b) < SAMP_MIN ) { \ 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) ); } fprintf(stderr,"WARNING:overflow @ " __FILE__ "(%d): (%d " #op" %d) = %ld\n",__LINE__,(a),(b),(SAMPPROD)(a) op (SAMPPROD)(b) ); }
#endif #endif
@ -70,11 +70,11 @@ struct kiss_fft_state{
(m).i = sround( smul((a).r,(b).i) + smul((a).i,(b).r) ); }while(0) (m).i = sround( smul((a).r,(b).i) + smul((a).i,(b).r) ); }while(0)
# define DIVSCALAR(x,k) \ # define DIVSCALAR(x,k) \
(x) = sround( smul( x, SAMP_MAX/k ) ) (x) = sround( smul( x, SAMP_MAX/k ) )
# define C_FIXDIV(c,div) \ # define C_FIXDIV(c,div) \
do { DIVSCALAR( (c).r , div); \ do { DIVSCALAR( (c).r , div); \
DIVSCALAR( (c).i , div); }while (0) DIVSCALAR( (c).i , div); }while (0)
# define C_MULBYSCALAR( c, s ) \ # define C_MULBYSCALAR( c, s ) \
do{ (c).r = sround( smul( (c).r , s ) ) ;\ do{ (c).r = sround( smul( (c).r , s ) ) ;\
@ -98,28 +98,28 @@ struct kiss_fft_state{
#define C_ADD( res, a,b)\ #define C_ADD( res, a,b)\
do { \ do { \
CHECK_OVERFLOW_OP((a).r,+,(b).r)\ CHECK_OVERFLOW_OP((a).r,+,(b).r)\
CHECK_OVERFLOW_OP((a).i,+,(b).i)\ CHECK_OVERFLOW_OP((a).i,+,(b).i)\
(res).r=(a).r+(b).r; (res).i=(a).i+(b).i; \ (res).r=(a).r+(b).r; (res).i=(a).i+(b).i; \
}while(0) }while(0)
#define C_SUB( res, a,b)\ #define C_SUB( res, a,b)\
do { \ do { \
CHECK_OVERFLOW_OP((a).r,-,(b).r)\ CHECK_OVERFLOW_OP((a).r,-,(b).r)\
CHECK_OVERFLOW_OP((a).i,-,(b).i)\ CHECK_OVERFLOW_OP((a).i,-,(b).i)\
(res).r=(a).r-(b).r; (res).i=(a).i-(b).i; \ (res).r=(a).r-(b).r; (res).i=(a).i-(b).i; \
}while(0) }while(0)
#define C_ADDTO( res , a)\ #define C_ADDTO( res , a)\
do { \ do { \
CHECK_OVERFLOW_OP((res).r,+,(a).r)\ CHECK_OVERFLOW_OP((res).r,+,(a).r)\
CHECK_OVERFLOW_OP((res).i,+,(a).i)\ CHECK_OVERFLOW_OP((res).i,+,(a).i)\
(res).r += (a).r; (res).i += (a).i;\ (res).r += (a).r; (res).i += (a).i;\
}while(0) }while(0)
#define C_SUBFROM( res , a)\ #define C_SUBFROM( res , a)\
do {\ do {\
CHECK_OVERFLOW_OP((res).r,-,(a).r)\ CHECK_OVERFLOW_OP((res).r,-,(a).r)\
CHECK_OVERFLOW_OP((res).i,-,(a).i)\ CHECK_OVERFLOW_OP((res).i,-,(a).i)\
(res).r -= (a).r; (res).i -= (a).i; \ (res).r -= (a).r; (res).i -= (a).i; \
}while(0) }while(0)
@ -138,10 +138,10 @@ struct kiss_fft_state{
#endif #endif
#define kf_cexp(x,phase) \ #define kf_cexp(x,phase) \
do{ \ do{ \
(x)->r = KISS_FFT_COS(phase);\ (x)->r = KISS_FFT_COS(phase);\
(x)->i = KISS_FFT_SIN(phase);\ (x)->i = KISS_FFT_SIN(phase);\
}while(0) }while(0)
/* a debugging function */ /* a debugging function */

2
kiss_fft.c
View File

@ -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_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; kiss_fft_cfg st=NULL;
size_t memneeded = KISS_FFT_ALIGN_SIZE_UP(sizeof(struct kiss_fft_state) size_t memneeded = KISS_FFT_ALIGN_SIZE_UP(sizeof(struct kiss_fft_state)

2
kiss_fft.h
View File

@ -37,7 +37,7 @@ extern "C" {
# define kiss_fft_scalar __m128 # define kiss_fft_scalar __m128
# ifndef KISS_FFT_MALLOC # ifndef KISS_FFT_MALLOC
# define KISS_FFT_MALLOC(nbytes) _mm_malloc(nbytes,16) # 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) # define KISS_FFT_ALIGN_SIZE_UP(size) ((size + 15UL) & ~0xFUL)
# endif # endif
# ifndef KISS_FFT_FREE # ifndef KISS_FFT_FREE

4
tools/kiss_fftnd.c
View File

@ -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_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; kiss_fftnd_cfg st = NULL;
int i; int i;
@ -47,7 +47,7 @@ kiss_fftnd_cfg kiss_fftnd_alloc(const int *dims,int ndims,int inverse_fft,void*m
if (!ptr) if (!ptr)
return NULL; /*malloc failed or buffer too small */ return NULL; /*malloc failed or buffer too small */
st = (kiss_fftnd_cfg) ptr; st = (kiss_fftnd_cfg) ptr;
st->dimprod = dimprod; st->dimprod = dimprod;
st->ndims = ndims; st->ndims = ndims;
ptr += KISS_FFT_ALIGN_SIZE_UP(sizeof(struct kiss_fftnd_state)); ptr += KISS_FFT_ALIGN_SIZE_UP(sizeof(struct kiss_fftnd_state));

6
tools/kiss_fftndr.c
View File

@ -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_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; kiss_fftndr_cfg st = NULL;
size_t nr=0 , nd=0,ntmp=0; size_t nr=0 , nd=0,ntmp=0;
int dimReal = dims[ndims-1]; int dimReal = dims[ndims-1];
int dimOther = prod(dims,ndims-1); int dimOther = prod(dims,ndims-1);
size_t memneeded; size_t memneeded;
char * ptr = NULL; char * ptr = NULL;
(void)kiss_fftr_alloc(dimReal,inverse_fft,NULL,&nr); (void)kiss_fftr_alloc(dimReal,inverse_fft,NULL,&nr);
(void)kiss_fftnd_alloc(dims,ndims-1,inverse_fft,NULL,&nd); (void)kiss_fftnd_alloc(dims,ndims-1,inverse_fft,NULL,&nd);
@ -56,7 +56,7 @@ kiss_fftndr_cfg kiss_fftndr_alloc(const int *dims,int ndims,int inverse_fft,void
if (ptr==NULL) if (ptr==NULL)
return NULL; return NULL;
st = (kiss_fftndr_cfg) ptr; st = (kiss_fftndr_cfg) ptr;
memset( st , 0 , memneeded); memset( st , 0 , memneeded);
ptr += KISS_FFT_ALIGN_SIZE_UP(sizeof(struct kiss_fftndr_state)); ptr += KISS_FFT_ALIGN_SIZE_UP(sizeof(struct kiss_fftndr_state));