this repo has no description
changed tabs to spaces for consistency and fix compiler warnings. Removed assert call (would require assert.h inclusion somewhere).
+29
-29
+21
-21
_kiss_fft_guts.h
+21
-21
_kiss_fft_guts.h
···
55
55
56
56
#if defined(CHECK_OVERFLOW)
57
57
# define CHECK_OVERFLOW_OP(a,op,b) \
58
-
if ( (SAMPPROD)(a) op (SAMPPROD)(b) > SAMP_MAX || (SAMPPROD)(a) op (SAMPPROD)(b) < SAMP_MIN ) { \
59
-
fprintf(stderr,"WARNING:overflow @ " __FILE__ "(%d): (%d " #op" %d) = %ld\n",__LINE__,(a),(b),(SAMPPROD)(a) op (SAMPPROD)(b) ); }
58
+
if ( (SAMPPROD)(a) op (SAMPPROD)(b) > SAMP_MAX || (SAMPPROD)(a) op (SAMPPROD)(b) < SAMP_MIN ) { \
59
+
fprintf(stderr,"WARNING:overflow @ " __FILE__ "(%d): (%d " #op" %d) = %ld\n",__LINE__,(a),(b),(SAMPPROD)(a) op (SAMPPROD)(b) ); }
60
60
#endif
61
61
62
62
···
70
70
(m).i = sround( smul((a).r,(b).i) + smul((a).i,(b).r) ); }while(0)
71
71
72
72
# define DIVSCALAR(x,k) \
73
-
(x) = sround( smul( x, SAMP_MAX/k ) )
73
+
(x) = sround( smul( x, SAMP_MAX/k ) )
74
74
75
75
# define C_FIXDIV(c,div) \
76
-
do { DIVSCALAR( (c).r , div); \
77
-
DIVSCALAR( (c).i , div); }while (0)
76
+
do { DIVSCALAR( (c).r , div); \
77
+
DIVSCALAR( (c).i , div); }while (0)
78
78
79
79
# define C_MULBYSCALAR( c, s ) \
80
80
do{ (c).r = sround( smul( (c).r , s ) ) ;\
···
98
98
99
99
#define C_ADD( res, a,b)\
100
100
do { \
101
-
CHECK_OVERFLOW_OP((a).r,+,(b).r)\
102
-
CHECK_OVERFLOW_OP((a).i,+,(b).i)\
103
-
(res).r=(a).r+(b).r; (res).i=(a).i+(b).i; \
101
+
CHECK_OVERFLOW_OP((a).r,+,(b).r)\
102
+
CHECK_OVERFLOW_OP((a).i,+,(b).i)\
103
+
(res).r=(a).r+(b).r; (res).i=(a).i+(b).i; \
104
104
}while(0)
105
105
#define C_SUB( res, a,b)\
106
106
do { \
107
-
CHECK_OVERFLOW_OP((a).r,-,(b).r)\
108
-
CHECK_OVERFLOW_OP((a).i,-,(b).i)\
109
-
(res).r=(a).r-(b).r; (res).i=(a).i-(b).i; \
107
+
CHECK_OVERFLOW_OP((a).r,-,(b).r)\
108
+
CHECK_OVERFLOW_OP((a).i,-,(b).i)\
109
+
(res).r=(a).r-(b).r; (res).i=(a).i-(b).i; \
110
110
}while(0)
111
111
#define C_ADDTO( res , a)\
112
112
do { \
113
-
CHECK_OVERFLOW_OP((res).r,+,(a).r)\
114
-
CHECK_OVERFLOW_OP((res).i,+,(a).i)\
115
-
(res).r += (a).r; (res).i += (a).i;\
113
+
CHECK_OVERFLOW_OP((res).r,+,(a).r)\
114
+
CHECK_OVERFLOW_OP((res).i,+,(a).i)\
115
+
(res).r += (a).r; (res).i += (a).i;\
116
116
}while(0)
117
117
118
118
#define C_SUBFROM( res , a)\
119
119
do {\
120
-
CHECK_OVERFLOW_OP((res).r,-,(a).r)\
121
-
CHECK_OVERFLOW_OP((res).i,-,(a).i)\
122
-
(res).r -= (a).r; (res).i -= (a).i; \
120
+
CHECK_OVERFLOW_OP((res).r,-,(a).r)\
121
+
CHECK_OVERFLOW_OP((res).i,-,(a).i)\
122
+
(res).r -= (a).r; (res).i -= (a).i; \
123
123
}while(0)
124
124
125
125
···
138
138
#endif
139
139
140
140
#define kf_cexp(x,phase) \
141
-
do{ \
142
-
(x)->r = KISS_FFT_COS(phase);\
143
-
(x)->i = KISS_FFT_SIN(phase);\
144
-
}while(0)
141
+
do{ \
142
+
(x)->r = KISS_FFT_COS(phase);\
143
+
(x)->i = KISS_FFT_SIN(phase);\
144
+
}while(0)
145
145
146
146
147
147
/* a debugging function */
+1
-1
kiss_fft.c
+1
-1
kiss_fft.c
+1
-1
kiss_fft.h
+1
-1
kiss_fft.h
···
37
37
# define kiss_fft_scalar __m128
38
38
# ifndef KISS_FFT_MALLOC
39
39
# define KISS_FFT_MALLOC(nbytes) _mm_malloc(nbytes,16)
40
-
# define KISS_FFT_ALIGN_CHECK(ptr) assert((((uintptr_t) ptr) & 0xF) == 0);
40
+
# define KISS_FFT_ALIGN_CHECK(ptr)
41
41
# define KISS_FFT_ALIGN_SIZE_UP(size) ((size + 15UL) & ~0xFUL)
42
42
# endif
43
43
# ifndef KISS_FFT_FREE
+2
-2
tools/kiss_fftnd.c
+2
-2
tools/kiss_fftnd.c
···
19
19
20
20
kiss_fftnd_cfg kiss_fftnd_alloc(const int *dims,int ndims,int inverse_fft,void*mem,size_t*lenmem)
21
21
{
22
-
KISS_FFT_ALIGN_CHECK(mem)
22
+
KISS_FFT_ALIGN_CHECK(mem)
23
23
24
24
kiss_fftnd_cfg st = NULL;
25
25
int i;
···
47
47
if (!ptr)
48
48
return NULL; /*malloc failed or buffer too small */
49
49
50
-
st = (kiss_fftnd_cfg) ptr;
50
+
st = (kiss_fftnd_cfg) ptr;
51
51
st->dimprod = dimprod;
52
52
st->ndims = ndims;
53
53
ptr += KISS_FFT_ALIGN_SIZE_UP(sizeof(struct kiss_fftnd_state));
+4
-4
tools/kiss_fftndr.c
+4
-4
tools/kiss_fftndr.c
···
29
29
30
30
kiss_fftndr_cfg kiss_fftndr_alloc(const int *dims,int ndims,int inverse_fft,void*mem,size_t*lenmem)
31
31
{
32
-
KISS_FFT_ALIGN_CHECK(mem)
32
+
KISS_FFT_ALIGN_CHECK(mem)
33
33
34
34
kiss_fftndr_cfg st = NULL;
35
35
size_t nr=0 , nd=0,ntmp=0;
36
36
int dimReal = dims[ndims-1];
37
37
int dimOther = prod(dims,ndims-1);
38
38
size_t memneeded;
39
-
char * ptr = NULL;
39
+
char * ptr = NULL;
40
40
41
41
(void)kiss_fftr_alloc(dimReal,inverse_fft,NULL,&nr);
42
42
(void)kiss_fftnd_alloc(dims,ndims-1,inverse_fft,NULL,&nd);
···
55
55
}
56
56
if (ptr==NULL)
57
57
return NULL;
58
-
59
-
st = (kiss_fftndr_cfg) ptr;
58
+
59
+
st = (kiss_fftndr_cfg) ptr;
60
60
memset( st , 0 , memneeded);
61
61
ptr += KISS_FFT_ALIGN_SIZE_UP(sizeof(struct kiss_fftndr_state));
62
62