opensourcemirror
/
postgresql
mirror of git://git.postgresql.org/git/postgresql.git
1
0
Fork 0
Code Issues Releases Wiki Activity

NS32K lock patch reversed.

This commit is contained in:
Bruce Momjian 1998-09-18 17:18:41 +00:00
parent 1202ab259a
commit 4a9da7e5c4
2 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/backend/storage/buffer/s_lock.c
View File

@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/storage/buffer/Attic/s_lock.c,v 1.11 1998/09/18 05:36:23 momjian Exp $
* $Header: /cvsroot/pgsql/src/backend/storage/buffer/Attic/s_lock.c,v 1.12 1998/09/18 17:18:39 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@ -118,17 +118,6 @@ success: \n\
#endif /* PPC */
#if defined(__ns32k__)
int
tas(volatile slock_t *lock)
{
int res;
__asm__("sbitb 0, %0" : "=m"(*lock));
__asm__("sprb us, %0" : "=r"(res));
res = (res >> 5) & 1;
return res;
}
#endif
#else /* defined(__GNUC__) */
/***************************************************************************

19
src/include/storage/s_lock.h
View File

@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/include/storage/s_lock.h,v 1.48 1998/09/18 05:36:24 momjian Exp $
* $Header: /cvsroot/pgsql/src/include/storage/s_lock.h,v 1.49 1998/09/18 17:18:41 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@ -213,7 +213,22 @@ tas(slock_t *s_lock)
#endif /* NEED_I386_TAS_ASM */
/* NS32K code is in s_lock.c */
#if defined(NEED_NS32K_TAS_ASM)
#define S_LOCK(lock) \
{ \
slock_t res = 1; \
while (res) { \
__asm__("movqd 0, r0"); \
__asm__("sbitd r0, %0" : "=m"(*lock)); \
__asm__("sprb us, %0" : "=r" (res)); \
res = ((res >> 5) & 1); \
} \
}
#endif /* NEED_NS32K_TAS_ASM */
#endif /* defined(__GNUC__) */