Commit3355498

committed

Fix for NS32K machine.

1 parent0498b6a commit3355498Copy full SHA for 3355498

File tree

+14

-18

lines changed

+14

-18

lines changed

Lines changed: 12 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`*`
`8`	`8`	`*`
`9`	`9`	`* IDENTIFICATION`
`10`		`- * $Header: /cvsroot/pgsql/src/backend/storage/buffer/Attic/s_lock.c,v 1.10 1998/09/03 02:14:39 momjian Exp $`
	`10`	`+ * $Header: /cvsroot/pgsql/src/backend/storage/buffer/Attic/s_lock.c,v 1.11 1998/09/18 05:36:23 momjian Exp $`
`11`	`11`	`*`
`12`	`12`	`*-------------------------------------------------------------------------`
`13`	`13`	`*/`
`@@ -118,6 +118,17 @@ success:\n\`
`118`	`118`	`#endif/* PPC */`
`119`	`119`
`120`	`120`
	`121`	`+#if defined(__ns32k__)`
	`122`	`+int`
	`123`	`+tas(volatileslock_t*lock)`
	`124`	`+{`
	`125`	`+intres;`
	`126`	`+ __asm__("sbitb 0, %0" :"=m"(*lock));`
	`127`	`+ __asm__("sprb us, %0" :"=r"(res));`
	`128`	`+res= (res >>5)&1;`
	`129`	`+returnres;`
	`130`	`+}`
	`131`	`+#endif`
`121`	`132`
`122`	`133`	`#else/* defined(__GNUC__) */`
`123`	`134`	`/***************************************************************************`

Lines changed: 2 additions & 17 deletions

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`*`
`8`	`8`	`*`
`9`	`9`	`* IDENTIFICATION`
`10`		`- * $Header: /cvsroot/pgsql/src/include/storage/s_lock.h,v 1.47 1998/09/12 16:07:53 momjian Exp $`
	`10`	`+ * $Header: /cvsroot/pgsql/src/include/storage/s_lock.h,v 1.48 1998/09/18 05:36:24 momjian Exp $`
`11`	`11`	`*`
`12`	`12`	`*-------------------------------------------------------------------------`
`13`	`13`	`*/`
`@@ -213,22 +213,7 @@ tas(slock_t *s_lock)`
`213`	`213`	`#endif/* NEED_I386_TAS_ASM */`
`214`	`214`
`215`	`215`
`216`		`-`
`217`		`-#if defined(NEED_NS32K_TAS_ASM)`
`218`		`-`
`219`		`-#defineS_LOCK(lock)\`
`220`		`-{\`
`221`		`-slock_t res = 1;\`
`222`		`-while (res) {\`
`223`		`- __asm__("movqd 0, r0");\`
`224`		`- __asm__("sbitd r0, %0" : "=m"(*lock));\`
`225`		`- __asm__("sprb us, %0" : "=r" (res));\`
`226`		`- res = ((res >> 5) & 1);\`
`227`		`-}\`
`228`		`-}`
`229`		`-`
`230`		`-#endif/* NEED_NS32K_TAS_ASM */`
`231`		`-`
	`216`	`+/* NS32K code is in s_lock.c */`
`232`	`217`
`233`	`218`	`#endif/* defined(__GNUC__) */`
`234`	`219`

Comments

(0)