From f05cd77eb463296ff43240f89fcc64c5b42739b8 Mon Sep 17 00:00:00 2001 From: James Touton Date: Thu, 6 Aug 2015 00:54:21 -0700 Subject: [PATCH] Renamed ASM_SYM_FOR_FUNC to ASM_SYM. Use ASM_SYM in place of __asm__ in a couple places. --- BasiliskII/src/BeOS/sysdeps.h | 4 ++-- BasiliskII/src/Unix/sysdeps.h | 4 ++-- BasiliskII/src/Windows/sysdeps.h | 4 ++-- BasiliskII/src/uae_cpu/m68k.h | 4 ++-- BasiliskII/src/uae_cpu/newcpu.h | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/BasiliskII/src/BeOS/sysdeps.h b/BasiliskII/src/BeOS/sysdeps.h index abeadbd3..ed3ba9c3 100644 --- a/BasiliskII/src/BeOS/sysdeps.h +++ b/BasiliskII/src/BeOS/sysdeps.h @@ -108,7 +108,7 @@ static inline void do_put_mem_word(uae_u16 *a, uae_u32 v) {__asm__ ("rolw $8,%0" #define X86_ASSEMBLY #define UNALIGNED_PROFITABLE #define OPTIMIZED_FLAGS -#define ASM_SYM_FOR_FUNC(a) __asm__(a) +#define ASM_SYM(a) __asm__(a) #define REGPARAM __attribute__((regparm(3))) #else @@ -122,7 +122,7 @@ static inline void do_put_mem_word(uae_u16 *a, uae_u32 v) {*a = v;} #undef X86_ASSEMBLY #define UNALIGNED_PROFITABLE #undef OPTIMIZED_FLAGS -#define ASM_SYM_FOR_FUNC(a) +#define ASM_SYM(a) #define REGPARAM #endif diff --git a/BasiliskII/src/Unix/sysdeps.h b/BasiliskII/src/Unix/sysdeps.h index f53293a7..df291939 100644 --- a/BasiliskII/src/Unix/sysdeps.h +++ b/BasiliskII/src/Unix/sysdeps.h @@ -493,9 +493,9 @@ static inline uae_u32 do_byteswap_16(uae_u32 v) #define write_log printf #if defined(X86_ASSEMBLY) || defined(X86_64_ASSEMBLY) -#define ASM_SYM_FOR_FUNC(a) __asm__(a) +#define ASM_SYM(a) __asm__(a) #else -#define ASM_SYM_FOR_FUNC(a) +#define ASM_SYM(a) #endif #ifndef REGPARAM diff --git a/BasiliskII/src/Windows/sysdeps.h b/BasiliskII/src/Windows/sysdeps.h index b9bdc44c..b64a19fa 100755 --- a/BasiliskII/src/Windows/sysdeps.h +++ b/BasiliskII/src/Windows/sysdeps.h @@ -297,9 +297,9 @@ static inline uae_u32 do_byteswap_16_g(uae_u32 v) #define ATTRIBUTE_PACKED __attribute__((packed)) #if defined(X86_ASSEMBLY) || defined(X86_64_ASSEMBLY) -#define ASM_SYM_FOR_FUNC(a) __asm__(a) +#define ASM_SYM(a) __asm__(a) #else -#define ASM_SYM_FOR_FUNC(a) +#define ASM_SYM(a) #endif #ifndef REGPARAM diff --git a/BasiliskII/src/uae_cpu/m68k.h b/BasiliskII/src/uae_cpu/m68k.h index 36c6c04d..75063082 100644 --- a/BasiliskII/src/uae_cpu/m68k.h +++ b/BasiliskII/src/uae_cpu/m68k.h @@ -59,7 +59,7 @@ struct flag_struct { #define COPY_CARRY (regflags.x = regflags.cznv) -extern struct flag_struct regflags __asm__ ("regflags"); +extern struct flag_struct regflags ASM_SYM ("regflags"); static __inline__ int cctrue(int cc) { @@ -202,7 +202,7 @@ struct flag_struct { #define COPY_CARRY (regflags.x = (regflags.cznv)>>8) -extern struct flag_struct regflags __asm__ ("regflags"); +extern struct flag_struct regflags ASM_SYM("regflags"); static __inline__ int cctrue(int cc) { diff --git a/BasiliskII/src/uae_cpu/newcpu.h b/BasiliskII/src/uae_cpu/newcpu.h index 408e475a..1d07c36b 100644 --- a/BasiliskII/src/uae_cpu/newcpu.h +++ b/BasiliskII/src/uae_cpu/newcpu.h @@ -61,7 +61,7 @@ struct cputbl { uae_u16 opcode; }; -extern cpuop_func *cpufunctbl[65536] ASM_SYM_FOR_FUNC ("cpufunctbl"); +extern cpuop_func *cpufunctbl[65536] ASM_SYM("cpufunctbl"); #if USE_JIT typedef void compop_func (uae_u32) REGPARAM;