NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commit731ea80

committed

Here's the new diff for getting the NS32K assembly code into thespin-locks. Notice that it's now inline assembler in s_lock.h,rather than seperate code in s_lock.c. It also shrank a littlebit... Just rip out the S_LOCK() define and insert the tas() inlinefunction. Please let me know if there are any problems with it.Jon Buller

1 parent744c3cd commit731ea80Copy full SHA for 731ea80

File tree

1 file changed

+17

-19

lines changed

src/include/storage
- s_lock.h

1 file changed

+17

-19

lines changed

`‎src/include/storage/s_lock.h`

Lines changed: 17 additions & 19 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.51 1998/10/01 01:53:50 tgl Exp $`
	`10`	`+ * $Header: /cvsroot/pgsql/src/include/storage/s_lock.h,v 1.52 1998/10/02 15:23:08 momjian Exp $`
`11`	`11`	`*`
`12`	`12`	`*-------------------------------------------------------------------------`
`13`	`13`	`*/`
`@@ -168,6 +168,22 @@ tas(volatile slock_t *lock)`
`168`	`168`
`169`	`169`
`170`	`170`
	`171`	`+#if defined(NEED_NS32K_TAS_ASM)`
	`172`	`+#defineTAS(lock) tas(lock)`
	`173`	`+`
	`174`	`+static __inline__int`
	`175`	`+tas(volatileslock_t*lock)`
	`176`	`+{`
	`177`	`+ register_res;`
	`178`	`+ __asm__("sbitb 0, %0`
	`179`	`+sfsd %1"`
	`180`	`+:"=m"(*lock),"=r"(_res));`
	`181`	`+return (int)_res;`
	`182`	`+}`
	`183`	`+`
	`184`	`+#endif/* NEED_NS32K_TAS_ASM */`
	`185`	`+`
	`186`	`+`
`171`	`187`
`172`	`188`	`#else/* __GNUC__ */`
`173`	`189`	`/***************************************************************************`
`@@ -212,24 +228,6 @@ tas(slock_t *s_lock)`
`212`	`228`
`213`	`229`	`#endif/* NEED_I386_TAS_ASM */`
`214`	`230`
`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`		`-`
`232`		`-`
`233`	`231`	`#endif/* defined(__GNUC__) */`
`234`	`232`
`235`	`233`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit731ea80

File tree

1 file changed

1 file changed

`‎src/include/storage/s_lock.h`

0 commit comments