patch-2.1.48 linux/arch/sparc64/lib/locks.S

• Lines: 137
• Date: Thu Jul 31 13:09:17 1997
• Orig file: v2.1.47/linux/arch/sparc64/lib/locks.S
• Orig date: Thu Mar 27 14:40:01 1997

diff -u --recursive --new-file v2.1.47/linux/arch/sparc64/lib/locks.S linux/arch/sparc64/lib/locks.S
@@ -1,77 +1,77 @@
-/* $Id: locks.S,v 1.2 1997/03/10 12:28:02 jj Exp $
+/* $Id: locks.S,v 1.3 1997/07/22 05:51:42 davem Exp $
  * locks.S: SMP low-level lock primitives on Sparc64.
  *
  * Copyright (C) 1996 David S. Miller (davem@caip.rutgers.edu)
  */
 
+#include <asm/asm_offsets.h>
 #include <asm/ptrace.h>
+#include <asm/smp.h>
 
 	.text
-	.align	4
-
-	.globl	__spinlock_waitfor
-__spinlock_waitfor:
-1:	orcc	%g2, 0x0, %g0
-	bne	1b
-	 ldub	[%g1], %g2
-	ldstub	[%g1], %g2
-	jmpl	%o7 - 12, %g0
-	 mov	%g5, %o7
-
-	.globl	___become_idt
-___become_idt:
-#if 0 /* Don't know how to do this on the Ultra yet... */
-#endif
-	jmpl	%o7 + 8, %g0
-	 mov	%g5, %o7
+	.align		32
 
 ___lk_busy_spin:
-	orcc	%g2, 0, %g0
-	bne	___lk_busy_spin
-	 ldub	[%g1 + 0], %g2
-	b	1f
-	 ldstub	[%g1 + 0], %g2
+	orcc		%g2, 0, %g0
+	bne,pt		%icc, ___lk_busy_spin
+	 ldub		[%g1 + 0], %g2
+	b,pt		%xcc, 1f
+	 ldstub		[%g1 + 0], %g2
 
-	.globl	___lock_kernel
+	.globl		___lock_kernel
 ___lock_kernel:
-	addcc	%g2, -1, %g2
-	rdpr	%pil, %g3
-	bcs,a	9f
-	 st	%g2, [%g6 + AOFF_task_lock_depth]
-	wrpr	15, %pil
-	ldstub	[%g1 + 0], %g2
-1:	orcc	%g2, 0, %g0
-	bne,a	___lk_busy_spin
-	 ldub	[%g1 + 0], %g2
-	ldub	[%g1 + 2], %g2
-	cmp	%g2, %g5
-	be	2f
-	 stb	%g5, [%g1 + 1]
-	stb	%g5, [%g1 + 2]
-#ifdef __SMP__
-	/* XXX Figure out how to become interrupt receiver in SMP system. */
-#endif
-2:	mov	-1, %g2
-	st	%g2, [%g6 + AOFF_task_lock_depth]
-	wrpr	%g3, %pil
-9:	jmpl	%o7 + 0x8, %g0
-	 mov	%g5, %o7
+	addcc		%g2, -1, %g2
+	rdpr		%pil, %g3
+	bcs,a,pn	%icc, 9f
+	 st		%g2, [%g6 + AOFF_task_lock_depth]
+	wrpr		%g0, 15, %pil
+	ldstub		[%g1 + 0], %g2
+1:	brnz,a,pn	%g2, ___lk_busy_spin
+	 ldub		[%g1 + 0], %g2
+	lduw		[%g6 + AOFF_task_processor], %g2
+	membar		#LoadLoad | #LoadStore
+	stb		%g2, [%g1 + 1]
+2:	mov		-1, %g2
+	st		%g2, [%g6 + AOFF_task_lock_depth]
+	wrpr		%g3, 0, %pil
+9:	jmpl		%o7 + 0x8, %g0
+	 mov		%g5, %o7
+
+	.globl		___lock_reacquire_kernel
+___lock_reacquire_kernel:
+	rdpr		%pil, %g3
+	wrpr		%g0, 15, %pil
+	st		%g2, [%g6 + AOFF_task_lock_depth]
+	ldstub		[%g1 + 0], %g2
+1:	brz,pt		%g2, 3f
+	 ldub		[%g1 + 0], %g2
+2:	brnz,a,pt	%g2, 2b
+	 ldub		[%g1 + 0], %g2
+	b,pt		%xcc, 1b
+	 ldstub		[%g1 + 0], %g2
+3:	lduw		[%g6 + AOFF_task_processor], %g2
+	membar		#LoadLoad | #LoadStore
+	stb		%g2, [%g1 + 1]
+	wrpr		%g3, 0, %pil
+	jmpl		%o7 + 0x8, %g0
+	 mov		%g5, %o7
 
 #undef NO_PROC_ID
 #define NO_PROC_ID	0xff
 
-	.globl	___unlock_kernel
+	.globl		___unlock_kernel
 ___unlock_kernel:
-	addcc	%g2, 1, %g2
-	rdpr	%pil, %g3
-	bne,a	1f
-	 st	%g2, [%g6 + AOFF_task_lock_depth]
-	wrpr	15, %pil
-	mov	NO_PROC_ID, %g2
-	stb	%g2, [%g1 + 1]
-	stb	%g0, [%g1 + 0]
-	st	%g0, [%g6 + AOFF_task_lock_depth]
-	wrpr	%g3, %pil
-1:	jmpl	%o7 + 0x8, %g0
-	 mov	%g5, %o7
+	addcc		%g2, 1, %g2
+	rdpr		%pil, %g3
+	bne,a,pn	%icc, 1f
+	 stw		%g2, [%g6 + AOFF_task_lock_depth]
+	wrpr		15, %pil
+	mov		NO_PROC_ID, %g2
+	stb		%g2, [%g1 + 1]
+	membar		#StoreStore | #LoadStore
+	stb		%g0, [%g1 + 0]
+	stw		%g0, [%g6 + AOFF_task_lock_depth]
+	wrpr		%g3, 0, %pil
+1:	jmpl		%o7 + 0x8, %g0
+	 mov		%g5, %o7