test and set fixes

git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@1269 c046a42c-6fe2-441c-8c8c-71466251a162
This commit is contained in:
bellard 2005-02-07 14:09:05 +00:00
parent a8d3431ae9
commit 4955a2cd16
1 changed files with 13 additions and 15 deletions

View File

@ -392,28 +392,26 @@ static inline int testandset (int *p)
#ifdef __i386__ #ifdef __i386__
static inline int testandset (int *p) static inline int testandset (int *p)
{ {
char ret; long int readval = 0;
long int readval;
__asm__ __volatile__ ("lock; cmpxchgl %3, %1; sete %0" __asm__ __volatile__ ("lock; cmpxchgl %2, %0"
: "=q" (ret), "=m" (*p), "=a" (readval) : "+m" (*p), "+a" (readval)
: "r" (1), "m" (*p), "a" (0) : "r" (1)
: "memory"); : "cc");
return ret; return readval;
} }
#endif #endif
#ifdef __x86_64__ #ifdef __x86_64__
static inline int testandset (int *p) static inline int testandset (int *p)
{ {
char ret; long int readval = 0;
int readval;
__asm__ __volatile__ ("lock; cmpxchgl %3, %1; sete %0" __asm__ __volatile__ ("lock; cmpxchgl %2, %0"
: "=q" (ret), "=m" (*p), "=a" (readval) : "+m" (*p), "+a" (readval)
: "r" (1), "m" (*p), "a" (0) : "r" (1)
: "memory"); : "cc");
return ret; return readval;
} }
#endif #endif
@ -484,7 +482,7 @@ static inline int testandset (int *p)
: "=r" (ret) : "=r" (ret)
: "m" (p) : "m" (p)
: "cc","memory"); : "cc","memory");
return ret == 0; return ret;
} }
#endif #endif