Skip to content
Permalink
Browse files

Use proper m68k defines from gcc

  • Loading branch information
pmandin committed Aug 28, 2011
1 parent f5c3ea2 commit 5a87849285d6af6fe2c184213f8e2e1d3bd42321
@@ -91,7 +91,7 @@ static __inline__ Uint16 SDL_Swap16(Uint16 x)
__asm__("rlwimi %0,%2,8,16,23" : "=&r" (result) : "0" (x >> 8), "r" (x));
return result;
}
#elif defined(__GNUC__) && (defined(__M68000__) || defined(__M68020__)) && !defined(__mcoldfire__)
#elif defined(__GNUC__) && (defined(__m68k__) && !defined(__mcoldfire__))
static __inline__ Uint16 SDL_Swap16(Uint16 x)
{
__asm__("rorw #8,%0" : "=d" (x) : "0" (x) : "cc");
@@ -126,7 +126,7 @@ static __inline__ Uint32 SDL_Swap32(Uint32 x)
__asm__("rlwimi %0,%2,24,0,7" : "=&r" (result) : "0" (result), "r" (x));
return result;
}
#elif defined(__GNUC__) && (defined(__M68000__) || defined(__M68020__)) && !defined(__mcoldfire__)
#elif defined(__GNUC__) && (defined(__m68k__) && !defined(__mcoldfire__))
static __inline__ Uint32 SDL_Swap32(Uint32 x)
{
__asm__("rorw #8,%0\n\tswap %0\n\trorw #8,%0" : "=d" (x) : "0" (x) : "cc");
@@ -111,7 +111,7 @@ void SDL_MixAudio (Uint8 *dst, const Uint8 *src, Uint32 len, int volume)
switch (format) {

case AUDIO_U8: {
#if defined(__GNUC__) && defined(__M68000__) && !defined(__mcoldfire__) && defined(SDL_ASSEMBLY_ROUTINES)
#if defined(__GNUC__) && (defined(__m68k__) && !defined(__mcoldfire__)) && defined(SDL_ASSEMBLY_ROUTINES)
SDL_MixAudio_m68k_U8((char*)dst,(char*)src,(unsigned long)len,(long)volume,(char *)mix8);
#else
Uint8 src_sample;
@@ -144,7 +144,7 @@ void SDL_MixAudio (Uint8 *dst, const Uint8 *src, Uint32 len, int volume)
#endif
#endif

#if defined(__GNUC__) && defined(__M68000__) && !defined(__mcoldfire__) && defined(SDL_ASSEMBLY_ROUTINES)
#if defined(__GNUC__) && (defined(__m68k__) && !defined(__mcoldfire__)) && defined(SDL_ASSEMBLY_ROUTINES)
SDL_MixAudio_m68k_S8((char*)dst,(char*)src,(unsigned long)len,(long)volume);
#else
{
@@ -193,7 +193,7 @@ void SDL_MixAudio (Uint8 *dst, const Uint8 *src, Uint32 len, int volume)
#endif
#endif

#if defined(__GNUC__) && defined(__M68000__) && !defined(__mcoldfire__) && defined(SDL_ASSEMBLY_ROUTINES)
#if defined(__GNUC__) && (defined(__m68k__) && !defined(__mcoldfire__)) && defined(SDL_ASSEMBLY_ROUTINES)
SDL_MixAudio_m68k_S16LSB((short*)dst,(short*)src,(unsigned long)len,(long)volume);
#else
{
@@ -226,7 +226,7 @@ void SDL_MixAudio (Uint8 *dst, const Uint8 *src, Uint32 len, int volume)
break;

case AUDIO_S16MSB: {
#if defined(__GNUC__) && defined(__M68000__) && !defined(__mcoldfire__) && defined(SDL_ASSEMBLY_ROUTINES)
#if defined(__GNUC__) && (defined(__m68k__) && !defined(__mcoldfire__)) && defined(SDL_ASSEMBLY_ROUTINES)
SDL_MixAudio_m68k_S16MSB((short*)dst,(short*)src,(unsigned long)len,(long)volume);
#else
Sint16 src1, src2;
@@ -27,7 +27,7 @@
Patrice Mandin
*/

#if defined(__M68000__) && !defined(__mcoldfire__) && defined(__GNUC__)
#if (defined(__m68k__) && !defined(__mcoldfire__)) && defined(__GNUC__)
void SDL_MixAudio_m68k_U8(char* dst, char* src, long len, long volume, char* mix8)
{
__asm__ __volatile__ (
@@ -27,7 +27,7 @@
Patrice Mandin
*/

#if defined(__M68000__) && defined(__GNUC__)
#if (defined(__m68k__) && !defined(__mcoldfire__)) && defined(__GNUC__)
void SDL_MixAudio_m68k_U8(char* dst,char* src, long len, long volume, char* mix8);
void SDL_MixAudio_m68k_S8(char* dst,char* src, long len, long volume);

@@ -305,7 +305,7 @@ _SDL_Atari_C2pConvert4:
movel c2p_dest,a1
lea _SDL_Atari_table_c2p,a2
movel #0x00070001,d3
#if defined(__M68020__)
#if defined(__mc68020__)
moveq #0,d0
#endif

@@ -326,7 +326,7 @@ c2p4_bclx:
moveq #0,d1
moveq #7,d5
c2p4_bcl07:
#if defined(__M68020__)
#if defined(__mc68020__)
moveb a0@+,d0
lea a2@(0,d0:w:4),a3
#else
@@ -348,7 +348,7 @@ c2p4_bcl07:
moveq #0,d1
moveq #7,d5
c2p4_bcl815:
#if defined(__M68020__)
#if defined(__mc68020__)
moveb a0@+,d0
lea a2@(0,d0:w:4),a3
#else

0 comments on commit 5a87849

Please sign in to comment.