diff options
| -rw-r--r-- | Makefile.target | 5 | ||||
| -rw-r--r-- | bsd-user/elfload.c | 2 | ||||
| -rw-r--r-- | bswap.h | 2 | ||||
| -rw-r--r-- | cache-utils.c | 4 | ||||
| -rw-r--r-- | cache-utils.h | 4 | ||||
| -rw-r--r-- | cpu-all.h | 12 | ||||
| -rw-r--r-- | cpu-exec.c | 2 | ||||
| -rw-r--r-- | darwin-user/commpage.c | 2 | ||||
| -rw-r--r-- | disas.c | 2 | ||||
| -rw-r--r-- | dyngen-exec.h | 6 | ||||
| -rw-r--r-- | exec-all.h | 4 | ||||
| -rw-r--r-- | fpu/softfloat-native.c | 2 | ||||
| -rw-r--r-- | linux-user/elfload.c | 2 | ||||
| -rw-r--r-- | qemu-lock.h | 2 | ||||
| -rw-r--r-- | tcg/tcg.h | 2 |
15 files changed, 23 insertions, 30 deletions
diff --git a/Makefile.target b/Makefile.target index fcaf4ec67..58fe88f4e 100644 --- a/Makefile.target +++ b/Makefile.target @@ -98,11 +98,6 @@ HELPER_CFLAGS+=-fomit-frame-pointer OP_CFLAGS+=-mpreferred-stack-boundary=2 -fomit-frame-pointer endif -ifeq ($(ARCH),ppc) -CPPFLAGS+= -D__powerpc__ -OP_CFLAGS+= -mlongcall -endif - ifeq ($(ARCH),sparc) CFLAGS+=-ffixed-g2 -ffixed-g3 OP_CFLAGS+=-fno-delayed-branch -ffixed-i0 diff --git a/bsd-user/elfload.c b/bsd-user/elfload.c index a04552935..82f172cc5 100644 --- a/bsd-user/elfload.c +++ b/bsd-user/elfload.c @@ -12,7 +12,7 @@ #include "qemu.h" #include "disas.h" -#ifdef __powerpc64__ +#ifdef _ARCH_PPC64 #undef ARCH_DLINFO #undef ELF_PLATFORM #undef ELF_HWCAP @@ -134,7 +134,7 @@ CPU_CONVERT(le, 64, uint64_t) /* unaligned versions (optimized for frequent unaligned accesses)*/ -#if defined(__i386__) || defined(__powerpc__) +#if defined(__i386__) || defined(_ARCH_PPC) #define cpu_to_le16wu(p, v) cpu_to_le16w(p, v) #define cpu_to_le32wu(p, v) cpu_to_le32w(p, v) diff --git a/cache-utils.c b/cache-utils.c index 7df1fcf51..b37ddd499 100644 --- a/cache-utils.c +++ b/cache-utils.c @@ -1,6 +1,6 @@ #include "cache-utils.h" -#if defined HOST_PPC || defined HOST_PPC64 +#if defined(_ARCH_PPC) struct qemu_cache_conf qemu_cache_conf = { .dcache_bsize = 16, .icache_bsize = 16 @@ -68,4 +68,4 @@ void qemu_cache_utils_init(char **envp) } #endif -#endif /* HOST_PPC || HOST_PPC64 */ +#endif /* _ARCH_PPC */ diff --git a/cache-utils.h b/cache-utils.h index 8847dbbf7..b45fde44e 100644 --- a/cache-utils.h +++ b/cache-utils.h @@ -1,9 +1,7 @@ #ifndef QEMU_CACHE_UTILS_H #define QEMU_CACHE_UTILS_H -#include "config-host.h" - -#if defined HOST_PPC || defined HOST_PPC64 +#if defined(_ARCH_PPC) struct qemu_cache_conf { unsigned long dcache_bsize; unsigned long icache_bsize; @@ -229,7 +229,7 @@ static inline void stb_p(void *ptr, int v) /* conservative code for little endian unaligned accesses */ static inline int lduw_le_p(const void *ptr) { -#ifdef __powerpc__ +#ifdef _ARCH_PPC int val; __asm__ __volatile__ ("lhbrx %0,0,%1" : "=r" (val) : "r" (ptr)); return val; @@ -241,7 +241,7 @@ static inline int lduw_le_p(const void *ptr) static inline int ldsw_le_p(const void *ptr) { -#ifdef __powerpc__ +#ifdef _ARCH_PPC int val; __asm__ __volatile__ ("lhbrx %0,0,%1" : "=r" (val) : "r" (ptr)); return (int16_t)val; @@ -253,7 +253,7 @@ static inline int ldsw_le_p(const void *ptr) static inline int ldl_le_p(const void *ptr) { -#ifdef __powerpc__ +#ifdef _ARCH_PPC int val; __asm__ __volatile__ ("lwbrx %0,0,%1" : "=r" (val) : "r" (ptr)); return val; @@ -274,7 +274,7 @@ static inline uint64_t ldq_le_p(const void *ptr) static inline void stw_le_p(void *ptr, int v) { -#ifdef __powerpc__ +#ifdef _ARCH_PPC __asm__ __volatile__ ("sthbrx %1,0,%2" : "=m" (*(uint16_t *)ptr) : "r" (v), "r" (ptr)); #else uint8_t *p = ptr; @@ -285,7 +285,7 @@ static inline void stw_le_p(void *ptr, int v) static inline void stl_le_p(void *ptr, int v) { -#ifdef __powerpc__ +#ifdef _ARCH_PPC __asm__ __volatile__ ("stwbrx %1,0,%2" : "=m" (*(uint32_t *)ptr) : "r" (v), "r" (ptr)); #else uint8_t *p = ptr; @@ -985,7 +985,7 @@ void qemu_unregister_coalesced_mmio(target_phys_addr_t addr, ram_addr_t size); /*******************************************/ /* host CPU ticks (if available) */ -#if defined(__powerpc__) +#if defined(_ARCH_PPC) static inline uint32_t get_tbl(void) { diff --git a/cpu-exec.c b/cpu-exec.c index f574877e6..07ddd0eda 100644 --- a/cpu-exec.c +++ b/cpu-exec.c @@ -1218,7 +1218,7 @@ int cpu_signal_handler(int host_signum, void *pinfo, &uc->uc_sigmask, puc); } -#elif defined(__powerpc__) +#elif defined(_ARCH_PPC) /*********************************************************************** * signal context platform-specific definitions diff --git a/darwin-user/commpage.c b/darwin-user/commpage.c index 2b920b528..58f429c19 100644 --- a/darwin-user/commpage.c +++ b/darwin-user/commpage.c @@ -181,7 +181,7 @@ static inline void install_commpage_backdoor_for_entry(struct commpage_entry ent */ void commpage_init(void) { -#if (defined(__i386__) ^ defined(TARGET_I386)) || (defined(__powerpc__) ^ defined(TARGET_PPC)) +#if (defined(__i386__) ^ defined(TARGET_I386)) || (defined(_ARCH_PPC) ^ defined(TARGET_PPC)) int i; void * commpage = (void *)target_mmap( COMMPAGE_START, COMMPAGE_SIZE, PROT_WRITE | PROT_READ, MAP_ANONYMOUS | MAP_FIXED, -1, 0); @@ -250,7 +250,7 @@ void disas(FILE *out, void *code, unsigned long size) #elif defined(__x86_64__) disasm_info.mach = bfd_mach_x86_64; print_insn = print_insn_i386; -#elif defined(__powerpc__) +#elif defined(_ARCH_PPC) print_insn = print_insn_ppc; #elif defined(__alpha__) print_insn = print_insn_alpha; diff --git a/dyngen-exec.h b/dyngen-exec.h index 11e6dea35..4693eac83 100644 --- a/dyngen-exec.h +++ b/dyngen-exec.h @@ -41,7 +41,7 @@ typedef unsigned int uint32_t; // Linux/Sparc64 defines uint64_t #if !(defined (__sparc_v9__) && defined(__linux__)) && !(defined(__APPLE__) && defined(__x86_64__)) /* XXX may be done for all 64 bits targets ? */ -#if defined (__x86_64__) || defined(__ia64) || defined(__s390x__) || defined(__alpha__) || defined(__powerpc64__) +#if defined (__x86_64__) || defined(__ia64) || defined(__s390x__) || defined(__alpha__) || defined(_ARCH_PPC64) typedef unsigned long uint64_t; #else typedef unsigned long long uint64_t; @@ -58,7 +58,7 @@ typedef signed short int16_t; typedef signed int int32_t; // Linux/Sparc64 defines int64_t #if !(defined (__sparc_v9__) && defined(__linux__)) && !(defined(__APPLE__) && defined(__x86_64__)) -#if defined (__x86_64__) || defined(__ia64) || defined(__s390x__) || defined(__alpha__) || defined(__powerpc64__) +#if defined (__x86_64__) || defined(__ia64) || defined(__s390x__) || defined(__alpha__) || defined(_ARCH_PPC64) typedef signed long int64_t; #else typedef signed long long int64_t; @@ -105,7 +105,7 @@ extern int printf(const char *, ...); #define AREG3 "r13" //#define AREG4 "rbp" //#define AREG5 "rbx" -#elif defined(__powerpc__) +#elif defined(_ARCH_PPC) #define AREG0 "r27" #define AREG1 "r24" #define AREG2 "r25" diff --git a/exec-all.h b/exec-all.h index 4b828c591..dbfe5bf89 100644 --- a/exec-all.h +++ b/exec-all.h @@ -117,7 +117,7 @@ static inline int tlb_set_page(CPUState *env1, target_ulong vaddr, #define CODE_GEN_AVG_BLOCK_SIZE 64 #endif -#if defined(__powerpc__) || defined(__x86_64__) || defined(__arm__) +#if defined(_ARCH_PPC) || defined(__x86_64__) || defined(__arm__) #define USE_DIRECT_JUMP #endif #if defined(__i386__) && !defined(_WIN32) @@ -192,7 +192,7 @@ extern int code_gen_max_blocks; #if defined(USE_DIRECT_JUMP) -#if defined(__powerpc__) +#if defined(_ARCH_PPC) extern void ppc_tb_set_jmp_target(unsigned long jmp_addr, unsigned long addr); #define tb_set_jmp_target1 ppc_tb_set_jmp_target #elif defined(__i386__) || defined(__x86_64__) diff --git a/fpu/softfloat-native.c b/fpu/softfloat-native.c index 7273ae5b4..9eba03540 100644 --- a/fpu/softfloat-native.c +++ b/fpu/softfloat-native.c @@ -51,7 +51,7 @@ ldexpl(long double x, int n) { #endif #endif -#if defined(__powerpc__) +#if defined(_ARCH_PPC) /* correct (but slow) PowerPC rint() (glibc version is incorrect) */ double qemu_rint(double x) diff --git a/linux-user/elfload.c b/linux-user/elfload.c index 34334045d..ba1d63106 100644 --- a/linux-user/elfload.c +++ b/linux-user/elfload.c @@ -12,7 +12,7 @@ #include "qemu.h" #include "disas.h" -#ifdef __powerpc64__ +#ifdef _ARCH_PPC64 #undef ARCH_DLINFO #undef ELF_PLATFORM #undef ELF_HWCAP diff --git a/qemu-lock.h b/qemu-lock.h index afd2d5f20..26661baae 100644 --- a/qemu-lock.h +++ b/qemu-lock.h @@ -58,7 +58,7 @@ static inline void resetlock (spinlock_t *p) #endif -#if defined(__powerpc__) +#if defined(_ARCH_PPC) static inline int testandset (int *p) { int ret; @@ -457,7 +457,7 @@ uint64_t tcg_helper_divu_i64(uint64_t arg1, uint64_t arg2); uint64_t tcg_helper_remu_i64(uint64_t arg1, uint64_t arg2); extern uint8_t code_gen_prologue[]; -#if defined(__powerpc__) && !defined(__powerpc64__) +#if defined(_ARCH_PPC) && !defined(_ARCH_PPC64) #define tcg_qemu_tb_exec(tb_ptr) \ ((long REGPARM __attribute__ ((longcall)) (*)(void *))code_gen_prologue)(tb_ptr) #else |