D21836.id62735.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D21836.id62735.diff
View Options

	Index: sys/mips/include/atomic.h
	===================================================================
	--- sys/mips/include/atomic.h
	+++ sys/mips/include/atomic.h
	@@ -398,17 +398,16 @@
	int ret;

	__asm __volatile (
	- "1:\n\t"
	"ll %0, %1\n\t" /* load old value */
	- "bne %0, %4, 2f\n\t" /* compare */
	+ "bne %0, %4, 1f\n\t" /* compare */
	"move %0, %3\n\t" /* value to store */
	"sc %0, %1\n\t" /* attempt to store */
	- "beqz %0, 1b\n\t" /* if it failed, spin */
	- "j 3f\n\t"
	- "2:\n\t"
	+ "j 2f\n\t" /* exit on failure */
	+ "nop\n\t" /* avoid delay slot accident */
	+ "1:\n\t"
	"sw %0, %2\n\t" /* save old value */
	"li %0, 0\n\t"
	- "3:\n"
	+ "2:\n"
	: "=&r" (ret), "+m" (p), "=m" (cmpval)
	: "r" (newval), "r" (*cmpval)
	: "memory");
	@@ -508,17 +507,16 @@
	int ret;

	__asm __volatile (
	- "1:\n\t"
	"lld %0, %1\n\t" /* load old value */
	- "bne %0, %4, 2f\n\t" /* compare */
	+ "bne %0, %4, 1f\n\t" /* compare */
	"move %0, %3\n\t" /* value to store */
	"scd %0, %1\n\t" /* attempt to store */
	- "beqz %0, 1b\n\t" /* if it failed, spin */
	- "j 3f\n\t"
	- "2:\n\t"
	+ "j 2f\n\t" /* exit on failure */
	+ "nop\n\t" /* avoid delay slot accident */
	+ "1:\n\t"
	"sd %0, %2\n\t" /* save old value */
	"li %0, 0\n\t"
	- "3:\n"
	+ "2:\n"
	: "=&r" (ret), "+m" (p), "=m" (cmpval)
	: "r" (newval), "r" (*cmpval)
	: "memory");