Mercurial > sdl-ios-xcode

changeset 3630:efb79807afe1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merged r5194:5195 from branches/SDL-1.2: coldfire cpu arch support.
author Ryan C. Gordon <icculus@icculus.org>
date Sun, 10 Jan 2010 08:21:19 +0000
parents 102be1cdd2bb
children 76667e288846
files include/SDL_endian.h src/audio/SDL_mixer.c src/audio/SDL_mixer_m68k.c
diffstat 3 files changed, 7 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/include/SDL_endian.h	Sun Jan 10 08:15:25 2010 +0000
+++ b/include/SDL_endian.h	Sun Jan 10 08:21:19 2010 +0000
@@ -92,7 +92,7 @@
   __asm__("rlwimi %0,%2,8,16,23": "=&r"(result):"0"(x >> 8), "r"(x));
     return result;
 }
-#elif defined(__GNUC__) && (defined(__M68000__) || defined(__M68020__))
+#elif defined(__GNUC__) && (defined(__M68000__) || defined(__M68020__)) && !defined(__mcoldfire__)
 static __inline__ Uint16
 SDL_Swap16(Uint16 x)
 {
@@ -132,7 +132,7 @@
   __asm__("rlwimi %0,%2,24,0,7": "=&r"(result):"0"(result), "r"(x));
     return result;
 }
-#elif defined(__GNUC__) && (defined(__M68000__) || defined(__M68020__))
+#elif defined(__GNUC__) && (defined(__M68000__) || defined(__M68020__)) && !defined(__mcoldfire__)
 static __inline__ Uint32
 SDL_Swap32(Uint32 x)
 {
--- a/src/audio/SDL_mixer.c	Sun Jan 10 08:15:25 2010 +0000
+++ b/src/audio/SDL_mixer.c	Sun Jan 10 08:21:19 2010 +0000
@@ -102,7 +102,7 @@
 
     case AUDIO_U8:
         {
-#if defined(__GNUC__) && defined(__M68000__) && defined(SDL_ASSEMBLY_ROUTINES)
+#if defined(__GNUC__) && defined(__M68000__) && !defined(__mcoldfire__) && defined(SDL_ASSEMBLY_ROUTINES)
             SDL_MixAudio_m68k_U8((char *) dst, (char *) src,
                                  (unsigned long) len, (long) volume,
                                  (char *) mix8);
@@ -135,7 +135,7 @@
             } else
 #endif
 #endif
-#if defined(__GNUC__) && defined(__M68000__) && defined(SDL_ASSEMBLY_ROUTINES)
+#if defined(__GNUC__) && defined(__M68000__) && !defined(__mcoldfire__) && defined(SDL_ASSEMBLY_ROUTINES)
                 SDL_MixAudio_m68k_S8((char *) dst, (char *) src,
                                      (unsigned long) len, (long) volume);
 #else
@@ -182,7 +182,7 @@
             } else
 #endif
 #endif
-#if defined(__GNUC__) && defined(__M68000__) && defined(SDL_ASSEMBLY_ROUTINES)
+#if defined(__GNUC__) && defined(__M68000__) && !defined(__mcoldfire__) && defined(SDL_ASSEMBLY_ROUTINES)
                 SDL_MixAudio_m68k_S16LSB((short *) dst, (short *) src,
                                          (unsigned long) len, (long) volume);
 #else
@@ -216,7 +216,7 @@
 
     case AUDIO_S16MSB:
         {
-#if defined(__GNUC__) && defined(__M68000__) && defined(SDL_ASSEMBLY_ROUTINES)
+#if defined(__GNUC__) && defined(__M68000__) && !defined(__mcoldfire__) && defined(SDL_ASSEMBLY_ROUTINES)
             SDL_MixAudio_m68k_S16MSB((short *) dst, (short *) src,
                                      (unsigned long) len, (long) volume);
 #else
--- a/src/audio/SDL_mixer_m68k.c	Sun Jan 10 08:15:25 2010 +0000
+++ b/src/audio/SDL_mixer_m68k.c	Sun Jan 10 08:21:19 2010 +0000
@@ -27,7 +27,7 @@
 	Patrice Mandin
 */
 
-#if defined(__M68000__) && defined(__GNUC__)
+#if defined(__M68000__) && !defined(__mcoldfire__) && defined(__GNUC__)
 void
 SDL_MixAudio_m68k_U8(char *dst, char *src, long len, long volume, char *mix8)
 {