diff options
| author |   Avi Kivity <avi@redhat.com> | 2009-01-18 12:36:25 +0200 |
|---|---|---|
| committer | Avi Kivity <avi@redhat.com> | 2009-01-18 12:36:25 +0200 |
| commit | 931c5ab4bfd044e8dfc264ad4fda6ac62e078316 (patch) | |
| tree | e75853dd4bfa7f1fee2fb1ddbce0510178b0f2a6 /cpu-all.h | |
| parent | Device-assignment: fix ROM writing (diff) | |
| parent | Remove unused info_str parameter to pcnet_common_init() (diff) | |
| download | qemu-kvm-931c5ab4bfd044e8dfc264ad4fda6ac62e078316.tar.gz qemu-kvm-931c5ab4bfd044e8dfc264ad4fda6ac62e078316.tar.bz2 qemu-kvm-931c5ab4bfd044e8dfc264ad4fda6ac62e078316.zip | |
Merge branch 'qemu-cvs'
Conflicts:
qemu/hw/cirrus_vga.c
qemu/hw/pc.c
qemu/hw/pcnet.c
qemu/hw/vga.c
qemu/vl.c
Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'cpu-all.h')
| -rw-r--r-- | cpu-all.h | 19 |
1 files changed, 10 insertions, 9 deletions
@@ -20,6 +20,8 @@ #ifndef CPU_ALL_H #define CPU_ALL_H +#include "qemu-common.h" + #if defined(__arm__) || defined(__sparc__) || defined(__mips__) || defined(__hppa__) #define WORDS_ALIGNED #endif @@ -229,7 +231,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 +243,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 +255,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 +276,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 +287,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; @@ -751,9 +753,8 @@ void cpu_dump_statistics (CPUState *env, FILE *f, int (*cpu_fprintf)(FILE *f, const char *fmt, ...), int flags); -void cpu_abort(CPUState *env, const char *fmt, ...) - __attribute__ ((__format__ (__printf__, 2, 3))) - __attribute__ ((__noreturn__)); +void noreturn cpu_abort(CPUState *env, const char *fmt, ...) + __attribute__ ((__format__ (__printf__, 2, 3))); extern CPUState *first_cpu; extern CPUState *cpu_single_env; extern int64_t qemu_icount; @@ -987,7 +988,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) { |