Another try at the inlined MIPS spinlock code. Can't test this myself,

but for sure it's not any more broken than the prior version.
This commit is contained in:
Tom Lane 2005-08-26 22:04:42 +00:00
parent f9244df78f
commit 846319db3f

View File

@ -66,7 +66,7 @@
* Portions Copyright (c) 1996-2005, PostgreSQL Global Development Group * Portions Copyright (c) 1996-2005, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California * Portions Copyright (c) 1994, Regents of the University of California
* *
* $PostgreSQL: pgsql/src/include/storage/s_lock.h,v 1.136 2005/08/26 14:47:35 tgl Exp $ * $PostgreSQL: pgsql/src/include/storage/s_lock.h,v 1.137 2005/08/26 22:04:42 tgl Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -464,25 +464,25 @@ typedef unsigned int slock_t;
static __inline__ int static __inline__ int
tas(volatile slock_t *lock) tas(volatile slock_t *lock)
{ {
register volatile slock_t *__l = lock; register volatile slock_t *_l = lock;
register int __r; register int _res;
register int _tmp;
__asm__ __volatile__( __asm__ __volatile__(
" .set push \n" " .set push \n"
" .set mips2 \n" " .set mips2 \n"
" .set noreorder \n" " .set noreorder \n"
" .set nomacro \n" " .set nomacro \n"
"1: ll %0, %1 \n" " ll %0, %2 \n"
" bne %0, $0, 1f \n" " or %1, %0, $1 \n"
" xori %0, 1 \n" " sc %1, %2 \n"
" sc %0, %1 \n" " xori %1, $1 \n"
" beq %0, $0, 1b \n" " or %0, %0, %1 \n"
" sync \n"
"1: .set pop " "1: .set pop "
: "=&r" (__r), "+R" (*__l) : "=&r" (_res), "=&r" (_tmp), "+R" (*_l)
: :
: "memory", "cc"); : "memory");
return __r; return _res;
} }
#endif /* __mips__ && !__sgi */ #endif /* __mips__ && !__sgi */