Merged r5194:5195 from branches/SDL-1.2: coldfire cpu arch support.
authorRyan C. Gordon <icculus@icculus.org>
Sun, 10 Jan 2010 08:21:19 +0000
changeset 3630efb79807afe1
parent 3629 102be1cdd2bb
child 3631 76667e288846
Merged r5194:5195 from branches/SDL-1.2: coldfire cpu arch support.
include/SDL_endian.h
src/audio/SDL_mixer.c
src/audio/SDL_mixer_m68k.c
     1.1 --- a/include/SDL_endian.h	Sun Jan 10 08:15:25 2010 +0000
     1.2 +++ b/include/SDL_endian.h	Sun Jan 10 08:21:19 2010 +0000
     1.3 @@ -92,7 +92,7 @@
     1.4    __asm__("rlwimi %0,%2,8,16,23": "=&r"(result):"0"(x >> 8), "r"(x));
     1.5      return result;
     1.6  }
     1.7 -#elif defined(__GNUC__) && (defined(__M68000__) || defined(__M68020__))
     1.8 +#elif defined(__GNUC__) && (defined(__M68000__) || defined(__M68020__)) && !defined(__mcoldfire__)
     1.9  static __inline__ Uint16
    1.10  SDL_Swap16(Uint16 x)
    1.11  {
    1.12 @@ -132,7 +132,7 @@
    1.13    __asm__("rlwimi %0,%2,24,0,7": "=&r"(result):"0"(result), "r"(x));
    1.14      return result;
    1.15  }
    1.16 -#elif defined(__GNUC__) && (defined(__M68000__) || defined(__M68020__))
    1.17 +#elif defined(__GNUC__) && (defined(__M68000__) || defined(__M68020__)) && !defined(__mcoldfire__)
    1.18  static __inline__ Uint32
    1.19  SDL_Swap32(Uint32 x)
    1.20  {
     2.1 --- a/src/audio/SDL_mixer.c	Sun Jan 10 08:15:25 2010 +0000
     2.2 +++ b/src/audio/SDL_mixer.c	Sun Jan 10 08:21:19 2010 +0000
     2.3 @@ -102,7 +102,7 @@
     2.4  
     2.5      case AUDIO_U8:
     2.6          {
     2.7 -#if defined(__GNUC__) && defined(__M68000__) && defined(SDL_ASSEMBLY_ROUTINES)
     2.8 +#if defined(__GNUC__) && defined(__M68000__) && !defined(__mcoldfire__) && defined(SDL_ASSEMBLY_ROUTINES)
     2.9              SDL_MixAudio_m68k_U8((char *) dst, (char *) src,
    2.10                                   (unsigned long) len, (long) volume,
    2.11                                   (char *) mix8);
    2.12 @@ -135,7 +135,7 @@
    2.13              } else
    2.14  #endif
    2.15  #endif
    2.16 -#if defined(__GNUC__) && defined(__M68000__) && defined(SDL_ASSEMBLY_ROUTINES)
    2.17 +#if defined(__GNUC__) && defined(__M68000__) && !defined(__mcoldfire__) && defined(SDL_ASSEMBLY_ROUTINES)
    2.18                  SDL_MixAudio_m68k_S8((char *) dst, (char *) src,
    2.19                                       (unsigned long) len, (long) volume);
    2.20  #else
    2.21 @@ -182,7 +182,7 @@
    2.22              } else
    2.23  #endif
    2.24  #endif
    2.25 -#if defined(__GNUC__) && defined(__M68000__) && defined(SDL_ASSEMBLY_ROUTINES)
    2.26 +#if defined(__GNUC__) && defined(__M68000__) && !defined(__mcoldfire__) && defined(SDL_ASSEMBLY_ROUTINES)
    2.27                  SDL_MixAudio_m68k_S16LSB((short *) dst, (short *) src,
    2.28                                           (unsigned long) len, (long) volume);
    2.29  #else
    2.30 @@ -216,7 +216,7 @@
    2.31  
    2.32      case AUDIO_S16MSB:
    2.33          {
    2.34 -#if defined(__GNUC__) && defined(__M68000__) && defined(SDL_ASSEMBLY_ROUTINES)
    2.35 +#if defined(__GNUC__) && defined(__M68000__) && !defined(__mcoldfire__) && defined(SDL_ASSEMBLY_ROUTINES)
    2.36              SDL_MixAudio_m68k_S16MSB((short *) dst, (short *) src,
    2.37                                       (unsigned long) len, (long) volume);
    2.38  #else
     3.1 --- a/src/audio/SDL_mixer_m68k.c	Sun Jan 10 08:15:25 2010 +0000
     3.2 +++ b/src/audio/SDL_mixer_m68k.c	Sun Jan 10 08:21:19 2010 +0000
     3.3 @@ -27,7 +27,7 @@
     3.4  	Patrice Mandin
     3.5  */
     3.6  
     3.7 -#if defined(__M68000__) && defined(__GNUC__)
     3.8 +#if defined(__M68000__) && !defined(__mcoldfire__) && defined(__GNUC__)
     3.9  void
    3.10  SDL_MixAudio_m68k_U8(char *dst, char *src, long len, long volume, char *mix8)
    3.11  {