diff options
30 files changed, 59 insertions, 63 deletions
diff --git a/apps/SOURCES b/apps/SOURCES index 9467914bca..ccc481b07b 100644 --- a/apps/SOURCES +++ b/apps/SOURCES | |||
@@ -94,10 +94,10 @@ dsp.c | |||
94 | enc_config.c | 94 | enc_config.c |
95 | #endif | 95 | #endif |
96 | eq.c | 96 | eq.c |
97 | #if defined(CPU_COLDFIRE) && !defined(SIMULATOR) | 97 | #if defined(CPU_COLDFIRE) |
98 | dsp_cf.S | 98 | dsp_cf.S |
99 | eq_cf.S | 99 | eq_cf.S |
100 | #elif defined(CPU_ARM) && !defined(SIMULATOR) | 100 | #elif defined(CPU_ARM) |
101 | dsp_arm.S | 101 | dsp_arm.S |
102 | eq_arm.S | 102 | eq_arm.S |
103 | #endif | 103 | #endif |
diff --git a/apps/codecs/Tremor/asm_mcf5249.h b/apps/codecs/Tremor/asm_mcf5249.h index 4d7f92c089..7d366fa9ca 100644 --- a/apps/codecs/Tremor/asm_mcf5249.h +++ b/apps/codecs/Tremor/asm_mcf5249.h | |||
@@ -19,7 +19,7 @@ | |||
19 | 19 | ||
20 | #include "os_types.h" | 20 | #include "os_types.h" |
21 | 21 | ||
22 | #if defined(CPU_COLDFIRE) && !defined(SIMULATOR) | 22 | #if defined(CPU_COLDFIRE) |
23 | 23 | ||
24 | /* attribute for 16-byte alignment */ | 24 | /* attribute for 16-byte alignment */ |
25 | #define LINE_ATTR __attribute__ ((aligned (16))) | 25 | #define LINE_ATTR __attribute__ ((aligned (16))) |
diff --git a/apps/codecs/Tremor/floor1.c b/apps/codecs/Tremor/floor1.c index a66e7379d7..5f43d563f0 100644 --- a/apps/codecs/Tremor/floor1.c +++ b/apps/codecs/Tremor/floor1.c | |||
@@ -197,7 +197,7 @@ static vorbis_look_floor *floor1_look(vorbis_dsp_state *vd,vorbis_info_mode *mi, | |||
197 | static int render_point(int x0,int x1,int y0,int y1,int x){ | 197 | static int render_point(int x0,int x1,int y0,int y1,int x){ |
198 | y0&=0x7fff; /* mask off flag */ | 198 | y0&=0x7fff; /* mask off flag */ |
199 | y1&=0x7fff; | 199 | y1&=0x7fff; |
200 | #if defined(CPU_COLDFIRE) && !defined(SIMULATOR) | 200 | #if defined(CPU_COLDFIRE) |
201 | asm volatile ("sub.l %[x0],%[x];" | 201 | asm volatile ("sub.l %[x0],%[x];" |
202 | "sub.l %[y0],%[y1];" | 202 | "sub.l %[y0],%[y1];" |
203 | "sub.l %[x0],%[x1];" | 203 | "sub.l %[x0],%[x1];" |
diff --git a/apps/codecs/Tremor/vorbisfile.c b/apps/codecs/Tremor/vorbisfile.c index 0f39826388..a32d9f2a48 100644 --- a/apps/codecs/Tremor/vorbisfile.c +++ b/apps/codecs/Tremor/vorbisfile.c | |||
@@ -763,7 +763,7 @@ int ov_clear(OggVorbis_File *vf){ | |||
763 | 763 | ||
764 | int ov_open_callbacks(void *f,OggVorbis_File *vf,char *initial,long ibytes, | 764 | int ov_open_callbacks(void *f,OggVorbis_File *vf,char *initial,long ibytes, |
765 | ov_callbacks callbacks){ | 765 | ov_callbacks callbacks){ |
766 | #if defined(CPU_COLDFIRE) && !defined(SIMULATOR) | 766 | #if defined(CPU_COLDFIRE) |
767 | /* this seems to be the closest we get to an init function, let's init emac | 767 | /* this seems to be the closest we get to an init function, let's init emac |
768 | here. rounding is disabled because of MULT31_SHIFT15, which will be | 768 | here. rounding is disabled because of MULT31_SHIFT15, which will be |
769 | inaccurate with rounding in its current incarnation */ | 769 | inaccurate with rounding in its current incarnation */ |
diff --git a/apps/codecs/liba52/a52_internal.h b/apps/codecs/liba52/a52_internal.h index 14e5795146..cd3286b17a 100644 --- a/apps/codecs/liba52/a52_internal.h +++ b/apps/codecs/liba52/a52_internal.h | |||
@@ -141,7 +141,7 @@ typedef int16_t quantizer_t; | |||
141 | #if 0 | 141 | #if 0 |
142 | #define MUL(a,b) ((int)(((int64_t)(a) * (b) + (1 << 29)) >> 30)) | 142 | #define MUL(a,b) ((int)(((int64_t)(a) * (b) + (1 << 29)) >> 30)) |
143 | #define MUL_L(a,b) ((int)(((int64_t)(a) * (b) + (1 << 25)) >> 26)) | 143 | #define MUL_L(a,b) ((int)(((int64_t)(a) * (b) + (1 << 25)) >> 26)) |
144 | #elif defined(CPU_COLDFIRE) && !defined(SIMULATOR) | 144 | #elif defined(CPU_COLDFIRE) |
145 | /* loses 1 bit of accuracy */ | 145 | /* loses 1 bit of accuracy */ |
146 | #define MUL(a, b) \ | 146 | #define MUL(a, b) \ |
147 | ({ \ | 147 | ({ \ |
diff --git a/apps/codecs/liba52/parse.c b/apps/codecs/liba52/parse.c index 18fb901699..2a065b4fc4 100644 --- a/apps/codecs/liba52/parse.c +++ b/apps/codecs/liba52/parse.c | |||
@@ -58,7 +58,7 @@ a52_state_t * a52_init (uint32_t mm_accel) | |||
58 | a52_state_t * state; | 58 | a52_state_t * state; |
59 | int i; | 59 | int i; |
60 | 60 | ||
61 | #if defined(CPU_COLDFIRE) && !defined(SIMULATOR) | 61 | #if defined(CPU_COLDFIRE) |
62 | coldfire_set_macsr(EMAC_FRACTIONAL | EMAC_ROUND | EMAC_SATURATE); | 62 | coldfire_set_macsr(EMAC_FRACTIONAL | EMAC_ROUND | EMAC_SATURATE); |
63 | #endif | 63 | #endif |
64 | /* | 64 | /* |
diff --git a/apps/codecs/libfaad/decoder.c b/apps/codecs/libfaad/decoder.c index 145247784f..2285168253 100644 --- a/apps/codecs/libfaad/decoder.c +++ b/apps/codecs/libfaad/decoder.c | |||
@@ -95,7 +95,7 @@ NeAACDecHandle NEAACDECAPI NeAACDecOpen(void) | |||
95 | uint8_t i; | 95 | uint8_t i; |
96 | NeAACDecHandle hDecoder = NULL; | 96 | NeAACDecHandle hDecoder = NULL; |
97 | 97 | ||
98 | #if defined(CPU_COLDFIRE) && !defined(SIMULATOR) | 98 | #if defined(CPU_COLDFIRE) |
99 | coldfire_set_macsr(EMAC_FRACTIONAL | EMAC_SATURATE); | 99 | coldfire_set_macsr(EMAC_FRACTIONAL | EMAC_SATURATE); |
100 | #endif | 100 | #endif |
101 | 101 | ||
diff --git a/apps/codecs/libfaad/fixed.h b/apps/codecs/libfaad/fixed.h index 7478d2ef0f..da895e81bc 100644 --- a/apps/codecs/libfaad/fixed.h +++ b/apps/codecs/libfaad/fixed.h | |||
@@ -59,7 +59,7 @@ typedef int32_t real_t; | |||
59 | #define Q2_PRECISION (1 << Q2_BITS) | 59 | #define Q2_PRECISION (1 << Q2_BITS) |
60 | #define Q2_CONST(A) (((A) >= 0) ? ((real_t)((A)*(Q2_PRECISION)+0.5)) : ((real_t)((A)*(Q2_PRECISION)-0.5))) | 60 | #define Q2_CONST(A) (((A) >= 0) ? ((real_t)((A)*(Q2_PRECISION)+0.5)) : ((real_t)((A)*(Q2_PRECISION)-0.5))) |
61 | 61 | ||
62 | #if defined(CPU_COLDFIRE) && !defined(SIMULATOR) | 62 | #if defined(CPU_COLDFIRE) |
63 | 63 | ||
64 | static INLINE real_t MUL_F(real_t A, real_t B) | 64 | static INLINE real_t MUL_F(real_t A, real_t B) |
65 | { | 65 | { |
diff --git a/apps/codecs/libffmpegFLAC/decoder.c b/apps/codecs/libffmpegFLAC/decoder.c index 8a1f84c6b6..88fcbfd0bd 100644 --- a/apps/codecs/libffmpegFLAC/decoder.c +++ b/apps/codecs/libffmpegFLAC/decoder.c | |||
@@ -42,9 +42,9 @@ | |||
42 | 42 | ||
43 | #include "decoder.h" | 43 | #include "decoder.h" |
44 | 44 | ||
45 | #if defined(CPU_COLDFIRE) && !defined(SIMULATOR) | 45 | #if defined(CPU_COLDFIRE) |
46 | #include "coldfire.h" | 46 | #include "coldfire.h" |
47 | #elif defined(CPU_ARM) && !defined(SIMULATOR) | 47 | #elif defined(CPU_ARM) |
48 | #include "arm.h" | 48 | #include "arm.h" |
49 | #endif | 49 | #endif |
50 | 50 | ||
@@ -260,11 +260,11 @@ static int decode_subframe_lpc(FLACContext *s, int32_t* decoded, int pred_order) | |||
260 | return -8; | 260 | return -8; |
261 | 261 | ||
262 | if ((s->bps + coeff_prec + av_log2(pred_order)) <= 32) { | 262 | if ((s->bps + coeff_prec + av_log2(pred_order)) <= 32) { |
263 | #if defined(CPU_COLDFIRE) && !defined(SIMULATOR) | 263 | #if defined(CPU_COLDFIRE) |
264 | (void)sum; | 264 | (void)sum; |
265 | lpc_decode_emac(s->blocksize - pred_order, qlevel, pred_order, | 265 | lpc_decode_emac(s->blocksize - pred_order, qlevel, pred_order, |
266 | decoded + pred_order, coeffs); | 266 | decoded + pred_order, coeffs); |
267 | #elif defined(CPU_ARM) && !defined(SIMULATOR) | 267 | #elif defined(CPU_ARM) |
268 | (void)sum; | 268 | (void)sum; |
269 | lpc_decode_arm(s->blocksize - pred_order, qlevel, pred_order, | 269 | lpc_decode_arm(s->blocksize - pred_order, qlevel, pred_order, |
270 | decoded + pred_order, coeffs); | 270 | decoded + pred_order, coeffs); |
@@ -278,7 +278,7 @@ static int decode_subframe_lpc(FLACContext *s, int32_t* decoded, int pred_order) | |||
278 | } | 278 | } |
279 | #endif | 279 | #endif |
280 | } else { | 280 | } else { |
281 | #if defined(CPU_COLDFIRE) && !defined(SIMULATOR) | 281 | #if defined(CPU_COLDFIRE) |
282 | (void)wsum; | 282 | (void)wsum; |
283 | (void)j; | 283 | (void)j; |
284 | lpc_decode_emac_wide(s->blocksize - pred_order, qlevel, pred_order, | 284 | lpc_decode_emac_wide(s->blocksize - pred_order, qlevel, pred_order, |
diff --git a/apps/codecs/libffmpegFLAC/shndec.c b/apps/codecs/libffmpegFLAC/shndec.c index 61b3703188..1afcff6fbe 100644 --- a/apps/codecs/libffmpegFLAC/shndec.c +++ b/apps/codecs/libffmpegFLAC/shndec.c | |||
@@ -82,7 +82,7 @@ static unsigned int get_uint(ShortenContext *s, int k) | |||
82 | return get_ur_golomb_shorten(&s->gb, k); | 82 | return get_ur_golomb_shorten(&s->gb, k); |
83 | } | 83 | } |
84 | 84 | ||
85 | #if defined(CPU_COLDFIRE) && !defined(SIMULATOR) | 85 | #if defined(CPU_COLDFIRE) |
86 | static void coldfire_lshift_samples(int n, int shift, int32_t *samples) ICODE_ATTR_FLAC; | 86 | static void coldfire_lshift_samples(int n, int shift, int32_t *samples) ICODE_ATTR_FLAC; |
87 | static void coldfire_lshift_samples(int n, int shift, int32_t *samples) | 87 | static void coldfire_lshift_samples(int n, int shift, int32_t *samples) |
88 | { | 88 | { |
@@ -132,7 +132,7 @@ static inline void fix_bitshift(ShortenContext *s, int32_t *samples) | |||
132 | /* Wrapped samples don't get bitshifted, so we'll do them during | 132 | /* Wrapped samples don't get bitshifted, so we'll do them during |
133 | the next iteration. */ | 133 | the next iteration. */ |
134 | if (s->bitshift != 0) { | 134 | if (s->bitshift != 0) { |
135 | #if defined(CPU_COLDFIRE) && !defined(SIMULATOR) | 135 | #if defined(CPU_COLDFIRE) |
136 | coldfire_lshift_samples(s->blocksize, s->bitshift, samples - s->nwrap); | 136 | coldfire_lshift_samples(s->blocksize, s->bitshift, samples - s->nwrap); |
137 | #else | 137 | #else |
138 | for (i = -s->nwrap; i < (s->blocksize - s->nwrap); i++) | 138 | for (i = -s->nwrap; i < (s->blocksize - s->nwrap); i++) |
@@ -349,7 +349,7 @@ int shorten_decode_frames(ShortenContext *s, int *nsamples, | |||
349 | 349 | ||
350 | /* Scale the samples for the pcmbuf */ | 350 | /* Scale the samples for the pcmbuf */ |
351 | int scale = SHN_OUTPUT_DEPTH - s->bits_per_sample; | 351 | int scale = SHN_OUTPUT_DEPTH - s->bits_per_sample; |
352 | #if defined(CPU_COLDFIRE) && !defined(SIMULATOR) | 352 | #if defined(CPU_COLDFIRE) |
353 | coldfire_lshift_samples(*nsamples, scale, decoded0 + s->nwrap); | 353 | coldfire_lshift_samples(*nsamples, scale, decoded0 + s->nwrap); |
354 | coldfire_lshift_samples(*nsamples, scale, decoded1 + s->nwrap); | 354 | coldfire_lshift_samples(*nsamples, scale, decoded1 + s->nwrap); |
355 | #else | 355 | #else |
diff --git a/apps/codecs/libmad/global.h b/apps/codecs/libmad/global.h index 1ecfea1c14..38e4aade35 100644 --- a/apps/codecs/libmad/global.h +++ b/apps/codecs/libmad/global.h | |||
@@ -24,9 +24,9 @@ | |||
24 | # ifndef LIBMAD_GLOBAL_H | 24 | # ifndef LIBMAD_GLOBAL_H |
25 | # define LIBMAD_GLOBAL_H | 25 | # define LIBMAD_GLOBAL_H |
26 | 26 | ||
27 | #if defined(CPU_COLDFIRE) && !defined(SIMULATOR) | 27 | #if defined(CPU_COLDFIRE) |
28 | #define FPM_COLDFIRE_EMAC | 28 | #define FPM_COLDFIRE_EMAC |
29 | #elif defined(CPU_ARM) && !defined(SIMULATOR) | 29 | #elif defined(CPU_ARM) |
30 | #define FPM_ARM | 30 | #define FPM_ARM |
31 | #define ASO_IMDCT | 31 | #define ASO_IMDCT |
32 | #else | 32 | #else |
diff --git a/apps/codecs/libmad/layer3.c b/apps/codecs/libmad/layer3.c index 64169a7cbd..38e488ddbb 100644 --- a/apps/codecs/libmad/layer3.c +++ b/apps/codecs/libmad/layer3.c | |||
@@ -46,7 +46,7 @@ | |||
46 | # include "layer3.h" | 46 | # include "layer3.h" |
47 | 47 | ||
48 | /* depending on the cpu "leftshift32" may be supported or not */ | 48 | /* depending on the cpu "leftshift32" may be supported or not */ |
49 | # if defined(CPU_COLDFIRE) && !defined(SIMULATOR) | 49 | # if defined(CPU_COLDFIRE) |
50 | #define MAXLSHIFT 32 | 50 | #define MAXLSHIFT 32 |
51 | #else | 51 | #else |
52 | #define MAXLSHIFT 31 | 52 | #define MAXLSHIFT 31 |
@@ -1569,7 +1569,7 @@ void III_aliasreduce(mad_fixed_t xr[576], int lines) | |||
1569 | # if defined(ASO_ZEROCHECK) | 1569 | # if defined(ASO_ZEROCHECK) |
1570 | if (a | b) { | 1570 | if (a | b) { |
1571 | # endif | 1571 | # endif |
1572 | # if defined(CPU_COLDFIRE) && !defined(SIMULATOR) | 1572 | # if defined(CPU_COLDFIRE) |
1573 | (void)hi, (void)lo; | 1573 | (void)hi, (void)lo; |
1574 | asm volatile ("mac.l %[a], %[csi], %%acc0\n\t" | 1574 | asm volatile ("mac.l %[a], %[csi], %%acc0\n\t" |
1575 | "msac.l %[b], %[cai], %%acc0\n\t" | 1575 | "msac.l %[b], %[cai], %%acc0\n\t" |
@@ -1796,7 +1796,7 @@ void imdct36(mad_fixed_t const x[18], mad_fixed_t y[36]) | |||
1796 | * DESCRIPTION: perform X[18]->x[36] IMDCT | 1796 | * DESCRIPTION: perform X[18]->x[36] IMDCT |
1797 | */ | 1797 | */ |
1798 | 1798 | ||
1799 | # if defined(CPU_COLDFIRE) && !defined(SIMULATOR) | 1799 | # if defined(CPU_COLDFIRE) |
1800 | /* emac optimized imdct36, it is very ugly and i hope to replace it soon. | 1800 | /* emac optimized imdct36, it is very ugly and i hope to replace it soon. |
1801 | * for now it is actually somewhat faster than the stock implementation. | 1801 | * for now it is actually somewhat faster than the stock implementation. |
1802 | */ | 1802 | */ |
@@ -2813,7 +2813,7 @@ void III_imdct_l(mad_fixed_t const X[18], mad_fixed_t z[36], | |||
2813 | * DESCRIPTION: perform IMDCT and windowing for short blocks | 2813 | * DESCRIPTION: perform IMDCT and windowing for short blocks |
2814 | */ | 2814 | */ |
2815 | 2815 | ||
2816 | # if defined(CPU_COLDFIRE) && !defined(SIMULATOR) | 2816 | # if defined(CPU_COLDFIRE) |
2817 | void III_imdct_s(mad_fixed_t const X[18], mad_fixed_t z[36]); | 2817 | void III_imdct_s(mad_fixed_t const X[18], mad_fixed_t z[36]); |
2818 | #else | 2818 | #else |
2819 | 2819 | ||
diff --git a/apps/codecs/libmad/synth.c b/apps/codecs/libmad/synth.c index 2da8f64db7..8613f77f79 100644 --- a/apps/codecs/libmad/synth.c +++ b/apps/codecs/libmad/synth.c | |||
@@ -42,7 +42,7 @@ void mad_synth_init(struct mad_synth *synth) | |||
42 | synth->pcm.samplerate = 0; | 42 | synth->pcm.samplerate = 0; |
43 | synth->pcm.channels = 0; | 43 | synth->pcm.channels = 0; |
44 | synth->pcm.length = 0; | 44 | synth->pcm.length = 0; |
45 | #if defined(CPU_COLDFIRE) && !defined(SIMULATOR) | 45 | #if defined(CPU_COLDFIRE) |
46 | /* init the emac unit here, since this function should always be called | 46 | /* init the emac unit here, since this function should always be called |
47 | before using libmad */ | 47 | before using libmad */ |
48 | coldfire_set_macsr(EMAC_FRACTIONAL | EMAC_SATURATE | EMAC_ROUND); | 48 | coldfire_set_macsr(EMAC_FRACTIONAL | EMAC_SATURATE | EMAC_ROUND); |
diff --git a/apps/codecs/libmusepack/math.h b/apps/codecs/libmusepack/math.h index eb9b0e978a..f9e9d08b08 100644 --- a/apps/codecs/libmusepack/math.h +++ b/apps/codecs/libmusepack/math.h | |||
@@ -68,7 +68,7 @@ typedef mpc_int64_t MPC_SAMPLE_FORMAT_MULTIPLY; | |||
68 | #define MAKE_MPC_SAMPLE(X) (MPC_SAMPLE_FORMAT)((double)(X) * (double)(((mpc_int64_t)1)<<MPC_FIXED_POINT_FRACTPART)) | 68 | #define MAKE_MPC_SAMPLE(X) (MPC_SAMPLE_FORMAT)((double)(X) * (double)(((mpc_int64_t)1)<<MPC_FIXED_POINT_FRACTPART)) |
69 | #define MAKE_MPC_SAMPLE_EX(X,Y) (MPC_SAMPLE_FORMAT)((double)(X) * (double)(((mpc_int64_t)1)<<(Y))) | 69 | #define MAKE_MPC_SAMPLE_EX(X,Y) (MPC_SAMPLE_FORMAT)((double)(X) * (double)(((mpc_int64_t)1)<<(Y))) |
70 | 70 | ||
71 | #if defined(CPU_COLDFIRE) && !defined(SIMULATOR) | 71 | #if defined(CPU_COLDFIRE) |
72 | 72 | ||
73 | #define MPC_MULTIPLY(X,Y) mpc_multiply((X), (Y)) | 73 | #define MPC_MULTIPLY(X,Y) mpc_multiply((X), (Y)) |
74 | #define MPC_MULTIPLY_EX(X,Y,Z) mpc_multiply_ex((X), (Y), (Z)) | 74 | #define MPC_MULTIPLY_EX(X,Y,Z) mpc_multiply_ex((X), (Y), (Z)) |
@@ -158,7 +158,7 @@ static inline MPC_SAMPLE_FORMAT MPC_MULTIPLY_EX(MPC_SAMPLE_FORMAT item1,MPC_SAMP | |||
158 | #ifdef MPC_HAVE_MULHIGH | 158 | #ifdef MPC_HAVE_MULHIGH |
159 | #define MPC_MULTIPLY_FRACT(X,Y) _MulHigh(X,Y) | 159 | #define MPC_MULTIPLY_FRACT(X,Y) _MulHigh(X,Y) |
160 | #else | 160 | #else |
161 | #if defined(CPU_COLDFIRE) && !defined(SIMULATOR) | 161 | #if defined(CPU_COLDFIRE) |
162 | /* loses one bit of accuracy. | 162 | /* loses one bit of accuracy. |
163 | the rest of the macros won't be as easy as this... */ | 163 | the rest of the macros won't be as easy as this... */ |
164 | #define MPC_MULTIPLY_FRACT(X,Y) \ | 164 | #define MPC_MULTIPLY_FRACT(X,Y) \ |
diff --git a/apps/codecs/libmusepack/mpc_decoder.c b/apps/codecs/libmusepack/mpc_decoder.c index 89d7254356..a5a24d6c8a 100644 --- a/apps/codecs/libmusepack/mpc_decoder.c +++ b/apps/codecs/libmusepack/mpc_decoder.c | |||
@@ -1492,7 +1492,7 @@ void mpc_decoder_setup(mpc_decoder *d, mpc_reader *r) | |||
1492 | d->Y_L = Y_L; | 1492 | d->Y_L = Y_L; |
1493 | d->Y_R = Y_R; | 1493 | d->Y_R = Y_R; |
1494 | 1494 | ||
1495 | #if defined(CPU_COLDFIRE)&& !defined(SIMULATOR) | 1495 | #if defined(CPU_COLDFIRE) |
1496 | coldfire_set_macsr(EMAC_FRACTIONAL | EMAC_SATURATE); | 1496 | coldfire_set_macsr(EMAC_FRACTIONAL | EMAC_SATURATE); |
1497 | #endif | 1497 | #endif |
1498 | } | 1498 | } |
diff --git a/apps/codecs/libmusepack/synth_filter.c b/apps/codecs/libmusepack/synth_filter.c index 2b14c26c92..0dabe59150 100644 --- a/apps/codecs/libmusepack/synth_filter.c +++ b/apps/codecs/libmusepack/synth_filter.c | |||
@@ -343,7 +343,7 @@ static void Synthese_Filter_float_internal(MPC_SAMPLE_FORMAT * OutData,MPC_SAMPL | |||
343 | 343 | ||
344 | 344 | ||
345 | 345 | ||
346 | #if defined(CPU_COLDFIRE) && !defined(SIMULATOR) | 346 | #if defined(CPU_COLDFIRE) |
347 | for ( k = 0; k < 32; k++, D += 16, V++ ) { | 347 | for ( k = 0; k < 32; k++, D += 16, V++ ) { |
348 | asm volatile ( | 348 | asm volatile ( |
349 | "movem.l (%[D]), %%d0-%%d3 \n\t" | 349 | "movem.l (%[D]), %%d0-%%d3 \n\t" |
@@ -372,7 +372,7 @@ static void Synthese_Filter_float_internal(MPC_SAMPLE_FORMAT * OutData,MPC_SAMPL | |||
372 | : [Data] "+a" (Data) | 372 | : [Data] "+a" (Data) |
373 | : [V] "a" (V), [D] "a" (D) | 373 | : [V] "a" (V), [D] "a" (D) |
374 | : "d0", "d1", "d2", "d3", "a5"); | 374 | : "d0", "d1", "d2", "d3", "a5"); |
375 | #elif defined(CPU_ARM) && !defined(SIMULATOR) | 375 | #elif defined(CPU_ARM) |
376 | for ( k = 0; k < 32; k++, V++ ) { | 376 | for ( k = 0; k < 32; k++, V++ ) { |
377 | asm volatile ( | 377 | asm volatile ( |
378 | "ldmia %[D]!, { r0-r3 } \n\t" | 378 | "ldmia %[D]!, { r0-r3 } \n\t" |
diff --git a/apps/codecs/libspeex/config-speex.h b/apps/codecs/libspeex/config-speex.h index 10555c7fa8..efdb7dbb54 100644 --- a/apps/codecs/libspeex/config-speex.h +++ b/apps/codecs/libspeex/config-speex.h | |||
@@ -7,7 +7,7 @@ | |||
7 | /* #undef ARM4_ASM */ | 7 | /* #undef ARM4_ASM */ |
8 | 8 | ||
9 | /* Make use of ARM5E assembly optimizations */ | 9 | /* Make use of ARM5E assembly optimizations */ |
10 | #if defined(CPU_ARM) && !defined(SIMULATOR) | 10 | #if defined(CPU_ARM) |
11 | #define ARM4_ASM | 11 | #define ARM4_ASM |
12 | #endif | 12 | #endif |
13 | 13 | ||
diff --git a/apps/codecs/libwavpack/unpack.c b/apps/codecs/libwavpack/unpack.c index daf88718c8..f2eca7619f 100644 --- a/apps/codecs/libwavpack/unpack.c +++ b/apps/codecs/libwavpack/unpack.c | |||
@@ -286,9 +286,9 @@ int read_config_info (WavpackContext *wpc, WavpackMetadata *wpmd) | |||
286 | // samples unpacked, which can be less than the number requested if an error | 286 | // samples unpacked, which can be less than the number requested if an error |
287 | // occurs or the end of the block is reached. | 287 | // occurs or the end of the block is reached. |
288 | 288 | ||
289 | #if defined(CPU_COLDFIRE) && !defined(SIMULATOR) | 289 | #if defined(CPU_COLDFIRE) |
290 | extern void decorr_stereo_pass_cont_mcf5249 (struct decorr_pass *dpp, int32_t *buffer, int32_t sample_count); | 290 | extern void decorr_stereo_pass_cont_mcf5249 (struct decorr_pass *dpp, int32_t *buffer, int32_t sample_count); |
291 | #elif defined(CPU_ARM) && !defined(SIMULATOR) | 291 | #elif defined(CPU_ARM) |
292 | extern void decorr_stereo_pass_cont_arm (struct decorr_pass *dpp, int32_t *buffer, int32_t sample_count); | 292 | extern void decorr_stereo_pass_cont_arm (struct decorr_pass *dpp, int32_t *buffer, int32_t sample_count); |
293 | extern void decorr_stereo_pass_cont_arml (struct decorr_pass *dpp, int32_t *buffer, int32_t sample_count); | 293 | extern void decorr_stereo_pass_cont_arml (struct decorr_pass *dpp, int32_t *buffer, int32_t sample_count); |
294 | #else | 294 | #else |
@@ -351,9 +351,9 @@ int32_t unpack_samples (WavpackContext *wpc, int32_t *buffer, uint32_t sample_co | |||
351 | else | 351 | else |
352 | for (tcount = wps->num_terms, dpp = wps->decorr_passes; tcount--; dpp++) { | 352 | for (tcount = wps->num_terms, dpp = wps->decorr_passes; tcount--; dpp++) { |
353 | decorr_stereo_pass (dpp, buffer, 8); | 353 | decorr_stereo_pass (dpp, buffer, 8); |
354 | #if defined(CPU_COLDFIRE) && !defined(SIMULATOR) | 354 | #if defined(CPU_COLDFIRE) |
355 | decorr_stereo_pass_cont_mcf5249 (dpp, buffer + 16, sample_count - 8); | 355 | decorr_stereo_pass_cont_mcf5249 (dpp, buffer + 16, sample_count - 8); |
356 | #elif defined(CPU_ARM) && !defined(SIMULATOR) | 356 | #elif defined(CPU_ARM) |
357 | if (((flags & MAG_MASK) >> MAG_LSB) > 15) | 357 | if (((flags & MAG_MASK) >> MAG_LSB) > 15) |
358 | decorr_stereo_pass_cont_arml (dpp, buffer + 16, sample_count - 8); | 358 | decorr_stereo_pass_cont_arml (dpp, buffer + 16, sample_count - 8); |
359 | else | 359 | else |
@@ -525,7 +525,7 @@ static void decorr_stereo_pass (struct decorr_pass *dpp, int32_t *buffer, int32_ | |||
525 | dpp->weight_B = weight_B; | 525 | dpp->weight_B = weight_B; |
526 | } | 526 | } |
527 | 527 | ||
528 | #if (!defined(CPU_COLDFIRE) && !defined(CPU_ARM)) || defined(SIMULATOR) | 528 | #if (!defined(CPU_COLDFIRE) && !defined(CPU_ARM)) |
529 | 529 | ||
530 | static void decorr_stereo_pass_cont (struct decorr_pass *dpp, int32_t *buffer, int32_t sample_count) | 530 | static void decorr_stereo_pass_cont (struct decorr_pass *dpp, int32_t *buffer, int32_t sample_count) |
531 | { | 531 | { |
diff --git a/apps/debug_menu.c b/apps/debug_menu.c index 9e654b1d45..9b3e6e9f8b 100644 --- a/apps/debug_menu.c +++ b/apps/debug_menu.c | |||
@@ -342,7 +342,7 @@ static bool dbg_audio_thread(void) | |||
342 | #endif /* HAVE_LCD_BITMAP */ | 342 | #endif /* HAVE_LCD_BITMAP */ |
343 | 343 | ||
344 | 344 | ||
345 | #if (CONFIG_CPU == SH7034 || defined(CPU_COLDFIRE)) && !defined(SIMULATOR) | 345 | #if (CONFIG_CPU == SH7034 || defined(CPU_COLDFIRE)) |
346 | /* Tool function to read the flash manufacturer and type, if available. | 346 | /* Tool function to read the flash manufacturer and type, if available. |
347 | Only chips which could be reprogrammed in system will return values. | 347 | Only chips which could be reprogrammed in system will return values. |
348 | (The mode switch addresses vary between flash manufacturers, hence addr1/2) */ | 348 | (The mode switch addresses vary between flash manufacturers, hence addr1/2) */ |
@@ -396,7 +396,7 @@ static bool dbg_flash_id(unsigned* p_manufacturer, unsigned* p_device, | |||
396 | } | 396 | } |
397 | return false; /* fail */ | 397 | return false; /* fail */ |
398 | } | 398 | } |
399 | #endif /* (CONFIG_CPU == SH7034 || CPU_COLDFIRE) && !SIMULATOR */ | 399 | #endif /* (CONFIG_CPU == SH7034 || CPU_COLDFIRE) */ |
400 | 400 | ||
401 | #ifndef SIMULATOR | 401 | #ifndef SIMULATOR |
402 | #ifdef HAVE_LCD_BITMAP | 402 | #ifdef HAVE_LCD_BITMAP |
diff --git a/apps/dsp.c b/apps/dsp.c index 609b2d6d0d..f05c6f14ce 100644 --- a/apps/dsp.c +++ b/apps/dsp.c | |||
@@ -1124,7 +1124,7 @@ int dsp_process(char *dst, const char *src[], int count) | |||
1124 | int written = 0; | 1124 | int written = 0; |
1125 | int samples; | 1125 | int samples; |
1126 | 1126 | ||
1127 | #if defined(CPU_COLDFIRE) && !defined(SIMULATOR) | 1127 | #if defined(CPU_COLDFIRE) |
1128 | /* set emac unit for dsp processing, and save old macsr, we're running in | 1128 | /* set emac unit for dsp processing, and save old macsr, we're running in |
1129 | codec thread context at this point, so can't clobber it */ | 1129 | codec thread context at this point, so can't clobber it */ |
1130 | unsigned long old_macsr = coldfire_get_macsr(); | 1130 | unsigned long old_macsr = coldfire_get_macsr(); |
@@ -1177,7 +1177,7 @@ int dsp_process(char *dst, const char *src[], int count) | |||
1177 | yield(); | 1177 | yield(); |
1178 | } | 1178 | } |
1179 | 1179 | ||
1180 | #if defined(CPU_COLDFIRE) && !defined(SIMULATOR) | 1180 | #if defined(CPU_COLDFIRE) |
1181 | /* set old macsr again */ | 1181 | /* set old macsr again */ |
1182 | coldfire_set_macsr(old_macsr); | 1182 | coldfire_set_macsr(old_macsr); |
1183 | #endif | 1183 | #endif |
diff --git a/apps/dsp.h b/apps/dsp.h index 5d6e964d89..4e57adfc12 100644 --- a/apps/dsp.h +++ b/apps/dsp.h | |||
@@ -60,7 +60,7 @@ enum { | |||
60 | }; | 60 | }; |
61 | 61 | ||
62 | /* A bunch of fixed point assembler helper macros */ | 62 | /* A bunch of fixed point assembler helper macros */ |
63 | #if defined(CPU_COLDFIRE) && !defined(SIMULATOR) | 63 | #if defined(CPU_COLDFIRE) |
64 | /* These macros use the Coldfire EMAC extension and need the MACSR flags set | 64 | /* These macros use the Coldfire EMAC extension and need the MACSR flags set |
65 | * to fractional mode with no rounding. | 65 | * to fractional mode with no rounding. |
66 | */ | 66 | */ |
@@ -133,7 +133,7 @@ enum { | |||
133 | 133 | ||
134 | #define ACC_INIT(acc, x, y) ACC(acc, x, y) | 134 | #define ACC_INIT(acc, x, y) ACC(acc, x, y) |
135 | 135 | ||
136 | #elif defined(CPU_ARM) && !defined(SIMULATOR) | 136 | #elif defined(CPU_ARM) |
137 | 137 | ||
138 | /* Multiply two S.31 fractional integers and return the sign bit and the | 138 | /* Multiply two S.31 fractional integers and return the sign bit and the |
139 | * 31 most significant bits of the result. | 139 | * 31 most significant bits of the result. |
diff --git a/apps/dsp_asm.h b/apps/dsp_asm.h index 14875d21d8..02307dbd89 100644 --- a/apps/dsp_asm.h +++ b/apps/dsp_asm.h | |||
@@ -23,8 +23,6 @@ | |||
23 | #define _DSP_ASM_H | 23 | #define _DSP_ASM_H |
24 | 24 | ||
25 | /* Set the appropriate #defines based on CPU or whatever matters */ | 25 | /* Set the appropriate #defines based on CPU or whatever matters */ |
26 | #ifndef SIMULATOR | ||
27 | |||
28 | #if defined(CPU_ARM) | 26 | #if defined(CPU_ARM) |
29 | #define DSP_HAVE_ASM_RESAMPLING | 27 | #define DSP_HAVE_ASM_RESAMPLING |
30 | #define DSP_HAVE_ASM_CROSSFEED | 28 | #define DSP_HAVE_ASM_CROSSFEED |
@@ -39,8 +37,6 @@ | |||
39 | #define DSP_HAVE_ASM_SAMPLE_OUTPUT_STEREO | 37 | #define DSP_HAVE_ASM_SAMPLE_OUTPUT_STEREO |
40 | #endif /* CPU_COLDFIRE */ | 38 | #endif /* CPU_COLDFIRE */ |
41 | 39 | ||
42 | #endif /* SIMULATOR */ | ||
43 | |||
44 | /* Declare prototypes based upon what's #defined above */ | 40 | /* Declare prototypes based upon what's #defined above */ |
45 | #ifdef DSP_HAVE_ASM_CROSSFEED | 41 | #ifdef DSP_HAVE_ASM_CROSSFEED |
46 | void apply_crossfeed(int count, int32_t *buf[]); | 42 | void apply_crossfeed(int count, int32_t *buf[]); |
@@ -322,7 +322,7 @@ void eq_hs_coefs(unsigned long cutoff, unsigned long Q, long db, int32_t *c) | |||
322 | * implementations. | 322 | * implementations. |
323 | */ | 323 | */ |
324 | 324 | ||
325 | #if (!defined(CPU_COLDFIRE) && !defined(CPU_ARM)) || defined(SIMULATOR) | 325 | #if (!defined(CPU_COLDFIRE) && !defined(CPU_ARM)) |
326 | void eq_filter(int32_t **x, struct eqfilter *f, unsigned num, | 326 | void eq_filter(int32_t **x, struct eqfilter *f, unsigned num, |
327 | unsigned channels, unsigned shift) | 327 | unsigned channels, unsigned shift) |
328 | { | 328 | { |
diff --git a/apps/pcmbuf.h b/apps/pcmbuf.h index bddc7bb93d..bb7da52644 100644 --- a/apps/pcmbuf.h +++ b/apps/pcmbuf.h | |||
@@ -52,7 +52,7 @@ void pcmbuf_play_stop(void); | |||
52 | bool pcmbuf_is_crossfade_active(void); | 52 | bool pcmbuf_is_crossfade_active(void); |
53 | 53 | ||
54 | /* These functions are for playing chained buffers of PCM data */ | 54 | /* These functions are for playing chained buffers of PCM data */ |
55 | #if defined(HAVE_ADJUSTABLE_CPU_FREQ) && !defined(SIMULATOR) | 55 | #if defined(HAVE_ADJUSTABLE_CPU_FREQ) |
56 | void pcmbuf_boost(bool state); | 56 | void pcmbuf_boost(bool state); |
57 | void pcmbuf_set_boost_mode(bool state); | 57 | void pcmbuf_set_boost_mode(bool state); |
58 | #else | 58 | #else |
diff --git a/apps/plugins/alpine_cdc.c b/apps/plugins/alpine_cdc.c index 8b285d413a..f0f2939de1 100644 --- a/apps/plugins/alpine_cdc.c +++ b/apps/plugins/alpine_cdc.c | |||
@@ -32,7 +32,7 @@ | |||
32 | #include "plugin.h" | 32 | #include "plugin.h" |
33 | 33 | ||
34 | /* Only build for (correct) target */ | 34 | /* Only build for (correct) target */ |
35 | #if !defined(SIMULATOR) && CONFIG_CPU==SH7034 && !defined(HAVE_MMC) | 35 | #if CONFIG_CPU==SH7034 && !defined(HAVE_MMC) |
36 | 36 | ||
37 | PLUGIN_HEADER | 37 | PLUGIN_HEADER |
38 | 38 | ||
@@ -1201,4 +1201,4 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter) | |||
1201 | return (main(parameter)==0) ? PLUGIN_OK : PLUGIN_ERROR; | 1201 | return (main(parameter)==0) ? PLUGIN_OK : PLUGIN_ERROR; |
1202 | } | 1202 | } |
1203 | 1203 | ||
1204 | #endif /* #ifndef SIMULATOR, etc. */ | 1204 | #endif /* CONFIG_CPU==SH7034 && !defined(HAVE_MMC) */ |
diff --git a/apps/plugins/doom/i_video.c b/apps/plugins/doom/i_video.c index 2274854b4a..c3ac30f272 100644 --- a/apps/plugins/doom/i_video.c +++ b/apps/plugins/doom/i_video.c | |||
@@ -583,7 +583,7 @@ void I_InitGraphics(void) | |||
583 | gray_show(true); | 583 | gray_show(true); |
584 | #endif | 584 | #endif |
585 | 585 | ||
586 | #if defined(CPU_COLDFIRE) && !defined(SIMULATOR) | 586 | #ifdef CPU_COLDFIRE |
587 | coldfire_set_macsr(EMAC_FRACTIONAL | EMAC_SATURATE); | 587 | coldfire_set_macsr(EMAC_FRACTIONAL | EMAC_SATURATE); |
588 | d_screens[0] = fastscreen; | 588 | d_screens[0] = fastscreen; |
589 | #else | 589 | #else |
diff --git a/apps/plugins/doom/m_fixed.h b/apps/plugins/doom/m_fixed.h index e29933befd..15fd9867a3 100644 --- a/apps/plugins/doom/m_fixed.h +++ b/apps/plugins/doom/m_fixed.h | |||
@@ -44,7 +44,7 @@ typedef int fixed_t; | |||
44 | 44 | ||
45 | inline static int FixedMul( int a, int b ) | 45 | inline static int FixedMul( int a, int b ) |
46 | { | 46 | { |
47 | #if defined(CPU_COLDFIRE) && !defined(SIMULATOR) | 47 | #if defined(CPU_COLDFIRE) |
48 | // Code contributed by Thom Johansen | 48 | // Code contributed by Thom Johansen |
49 | register int result; | 49 | register int result; |
50 | asm ( | 50 | asm ( |
diff --git a/apps/plugins/doom/r_draw.c b/apps/plugins/doom/r_draw.c index 5f45323a36..ee107f9839 100644 --- a/apps/plugins/doom/r_draw.c +++ b/apps/plugins/doom/r_draw.c | |||
@@ -526,7 +526,7 @@ byte *ds_source IBSS_ATTR; | |||
526 | 526 | ||
527 | void R_DrawSpan (void) | 527 | void R_DrawSpan (void) |
528 | { | 528 | { |
529 | #if defined(CPU_COLDFIRE) && !defined(SIMULATOR) | 529 | #ifdef CPU_COLDFIRE |
530 | // only slightly faster | 530 | // only slightly faster |
531 | asm volatile ( | 531 | asm volatile ( |
532 | "tst %[count] \n" | 532 | "tst %[count] \n" |
diff --git a/apps/plugins/rockbox_flash.c b/apps/plugins/rockbox_flash.c index 575fb894a5..7ea149dc4e 100644 --- a/apps/plugins/rockbox_flash.c +++ b/apps/plugins/rockbox_flash.c | |||
@@ -21,7 +21,7 @@ | |||
21 | ****************************************************************************/ | 21 | ****************************************************************************/ |
22 | #include "plugin.h" | 22 | #include "plugin.h" |
23 | 23 | ||
24 | #if !defined(SIMULATOR) && (CONFIG_CPU == SH7034) /* Only for SH targets */ | 24 | #if (CONFIG_CPU == SH7034) /* Only for SH targets */ |
25 | 25 | ||
26 | PLUGIN_HEADER | 26 | PLUGIN_HEADER |
27 | 27 | ||
@@ -1038,4 +1038,4 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter) | |||
1038 | } | 1038 | } |
1039 | 1039 | ||
1040 | 1040 | ||
1041 | #endif /* !SIMULATOR or a SH-target */ | 1041 | #endif /* SH-target */ |
diff --git a/apps/plugins/rockboy/lcd.c b/apps/plugins/rockboy/lcd.c index a34db2fd3c..7fe531041c 100644 --- a/apps/plugins/rockboy/lcd.c +++ b/apps/plugins/rockboy/lcd.c | |||
@@ -43,7 +43,7 @@ struct scan scan IBSS_ATTR; | |||
43 | #define WV (scan.wv) | 43 | #define WV (scan.wv) |
44 | 44 | ||
45 | byte patpix[4096][8][8] | 45 | byte patpix[4096][8][8] |
46 | #if defined(CPU_COLDFIRE) && !defined(SIMULATOR) | 46 | #if defined(CPU_COLDFIRE) |
47 | __attribute__ ((aligned(16))) /* to profit from burst mode */ | 47 | __attribute__ ((aligned(16))) /* to profit from burst mode */ |
48 | #endif | 48 | #endif |
49 | ; | 49 | ; |
@@ -62,7 +62,7 @@ fb_data *vdest; | |||
62 | void updatepatpix(void) | 62 | void updatepatpix(void) |
63 | { | 63 | { |
64 | int i, j; | 64 | int i, j; |
65 | #if ((CONFIG_CPU != SH7034) && !defined(CPU_COLDFIRE)) || defined(SIMULATOR) | 65 | #if ((CONFIG_CPU != SH7034) && !defined(CPU_COLDFIRE)) |
66 | int k, a, c; | 66 | int k, a, c; |
67 | #endif | 67 | #endif |
68 | byte *vram = lcd.vbank[0]; | 68 | byte *vram = lcd.vbank[0]; |
@@ -76,7 +76,7 @@ void updatepatpix(void) | |||
76 | patdirty[i] = 0; | 76 | patdirty[i] = 0; |
77 | for (j = 0; j < 8; j++) | 77 | for (j = 0; j < 8; j++) |
78 | { | 78 | { |
79 | #if CONFIG_CPU == SH7034 && !defined(SIMULATOR) | 79 | #if CONFIG_CPU == SH7034 |
80 | asm volatile ( | 80 | asm volatile ( |
81 | "mov.w @%2,r1 \n" | 81 | "mov.w @%2,r1 \n" |
82 | "swap.b r1,r2 \n" | 82 | "swap.b r1,r2 \n" |
@@ -145,7 +145,7 @@ void updatepatpix(void) | |||
145 | : /* clobbers */ | 145 | : /* clobbers */ |
146 | "r0", "r1", "r2" | 146 | "r0", "r1", "r2" |
147 | ); | 147 | ); |
148 | #elif defined(CPU_COLDFIRE) && !defined(SIMULATOR) | 148 | #elif defined(CPU_COLDFIRE) |
149 | asm volatile ( | 149 | asm volatile ( |
150 | "move.b (%2),%%d2 \n" | 150 | "move.b (%2),%%d2 \n" |
151 | "move.b (1,%2),%%d1 \n" | 151 | "move.b (1,%2),%%d1 \n" |
@@ -222,7 +222,7 @@ void updatepatpix(void) | |||
222 | patpix[i+1024][j][7-k]; | 222 | patpix[i+1024][j][7-k]; |
223 | #endif | 223 | #endif |
224 | } | 224 | } |
225 | #if CONFIG_CPU == SH7034 && !defined(SIMULATOR) | 225 | #if CONFIG_CPU == SH7034 |
226 | asm volatile ( | 226 | asm volatile ( |
227 | "mov.l @%0,r0 \n" | 227 | "mov.l @%0,r0 \n" |
228 | "mov.l @(4,%0),r1 \n" | 228 | "mov.l @(4,%0),r1 \n" |
@@ -300,7 +300,7 @@ void updatepatpix(void) | |||
300 | : /* clobbers */ | 300 | : /* clobbers */ |
301 | "r0", "r1" | 301 | "r0", "r1" |
302 | ); | 302 | ); |
303 | #elif defined(CPU_COLDFIRE) && !defined(SIMULATOR) | 303 | #elif defined(CPU_COLDFIRE) |
304 | asm volatile ( | 304 | asm volatile ( |
305 | "movem.l (%0),%%d0-%%d3 \n" | 305 | "movem.l (%0),%%d0-%%d3 \n" |
306 | "move.l %%d0,%%d4 \n" | 306 | "move.l %%d0,%%d4 \n" |
@@ -486,7 +486,7 @@ void bg_scan(void) | |||
486 | if (cnt <= 0) return; | 486 | if (cnt <= 0) return; |
487 | while (cnt >= 8) | 487 | while (cnt >= 8) |
488 | { | 488 | { |
489 | #if defined(CPU_COLDFIRE) && !defined(SIMULATOR) | 489 | #if defined(CPU_COLDFIRE) |
490 | asm volatile ( | 490 | asm volatile ( |
491 | "move.l (%1)+,(%0)+ \n" | 491 | "move.l (%1)+,(%0)+ \n" |
492 | "move.l (%1)+,(%0)+ \n" | 492 | "move.l (%1)+,(%0)+ \n" |
@@ -521,7 +521,7 @@ void wnd_scan(void) | |||
521 | 521 | ||
522 | while (cnt >= 8) | 522 | while (cnt >= 8) |
523 | { | 523 | { |
524 | #if defined(CPU_COLDFIRE) && !defined(SIMULATOR) | 524 | #if defined(CPU_COLDFIRE) |
525 | asm volatile ( | 525 | asm volatile ( |
526 | "move.l (%1)+,(%0)+ \n" | 526 | "move.l (%1)+,(%0)+ \n" |
527 | "move.l (%1)+,(%0)+ \n" | 527 | "move.l (%1)+,(%0)+ \n" |
@@ -629,7 +629,7 @@ void bg_scan_color(void) | |||
629 | while (cnt >= 8) | 629 | while (cnt >= 8) |
630 | { | 630 | { |
631 | src = patpix[*(tile++)][V]; | 631 | src = patpix[*(tile++)][V]; |
632 | #if defined(CPU_COLDFIRE) && !defined(SIMULATOR) | 632 | #if defined(CPU_COLDFIRE) |
633 | asm volatile ( | 633 | asm volatile ( |
634 | "move.l (%2)+,%%d1 \n" | 634 | "move.l (%2)+,%%d1 \n" |
635 | 635 | ||