|
2264
|
1 |
--- audacity-src-1.3.8/lib-src/libnyquist/nyquist/xlisp/xlisp.h-orig 2009-08-05 18:37:53.578806000 -0500
|
|
|
2 |
+++ audacity-src-1.3.8/lib-src/libnyquist/nyquist/xlisp/xlisp.h 2009-08-05 18:39:32.071189000 -0500
|
|
|
3 |
@@ -168,6 +168,14 @@ extern long ptrtoabs();
|
|
|
4 |
#endif
|
|
|
5 |
#endif
|
|
|
6 |
|
|
|
7 |
+#ifdef __sun
|
|
|
8 |
+#if defined (__LITTLE_ENDIAN)
|
|
|
9 |
+#define XL_LITTLE_ENDIAN
|
|
|
10 |
+#else
|
|
|
11 |
+#define XL_BIG_ENDIAN
|
|
|
12 |
+#endif
|
|
|
13 |
+#endif
|
|
|
14 |
+
|
|
|
15 |
/* default important definitions */
|
|
|
16 |
#ifndef NNODES
|
|
|
17 |
#define NNODES 1000
|
|
|
18 |
--- audacity-src-1.3.8/lib-src/libnyquist/nyquist/ffts/src/fftlib.c-orig 2009-08-05 18:55:54.598312000 -0500
|
|
|
19 |
+++ audacity-src-1.3.8/lib-src/libnyquist/nyquist/ffts/src/fftlib.c 2009-08-05 18:58:59.934702000 -0500
|
|
|
20 |
@@ -61,8 +61,8 @@ for (i1 = 0; i1 < Nroot_1; i1++){
|
|
|
21 |
parts of ffts1
|
|
|
22 |
*************************************************/
|
|
|
23 |
|
|
|
24 |
-inline void bitrevR2(float *ioptr, long M, short *BRLow);
|
|
|
25 |
-inline void bitrevR2(float *ioptr, long M, short *BRLow){
|
|
|
26 |
+static inline void bitrevR2(float *ioptr, long M, short *BRLow);
|
|
|
27 |
+static inline void bitrevR2(float *ioptr, long M, short *BRLow){
|
|
|
28 |
/*** bit reverse and first radix 2 stage of forward or inverse fft ***/
|
|
|
29 |
float f0r;
|
|
|
30 |
float f0i;
|
|
|
31 |
@@ -198,8 +198,8 @@ for (; ioptr < iolimit; ioptr += POW2(M/
|
|
|
32 |
};
|
|
|
33 |
}
|
|
|
34 |
|
|
|
35 |
-inline void fft2pt(float *ioptr);
|
|
|
36 |
-inline void fft2pt(float *ioptr){
|
|
|
37 |
+static inline void fft2pt(float *ioptr);
|
|
|
38 |
+static inline void fft2pt(float *ioptr){
|
|
|
39 |
/*** RADIX 2 fft ***/
|
|
|
40 |
float f0r, f0i, f1r, f1i;
|
|
|
41 |
float t0r, t0i;
|
|
|
42 |
@@ -229,8 +229,8 @@ ioptr[3] = f1i;
|
|
|
43 |
}
|
|
|
44 |
|
|
|
45 |
|
|
|
46 |
-inline void fft4pt(float *ioptr);
|
|
|
47 |
-inline void fft4pt(float *ioptr){
|
|
|
48 |
+static inline void fft4pt(float *ioptr);
|
|
|
49 |
+static inline void fft4pt(float *ioptr){
|
|
|
50 |
/*** RADIX 4 fft ***/
|
|
|
51 |
float f0r, f0i, f1r, f1i, f2r, f2i, f3r, f3i;
|
|
|
52 |
float t0r, t0i, t1r, t1i;
|
|
|
53 |
@@ -284,8 +284,8 @@ ioptr[6] = f3r;
|
|
|
54 |
ioptr[7] = f3i;
|
|
|
55 |
}
|
|
|
56 |
|
|
|
57 |
-inline void fft8pt(float *ioptr);
|
|
|
58 |
-inline void fft8pt(float *ioptr){
|
|
|
59 |
+static inline void fft8pt(float *ioptr);
|
|
|
60 |
+static inline void fft8pt(float *ioptr){
|
|
|
61 |
/*** RADIX 8 fft ***/
|
|
|
62 |
float w0r = 1.0/MYROOT2; /* cos(pi/4) */
|
|
|
63 |
float f0r, f0i, f1r, f1i, f2r, f2i, f3r, f3i;
|
|
|
64 |
@@ -403,8 +403,8 @@ ioptr[14] = f6r;
|
|
|
65 |
ioptr[15] = f6i;
|
|
|
66 |
}
|
|
|
67 |
|
|
|
68 |
-inline void bfR2(float *ioptr, long M, long NDiffU);
|
|
|
69 |
-inline void bfR2(float *ioptr, long M, long NDiffU){
|
|
|
70 |
+static inline void bfR2(float *ioptr, long M, long NDiffU);
|
|
|
71 |
+static inline void bfR2(float *ioptr, long M, long NDiffU){
|
|
|
72 |
/*** 2nd radix 2 stage ***/
|
|
|
73 |
unsigned long pos;
|
|
|
74 |
unsigned long posi;
|
|
|
75 |
@@ -512,8 +512,8 @@ for (SameUCnt = NSameU; SameUCnt > 0 ; S
|
|
|
76 |
}
|
|
|
77 |
}
|
|
|
78 |
|
|
|
79 |
-inline void bfR4(float *ioptr, long M, long NDiffU);
|
|
|
80 |
-inline void bfR4(float *ioptr, long M, long NDiffU){
|
|
|
81 |
+static inline void bfR4(float *ioptr, long M, long NDiffU);
|
|
|
82 |
+static inline void bfR4(float *ioptr, long M, long NDiffU){
|
|
|
83 |
/*** 1 radix 4 stage ***/
|
|
|
84 |
unsigned long pos;
|
|
|
85 |
unsigned long posi;
|
|
|
86 |
@@ -721,8 +721,8 @@ f4i = f4i * Two - f6i;
|
|
|
87 |
|
|
|
88 |
}
|
|
|
89 |
|
|
|
90 |
-inline void bfstages(float *ioptr, long M, float *Utbl, long Ustride, long NDiffU, long StageCnt);
|
|
|
91 |
-inline void bfstages(float *ioptr, long M, float *Utbl, long Ustride, long NDiffU, long StageCnt){
|
|
|
92 |
+static inline void bfstages(float *ioptr, long M, float *Utbl, long Ustride, long NDiffU, long StageCnt);
|
|
|
93 |
+static inline void bfstages(float *ioptr, long M, float *Utbl, long Ustride, long NDiffU, long StageCnt){
|
|
|
94 |
/*** RADIX 8 Stages ***/
|
|
|
95 |
unsigned long pos;
|
|
|
96 |
unsigned long posi;
|
|
|
97 |
@@ -1125,8 +1125,8 @@ default:
|
|
|
98 |
parts of iffts1
|
|
|
99 |
*************************************************/
|
|
|
100 |
|
|
|
101 |
-inline void scbitrevR2(float *ioptr, long M, short *BRLow, float scale);
|
|
|
102 |
-inline void scbitrevR2(float *ioptr, long M, short *BRLow, float scale){
|
|
|
103 |
+static inline void scbitrevR2(float *ioptr, long M, short *BRLow, float scale);
|
|
|
104 |
+static inline void scbitrevR2(float *ioptr, long M, short *BRLow, float scale){
|
|
|
105 |
/*** scaled bit reverse and first radix 2 stage forward or inverse fft ***/
|
|
|
106 |
float f0r;
|
|
|
107 |
float f0i;
|
|
|
108 |
@@ -1262,8 +1262,8 @@ for (; ioptr < iolimit; ioptr += POW2(M/
|
|
|
109 |
};
|
|
|
110 |
}
|
|
|
111 |
|
|
|
112 |
-inline void ifft2pt(float *ioptr, float scale);
|
|
|
113 |
-inline void ifft2pt(float *ioptr, float scale){
|
|
|
114 |
+static inline void ifft2pt(float *ioptr, float scale);
|
|
|
115 |
+static inline void ifft2pt(float *ioptr, float scale){
|
|
|
116 |
/*** RADIX 2 ifft ***/
|
|
|
117 |
float f0r, f0i, f1r, f1i;
|
|
|
118 |
float t0r, t0i;
|
|
|
119 |
@@ -1292,8 +1292,8 @@ ioptr[2] = scale*f1r;
|
|
|
120 |
ioptr[3] = scale*f1i;
|
|
|
121 |
}
|
|
|
122 |
|
|
|
123 |
-inline void ifft4pt(float *ioptr, float scale);
|
|
|
124 |
-inline void ifft4pt(float *ioptr, float scale){
|
|
|
125 |
+static inline void ifft4pt(float *ioptr, float scale);
|
|
|
126 |
+static inline void ifft4pt(float *ioptr, float scale){
|
|
|
127 |
/*** RADIX 4 ifft ***/
|
|
|
128 |
float f0r, f0i, f1r, f1i, f2r, f2i, f3r, f3i;
|
|
|
129 |
float t0r, t0i, t1r, t1i;
|
|
|
130 |
@@ -1347,8 +1347,8 @@ ioptr[6] = scale*f3r;
|
|
|
131 |
ioptr[7] = scale*f3i;
|
|
|
132 |
}
|
|
|
133 |
|
|
|
134 |
-inline void ifft8pt(float *ioptr, float scale);
|
|
|
135 |
-inline void ifft8pt(float *ioptr, float scale){
|
|
|
136 |
+static inline void ifft8pt(float *ioptr, float scale);
|
|
|
137 |
+static inline void ifft8pt(float *ioptr, float scale){
|
|
|
138 |
/*** RADIX 8 ifft ***/
|
|
|
139 |
float w0r = 1.0/MYROOT2; /* cos(pi/4) */
|
|
|
140 |
float f0r, f0i, f1r, f1i, f2r, f2i, f3r, f3i;
|
|
|
141 |
@@ -1467,8 +1467,8 @@ ioptr[14] = scale*f6r;
|
|
|
142 |
ioptr[15] = scale*f6i;
|
|
|
143 |
}
|
|
|
144 |
|
|
|
145 |
-inline void ibfR2(float *ioptr, long M, long NDiffU);
|
|
|
146 |
-inline void ibfR2(float *ioptr, long M, long NDiffU){
|
|
|
147 |
+static inline void ibfR2(float *ioptr, long M, long NDiffU);
|
|
|
148 |
+static inline void ibfR2(float *ioptr, long M, long NDiffU){
|
|
|
149 |
/*** 2nd radix 2 stage ***/
|
|
|
150 |
unsigned long pos;
|
|
|
151 |
unsigned long posi;
|
|
|
152 |
@@ -1576,8 +1576,8 @@ for (SameUCnt = NSameU; SameUCnt > 0 ; S
|
|
|
153 |
}
|
|
|
154 |
}
|
|
|
155 |
|
|
|
156 |
-inline void ibfR4(float *ioptr, long M, long NDiffU);
|
|
|
157 |
-inline void ibfR4(float *ioptr, long M, long NDiffU){
|
|
|
158 |
+static inline void ibfR4(float *ioptr, long M, long NDiffU);
|
|
|
159 |
+static inline void ibfR4(float *ioptr, long M, long NDiffU){
|
|
|
160 |
/*** 1 radix 4 stage ***/
|
|
|
161 |
unsigned long pos;
|
|
|
162 |
unsigned long posi;
|
|
|
163 |
@@ -1785,8 +1785,8 @@ f4i = f4i * Two - f6i;
|
|
|
164 |
|
|
|
165 |
}
|
|
|
166 |
|
|
|
167 |
-inline void ibfstages(float *ioptr, long M, float *Utbl, long Ustride, long NDiffU, long StageCnt);
|
|
|
168 |
-inline void ibfstages(float *ioptr, long M, float *Utbl, long Ustride, long NDiffU, long StageCnt){
|
|
|
169 |
+static inline void ibfstages(float *ioptr, long M, float *Utbl, long Ustride, long NDiffU, long StageCnt);
|
|
|
170 |
+static inline void ibfstages(float *ioptr, long M, float *Utbl, long Ustride, long NDiffU, long StageCnt){
|
|
|
171 |
/*** RADIX 8 Stages ***/
|
|
|
172 |
unsigned long pos;
|
|
|
173 |
unsigned long posi;
|
|
|
174 |
@@ -2193,8 +2193,8 @@ default:
|
|
|
175 |
parts of rffts1
|
|
|
176 |
*************************************************/
|
|
|
177 |
|
|
|
178 |
-inline void rfft1pt(float *ioptr);
|
|
|
179 |
-inline void rfft1pt(float *ioptr){
|
|
|
180 |
+static inline void rfft1pt(float *ioptr);
|
|
|
181 |
+static inline void rfft1pt(float *ioptr){
|
|
|
182 |
/*** RADIX 2 rfft ***/
|
|
|
183 |
float f0r, f0i;
|
|
|
184 |
float t0r, t0i;
|
|
|
185 |
@@ -2212,8 +2212,8 @@ ioptr[0] = t0r;
|
|
|
186 |
ioptr[1] = t0i;
|
|
|
187 |
}
|
|
|
188 |
|
|
|
189 |
-inline void rfft2pt(float *ioptr);
|
|
|
190 |
-inline void rfft2pt(float *ioptr){
|
|
|
191 |
+static inline void rfft2pt(float *ioptr);
|
|
|
192 |
+static inline void rfft2pt(float *ioptr){
|
|
|
193 |
/*** RADIX 4 rfft ***/
|
|
|
194 |
float f0r, f0i, f1r, f1i;
|
|
|
195 |
float t0r, t0i;
|
|
|
196 |
@@ -2245,8 +2245,8 @@ ioptr[2] = f1r;
|
|
|
197 |
ioptr[3] = f1i;
|
|
|
198 |
}
|
|
|
199 |
|
|
|
200 |
-inline void rfft4pt(float *ioptr);
|
|
|
201 |
-inline void rfft4pt(float *ioptr){
|
|
|
202 |
+static inline void rfft4pt(float *ioptr);
|
|
|
203 |
+static inline void rfft4pt(float *ioptr){
|
|
|
204 |
/*** RADIX 8 rfft ***/
|
|
|
205 |
float f0r, f0i, f1r, f1i, f2r, f2i, f3r, f3i;
|
|
|
206 |
float t0r, t0i, t1r, t1i;
|
|
|
207 |
@@ -2318,8 +2318,8 @@ ioptr[6] = scale*f3r;
|
|
|
208 |
ioptr[7] = scale*f3i;
|
|
|
209 |
}
|
|
|
210 |
|
|
|
211 |
-inline void rfft8pt(float *ioptr);
|
|
|
212 |
-inline void rfft8pt(float *ioptr){
|
|
|
213 |
+static inline void rfft8pt(float *ioptr);
|
|
|
214 |
+static inline void rfft8pt(float *ioptr){
|
|
|
215 |
/*** RADIX 16 rfft ***/
|
|
|
216 |
float w0r = 1.0/MYROOT2; /* cos(pi/4) */
|
|
|
217 |
float w1r = MYCOSPID8; /* cos(pi/8) */
|
|
|
218 |
@@ -2477,8 +2477,8 @@ ioptr[14] = scale*f6r;
|
|
|
219 |
ioptr[15] = scale*f6i;
|
|
|
220 |
}
|
|
|
221 |
|
|
|
222 |
-inline void frstage(float *ioptr, long M, float *Utbl);
|
|
|
223 |
-inline void frstage(float *ioptr, long M, float *Utbl){
|
|
|
224 |
+static inline void frstage(float *ioptr, long M, float *Utbl);
|
|
|
225 |
+static inline void frstage(float *ioptr, long M, float *Utbl){
|
|
|
226 |
/* Finish RFFT */
|
|
|
227 |
|
|
|
228 |
unsigned long pos;
|
|
|
229 |
@@ -2687,8 +2687,8 @@ default:
|
|
|
230 |
parts of riffts1
|
|
|
231 |
*************************************************/
|
|
|
232 |
|
|
|
233 |
-inline void rifft1pt(float *ioptr, float scale);
|
|
|
234 |
-inline void rifft1pt(float *ioptr, float scale){
|
|
|
235 |
+static inline void rifft1pt(float *ioptr, float scale);
|
|
|
236 |
+static inline void rifft1pt(float *ioptr, float scale){
|
|
|
237 |
/*** RADIX 2 rifft ***/
|
|
|
238 |
float f0r, f0i;
|
|
|
239 |
float t0r, t0i;
|
|
|
240 |
@@ -2706,8 +2706,8 @@ ioptr[0] = scale*t0r;
|
|
|
241 |
ioptr[1] = scale*t0i;
|
|
|
242 |
}
|
|
|
243 |
|
|
|
244 |
-inline void rifft2pt(float *ioptr, float scale);
|
|
|
245 |
-inline void rifft2pt(float *ioptr, float scale){
|
|
|
246 |
+static inline void rifft2pt(float *ioptr, float scale);
|
|
|
247 |
+static inline void rifft2pt(float *ioptr, float scale){
|
|
|
248 |
/*** RADIX 4 rifft ***/
|
|
|
249 |
float f0r, f0i, f1r, f1i;
|
|
|
250 |
float t0r, t0i;
|
|
|
251 |
@@ -2740,8 +2740,8 @@ ioptr[2] = scale*f1r;
|
|
|
252 |
ioptr[3] = scale*f1i;
|
|
|
253 |
}
|
|
|
254 |
|
|
|
255 |
-inline void rifft4pt(float *ioptr, float scale);
|
|
|
256 |
-inline void rifft4pt(float *ioptr, float scale){
|
|
|
257 |
+static inline void rifft4pt(float *ioptr, float scale);
|
|
|
258 |
+static inline void rifft4pt(float *ioptr, float scale){
|
|
|
259 |
/*** RADIX 8 rifft ***/
|
|
|
260 |
float f0r, f0i, f1r, f1i, f2r, f2i, f3r, f3i;
|
|
|
261 |
float t0r, t0i, t1r, t1i;
|
|
|
262 |
@@ -2811,8 +2811,8 @@ ioptr[6] = scale*f3r;
|
|
|
263 |
ioptr[7] = scale*f3i;
|
|
|
264 |
}
|
|
|
265 |
|
|
|
266 |
-inline void rifft8pt(float *ioptr, float scale);
|
|
|
267 |
-inline void rifft8pt(float *ioptr, float scale){
|
|
|
268 |
+static inline void rifft8pt(float *ioptr, float scale);
|
|
|
269 |
+static inline void rifft8pt(float *ioptr, float scale){
|
|
|
270 |
/*** RADIX 16 rifft ***/
|
|
|
271 |
float w0r = 1.0/MYROOT2; /* cos(pi/4) */
|
|
|
272 |
float w1r = MYCOSPID8; /* cos(pi/8) */
|
|
|
273 |
@@ -2968,8 +2968,8 @@ ioptr[14] = scale*f6r;
|
|
|
274 |
ioptr[15] = scale*f6i;
|
|
|
275 |
}
|
|
|
276 |
|
|
|
277 |
-inline void ifrstage(float *ioptr, long M, float *Utbl);
|
|
|
278 |
-inline void ifrstage(float *ioptr, long M, float *Utbl){
|
|
|
279 |
+static inline void ifrstage(float *ioptr, long M, float *Utbl);
|
|
|
280 |
+static inline void ifrstage(float *ioptr, long M, float *Utbl){
|
|
|
281 |
/* Start RIFFT */
|
|
|
282 |
|
|
|
283 |
unsigned long pos;
|
|
|
284 |
--- audacity-src-1.3.8/lib-src/libnyquist/nyquist/xlisp/xldmem.c-orig 2009-08-05 19:00:47.193313000 -0500
|
|
|
285 |
+++ audacity-src-1.3.8/lib-src/libnyquist/nyquist/xlisp/xldmem.c 2009-08-05 19:04:25.638858000 -0500
|
|
|
286 |
@@ -17,6 +17,10 @@
|
|
|
287 |
#include "string.h"
|
|
|
288 |
#include "xlisp.h"
|
|
|
289 |
|
|
|
290 |
+#ifdef __sun
|
|
|
291 |
+#include "alloca.h"
|
|
|
292 |
+#endif
|
|
|
293 |
+
|
|
|
294 |
#ifdef WIN32
|
|
|
295 |
#include "malloc.h" // defines alloca()
|
|
|
296 |
#endif
|