ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove all traces of __powerpc__ 

According to $GCC/gcc/config/rs6000/rs6000-c.c _ARCH_PPC is the
ubiquitous define which should be used to test whether gcc targets
PowerPC, on 64bit platforms _ARCH_PPC64 will be also defined.

git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@6301 c046a42c-6fe2-441c-8c8c-71466251a162
This commit is contained in:
malc 2009-01-14 18:39:49 +00:00
parent bc575e95d1
commit e58ffeb322
15 changed files with 23 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Makefile.target
View File

@ -98,11 +98,6 @@ HELPER_CFLAGS+=-fomit-frame-pointer
OP_CFLAGS+=-mpreferred-stack-boundary=2 -fomit-frame-pointer OP_CFLAGS+=-mpreferred-stack-boundary=2 -fomit-frame-pointer
endif endif
ifeq ($(ARCH),ppc)
CPPFLAGS+= -D__powerpc__
OP_CFLAGS+= -mlongcall
endif
ifeq ($(ARCH),sparc) ifeq ($(ARCH),sparc)
CFLAGS+=-ffixed-g2 -ffixed-g3 CFLAGS+=-ffixed-g2 -ffixed-g3
OP_CFLAGS+=-fno-delayed-branch -ffixed-i0 OP_CFLAGS+=-fno-delayed-branch -ffixed-i0

2
bsd-user/elfload.c
View File

@ -12,7 +12,7 @@
#include "qemu.h" #include "qemu.h"
#include "disas.h" #include "disas.h"
#ifdef __powerpc64__ #ifdef _ARCH_PPC64
#undef ARCH_DLINFO #undef ARCH_DLINFO
#undef ELF_PLATFORM #undef ELF_PLATFORM
#undef ELF_HWCAP #undef ELF_HWCAP

2
bswap.h
View File

@ -134,7 +134,7 @@ CPU_CONVERT(le, 64, uint64_t)
/* unaligned versions (optimized for frequent unaligned accesses)*/ /* 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_le16wu(p, v) cpu_to_le16w(p, v)
#define cpu_to_le32wu(p, v) cpu_to_le32w(p, v) #define cpu_to_le32wu(p, v) cpu_to_le32w(p, v)

4
cache-utils.c
View File

@ -1,6 +1,6 @@
#include "cache-utils.h" #include "cache-utils.h"
#if defined HOST_PPC || defined HOST_PPC64 #if defined(_ARCH_PPC)
struct qemu_cache_conf qemu_cache_conf = { struct qemu_cache_conf qemu_cache_conf = {
.dcache_bsize = 16, .dcache_bsize = 16,
.icache_bsize = 16 .icache_bsize = 16
@ -68,4 +68,4 @@ void qemu_cache_utils_init(char **envp)
} }
#endif #endif
#endif /* HOST_PPC || HOST_PPC64 */ #endif /* _ARCH_PPC */

4
cache-utils.h
View File

@ -1,9 +1,7 @@
#ifndef QEMU_CACHE_UTILS_H #ifndef QEMU_CACHE_UTILS_H
#define QEMU_CACHE_UTILS_H #define QEMU_CACHE_UTILS_H
#include "config-host.h" #if defined(_ARCH_PPC)
#if defined HOST_PPC || defined HOST_PPC64
struct qemu_cache_conf { struct qemu_cache_conf {
unsigned long dcache_bsize; unsigned long dcache_bsize;
unsigned long icache_bsize; unsigned long icache_bsize;

12
cpu-all.h
View File

@ -229,7 +229,7 @@ static inline void stb_p(void *ptr, int v)
/* conservative code for little endian unaligned accesses */ /* conservative code for little endian unaligned accesses */
static inline int lduw_le_p(const void *ptr) static inline int lduw_le_p(const void *ptr)
{ {
#ifdef __powerpc__ #ifdef _ARCH_PPC
int val; int val;
__asm__ __volatile__ ("lhbrx %0,0,%1" : "=r" (val) : "r" (ptr)); __asm__ __volatile__ ("lhbrx %0,0,%1" : "=r" (val) : "r" (ptr));
return val; return val;
@ -241,7 +241,7 @@ static inline int lduw_le_p(const void *ptr)
static inline int ldsw_le_p(const void *ptr) static inline int ldsw_le_p(const void *ptr)
{ {
#ifdef __powerpc__ #ifdef _ARCH_PPC
int val; int val;
__asm__ __volatile__ ("lhbrx %0,0,%1" : "=r" (val) : "r" (ptr)); __asm__ __volatile__ ("lhbrx %0,0,%1" : "=r" (val) : "r" (ptr));
return (int16_t)val; 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) static inline int ldl_le_p(const void *ptr)
{ {
#ifdef __powerpc__ #ifdef _ARCH_PPC
int val; int val;
__asm__ __volatile__ ("lwbrx %0,0,%1" : "=r" (val) : "r" (ptr)); __asm__ __volatile__ ("lwbrx %0,0,%1" : "=r" (val) : "r" (ptr));
return val; 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) 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)); __asm__ __volatile__ ("sthbrx %1,0,%2" : "=m" (*(uint16_t *)ptr) : "r" (v), "r" (ptr));
#else #else
uint8_t *p = ptr; 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) 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)); __asm__ __volatile__ ("stwbrx %1,0,%2" : "=m" (*(uint32_t *)ptr) : "r" (v), "r" (ptr));
#else #else
uint8_t *p = ptr; 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) */ /* host CPU ticks (if available) */
#if defined(__powerpc__) #if defined(_ARCH_PPC)
static inline uint32_t get_tbl(void) static inline uint32_t get_tbl(void)
{ {

2
cpu-exec.c
View File

@ -1218,7 +1218,7 @@ int cpu_signal_handler(int host_signum, void *pinfo,
&uc->uc_sigmask, puc); &uc->uc_sigmask, puc);
} }
#elif defined(__powerpc__) #elif defined(_ARCH_PPC)
/*********************************************************************** /***********************************************************************
* signal context platform-specific definitions * signal context platform-specific definitions

2
darwin-user/commpage.c
View File

@ -181,7 +181,7 @@ static inline void install_commpage_backdoor_for_entry(struct commpage_entry ent
*/ */
void commpage_init(void) 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; int i;
void * commpage = (void *)target_mmap( COMMPAGE_START, COMMPAGE_SIZE, void * commpage = (void *)target_mmap( COMMPAGE_START, COMMPAGE_SIZE,
PROT_WRITE | PROT_READ, MAP_ANONYMOUS | MAP_FIXED, -1, 0); PROT_WRITE | PROT_READ, MAP_ANONYMOUS | MAP_FIXED, -1, 0);

2
disas.c
View File

@ -250,7 +250,7 @@ void disas(FILE *out, void *code, unsigned long size)
#elif defined(__x86_64__) #elif defined(__x86_64__)
disasm_info.mach = bfd_mach_x86_64; disasm_info.mach = bfd_mach_x86_64;
print_insn = print_insn_i386; print_insn = print_insn_i386;
#elif defined(__powerpc__) #elif defined(_ARCH_PPC)
print_insn = print_insn_ppc; print_insn = print_insn_ppc;
#elif defined(__alpha__) #elif defined(__alpha__)
print_insn = print_insn_alpha; print_insn = print_insn_alpha;

6
dyngen-exec.h
View File

@ -41,7 +41,7 @@ typedef unsigned int uint32_t;
// Linux/Sparc64 defines uint64_t // Linux/Sparc64 defines uint64_t
#if !(defined (__sparc_v9__) && defined(__linux__)) && !(defined(__APPLE__) && defined(__x86_64__)) #if !(defined (__sparc_v9__) && defined(__linux__)) && !(defined(__APPLE__) && defined(__x86_64__))
/* XXX may be done for all 64 bits targets ? */ /* 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; typedef unsigned long uint64_t;
#else #else
typedef unsigned long long uint64_t; typedef unsigned long long uint64_t;
@ -58,7 +58,7 @@ typedef signed short int16_t;
typedef signed int int32_t; typedef signed int int32_t;
// Linux/Sparc64 defines int64_t // Linux/Sparc64 defines int64_t
#if !(defined (__sparc_v9__) && defined(__linux__)) && !(defined(__APPLE__) && defined(__x86_64__)) #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; typedef signed long int64_t;
#else #else
typedef signed long long int64_t; typedef signed long long int64_t;
@ -105,7 +105,7 @@ extern int printf(const char *, ...);
#define AREG3 "r13" #define AREG3 "r13"
//#define AREG4 "rbp" //#define AREG4 "rbp"
//#define AREG5 "rbx" //#define AREG5 "rbx"
#elif defined(__powerpc__) #elif defined(_ARCH_PPC)
#define AREG0 "r27" #define AREG0 "r27"
#define AREG1 "r24" #define AREG1 "r24"
#define AREG2 "r25" #define AREG2 "r25"

4
exec-all.h
View File

@ -117,7 +117,7 @@ static inline int tlb_set_page(CPUState *env1, target_ulong vaddr,
#define CODE_GEN_AVG_BLOCK_SIZE 64 #define CODE_GEN_AVG_BLOCK_SIZE 64
#endif #endif
#if defined(__powerpc__) || defined(__x86_64__) || defined(__arm__) #if defined(_ARCH_PPC) || defined(__x86_64__) || defined(__arm__)
#define USE_DIRECT_JUMP #define USE_DIRECT_JUMP
#endif #endif
#if defined(__i386__) && !defined(_WIN32) #if defined(__i386__) && !defined(_WIN32)
@ -192,7 +192,7 @@ extern int code_gen_max_blocks;
#if defined(USE_DIRECT_JUMP) #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); extern void ppc_tb_set_jmp_target(unsigned long jmp_addr, unsigned long addr);
#define tb_set_jmp_target1 ppc_tb_set_jmp_target #define tb_set_jmp_target1 ppc_tb_set_jmp_target
#elif defined(__i386__) || defined(__x86_64__) #elif defined(__i386__) || defined(__x86_64__)

2
fpu/softfloat-native.c
View File

@ -51,7 +51,7 @@ ldexpl(long double x, int n) {
#endif #endif
#endif #endif
#if defined(__powerpc__) #if defined(_ARCH_PPC)
/* correct (but slow) PowerPC rint() (glibc version is incorrect) */ /* correct (but slow) PowerPC rint() (glibc version is incorrect) */
double qemu_rint(double x) double qemu_rint(double x)

2
linux-user/elfload.c
View File

@ -12,7 +12,7 @@
#include "qemu.h" #include "qemu.h"
#include "disas.h" #include "disas.h"
#ifdef __powerpc64__ #ifdef _ARCH_PPC64
#undef ARCH_DLINFO #undef ARCH_DLINFO
#undef ELF_PLATFORM #undef ELF_PLATFORM
#undef ELF_HWCAP #undef ELF_HWCAP

2
qemu-lock.h
View File

@ -58,7 +58,7 @@ static inline void resetlock (spinlock_t *p)
#endif #endif
#if defined(__powerpc__) #if defined(_ARCH_PPC)
static inline int testandset (int *p) static inline int testandset (int *p)
{ {
int ret; int ret;

2
tcg/tcg.h
View File

@ -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); uint64_t tcg_helper_remu_i64(uint64_t arg1, uint64_t arg2);
extern uint8_t code_gen_prologue[]; 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) \ #define tcg_qemu_tb_exec(tb_ptr) \
((long REGPARM __attribute__ ((longcall)) (*)(void *))code_gen_prologue)(tb_ptr) ((long REGPARM __attribute__ ((longcall)) (*)(void *))code_gen_prologue)(tb_ptr)
#else #else