diff options
| -rw-r--r-- | lib/libpthread/arch/i386/_atomic_lock.c | 10 | ||||
| -rw-r--r-- | lib/librthread/arch/i386/_atomic_lock.c | 12 |
2 files changed, 11 insertions, 11 deletions
diff --git a/lib/libpthread/arch/i386/_atomic_lock.c b/lib/libpthread/arch/i386/_atomic_lock.c index 8e97ec7c3e9..9bf4d82b994 100644 --- a/lib/libpthread/arch/i386/_atomic_lock.c +++ b/lib/libpthread/arch/i386/_atomic_lock.c @@ -1,11 +1,11 @@ -/* $OpenBSD: _atomic_lock.c,v 1.7 2002/10/11 19:08:41 marc Exp $ */ +/* $OpenBSD: _atomic_lock.c,v 1.8 2010/12/03 19:44:22 miod Exp $ */ /* David Leonard, <d@csee.uq.edu.au>. Public domain. */ /* * Atomic lock for i386 */ -#include "spinlock.h" +#include <spinlock.h> int _atomic_lock(volatile _spinlock_lock_t *lock) @@ -17,9 +17,9 @@ _atomic_lock(volatile _spinlock_lock_t *lock) * a local variable containing the locked state. */ old = _SPINLOCK_LOCKED; - __asm__("xchg %0,%1" - : "=r" (old), "=m" (*lock) - : "0" (old), "1" (*lock)); + __asm__("xchg %0,(%2)" + : "=r" (old) + : "0" (old), "r" (lock)); return (old != _SPINLOCK_UNLOCKED); } diff --git a/lib/librthread/arch/i386/_atomic_lock.c b/lib/librthread/arch/i386/_atomic_lock.c index d597f81f542..2a42259680e 100644 --- a/lib/librthread/arch/i386/_atomic_lock.c +++ b/lib/librthread/arch/i386/_atomic_lock.c @@ -1,4 +1,4 @@ -/* $OpenBSD: _atomic_lock.c,v 1.2 2006/01/05 22:33:23 marc Exp $ */ +/* $OpenBSD: _atomic_lock.c,v 1.3 2010/12/03 19:44:22 miod Exp $ */ /* David Leonard, <d@csee.uq.edu.au>. Public domain. */ /* @@ -8,18 +8,18 @@ #include <spinlock.h> int -_atomic_lock(register volatile _spinlock_lock_t *lock) +_atomic_lock(volatile _spinlock_lock_t *lock) { - register _spinlock_lock_t old; + _spinlock_lock_t old; /* * Use the eXCHanGe instruction to swap the lock value with * a local variable containing the locked state. */ old = _SPINLOCK_LOCKED; - __asm__("xchg %0,%1" - : "=r" (old), "=m" (*lock) - : "0" (old), "1" (*lock)); + __asm__("xchg %0,(%2)" + : "=r" (old) + : "0" (old), "r" (lock)); return (old != _SPINLOCK_UNLOCKED); } |