Commit5824d02

committed

Get the MIPS assembler syntax right. Also add a separate sync command;

the reference I consulted yesterday said SC does a SYNC, but apparentlythis is not true on newer MIPS processors, so be safe.

1 parent338e28e commit5824d02Copy full SHA for 5824d02

File tree

-4

lines changed

-4

lines changed

Lines changed: 6 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,7 @@`
`66`	`66`	`* Portions Copyright (c) 1996-2005, PostgreSQL Global Development Group`
`67`	`67`	`* Portions Copyright (c) 1994, Regents of the University of California`
`68`	`68`	`*`
`69`		`- * $PostgreSQL: pgsql/src/include/storage/s_lock.h,v 1.137 2005/08/2622:04:42 tgl Exp $`
	`69`	`+ * $PostgreSQL: pgsql/src/include/storage/s_lock.h,v 1.138 2005/08/27 16:22:48 tgl Exp $`
`70`	`70`	`*`
`71`	`71`	`*-------------------------------------------------------------------------`
`72`	`72`	`*/`
`@@ -455,6 +455,7 @@ do \`
`455`	`455`
`456`	`456`	`#if defined(__mips__)&& !defined(__sgi)`
`457`	`457`	`/* Note: on SGI we use the OS' mutex ABI, see below */`
	`458`	`+/* Note: R10000 processors require a separate SYNC */`
`458`	`459`	`#defineHAS_TEST_AND_SET`
`459`	`460`
`460`	`461`	`typedefunsignedintslock_t;`
`@@ -474,11 +475,12 @@ tas(volatile slock_t *lock)`
`474`	`475`	`" .set noreorder \n"`
`475`	`476`	`" .set nomacro \n"`
`476`	`477`	`" ll %0, %2 \n"`
`477`		`-" or %1, %0,$1 \n"`
	`478`	`+" or %1, %0,1 \n"`
`478`	`479`	`" sc %1, %2 \n"`
`479`		`-" xori %1,$1 \n"`
	`480`	`+" xori %1,1 \n"`
`480`	`481`	`" or %0, %0, %1 \n"`
`481`		`-"1: .set pop "`
	`482`	`+" sync \n"`
	`483`	`+" .set pop "`
`482`	`484`	`:"=&r" (_res),"=&r" (_tmp),"+R" (*_l)`
`483`	`485`	`:`
`484`	`486`	`:"memory");`

Comments

(0)

ページ先頭