Disable m68k assembly for Coldfire CPUs SDL-1.2
authorPatrice Mandin
Fri, 06 Nov 2009 18:06:01 +0000
branchSDL-1.2
changeset 4374124629b76853
parent 4373 ab06accf1b96
child 4375 a52047c790a2
Disable m68k assembly for Coldfire CPUs
include/SDL_endian.h
src/audio/SDL_mixer.c
src/audio/SDL_mixer_m68k.c
     1.1 --- a/include/SDL_endian.h	Fri Nov 06 17:42:14 2009 +0000
     1.2 +++ b/include/SDL_endian.h	Fri Nov 06 18:06:01 2009 +0000
     1.3 @@ -86,7 +86,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 SDL_Swap16(Uint16 x)
    1.10  {
    1.11  	__asm__("rorw #8,%0" : "=d" (x) :  "0" (x) : "cc");
    1.12 @@ -121,7 +121,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 SDL_Swap32(Uint32 x)
    1.19  {
    1.20  	__asm__("rorw #8,%0\n\tswap %0\n\trorw #8,%0" : "=d" (x) :  "0" (x) : "cc");
     2.1 --- a/src/audio/SDL_mixer.c	Fri Nov 06 17:42:14 2009 +0000
     2.2 +++ b/src/audio/SDL_mixer.c	Fri Nov 06 18:06:01 2009 +0000
     2.3 @@ -111,7 +111,7 @@
     2.4  	switch (format) {
     2.5  
     2.6  		case AUDIO_U8: {
     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,(unsigned long)len,(long)volume,(char *)mix8);
    2.10  #else
    2.11  			Uint8 src_sample;
    2.12 @@ -144,7 +144,7 @@
    2.13  #endif
    2.14  #endif
    2.15  
    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,(unsigned long)len,(long)volume);
    2.19  #else
    2.20  			{
    2.21 @@ -193,7 +193,7 @@
    2.22  #endif
    2.23  #endif
    2.24  
    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,(unsigned long)len,(long)volume);
    2.28  #else
    2.29  			{
     3.1 --- a/src/audio/SDL_mixer_m68k.c	Fri Nov 06 17:42:14 2009 +0000
     3.2 +++ b/src/audio/SDL_mixer_m68k.c	Fri Nov 06 18:06:01 2009 +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 SDL_MixAudio_m68k_U8(char* dst, char* src, long len, long volume, char* mix8)
    3.10  {
    3.11      __asm__ __volatile__ (
    3.12 @@ -208,4 +208,3 @@
    3.13  	 );
    3.14  }
    3.15  #endif
    3.16 -