Another #elif'ication.

git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@2792 c046a42c-6fe2-441c-8c8c-71466251a162
master
ths 2007-05-08 23:40:45 +00:00
parent 522777bbaf
commit 204a1b8d5e
1 changed files with 12 additions and 27 deletions

View File

@ -357,7 +357,7 @@ extern CPUWriteMemoryFunc *io_mem_write[IO_MEM_NB_ENTRIES][4];
extern CPUReadMemoryFunc *io_mem_read[IO_MEM_NB_ENTRIES][4]; extern CPUReadMemoryFunc *io_mem_read[IO_MEM_NB_ENTRIES][4];
extern void *io_mem_opaque[IO_MEM_NB_ENTRIES]; extern void *io_mem_opaque[IO_MEM_NB_ENTRIES];
#ifdef __powerpc__ #if defined(__powerpc__)
static inline int testandset (int *p) static inline int testandset (int *p)
{ {
int ret; int ret;
@ -373,9 +373,7 @@ static inline int testandset (int *p)
: "cr0", "memory"); : "cr0", "memory");
return ret; return ret;
} }
#endif #elif defined(__i386__)
#ifdef __i386__
static inline int testandset (int *p) static inline int testandset (int *p)
{ {
long int readval = 0; long int readval = 0;
@ -386,9 +384,7 @@ static inline int testandset (int *p)
: "cc"); : "cc");
return readval; return readval;
} }
#endif #elif defined(__x86_64__)
#ifdef __x86_64__
static inline int testandset (int *p) static inline int testandset (int *p)
{ {
long int readval = 0; long int readval = 0;
@ -399,9 +395,7 @@ static inline int testandset (int *p)
: "cc"); : "cc");
return readval; return readval;
} }
#endif #elif defined(__s390__)
#ifdef __s390__
static inline int testandset (int *p) static inline int testandset (int *p)
{ {
int ret; int ret;
@ -413,9 +407,7 @@ static inline int testandset (int *p)
: "cc", "memory" ); : "cc", "memory" );
return ret; return ret;
} }
#endif #elif defined(__alpha__)
#ifdef __alpha__
static inline int testandset (int *p) static inline int testandset (int *p)
{ {
int ret; int ret;
@ -432,9 +424,7 @@ static inline int testandset (int *p)
: "m" (*p)); : "m" (*p));
return ret; return ret;
} }
#endif #elif defined(__sparc__)
#ifdef __sparc__
static inline int testandset (int *p) static inline int testandset (int *p)
{ {
int ret; int ret;
@ -446,9 +436,7 @@ static inline int testandset (int *p)
return (ret ? 1 : 0); return (ret ? 1 : 0);
} }
#endif #elif defined(__arm__)
#ifdef __arm__
static inline int testandset (int *spinlock) static inline int testandset (int *spinlock)
{ {
register unsigned int ret; register unsigned int ret;
@ -458,9 +446,7 @@ static inline int testandset (int *spinlock)
return ret; return ret;
} }
#endif #elif defined(__mc68000)
#ifdef __mc68000
static inline int testandset (int *p) static inline int testandset (int *p)
{ {
char ret; char ret;
@ -470,18 +456,15 @@ static inline int testandset (int *p)
: "cc","memory"); : "cc","memory");
return ret; return ret;
} }
#endif #elif defined(__ia64)
#ifdef __ia64
#include <ia64intrin.h> #include <ia64intrin.h>
static inline int testandset (int *p) static inline int testandset (int *p)
{ {
return __sync_lock_test_and_set (p, 1); return __sync_lock_test_and_set (p, 1);
} }
#endif #elif defined(__mips__)
#ifdef __mips__
static inline int testandset (int *p) static inline int testandset (int *p)
{ {
int ret; int ret;
@ -501,6 +484,8 @@ static inline int testandset (int *p)
return ret; return ret;
} }
#else
#error unimplemented CPU support
#endif #endif
typedef int spinlock_t; typedef int spinlock_t;