patch-2.3.13 linux/arch/sparc64/kernel/winfixup.S

Next file: linux/arch/sparc64/lib/VIScopy.S
Previous file: linux/arch/sparc64/kernel/unaligned.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.3.12/linux/arch/sparc64/kernel/winfixup.S linux/arch/sparc64/kernel/winfixup.S
@@ -1,4 +1,4 @@
-/* $Id: winfixup.S,v 1.27 1998/09/25 01:09:14 davem Exp $
+/* $Id: winfixup.S,v 1.28 1999/07/30 09:35:34 davem Exp $
  *
  * winfixup.S: Handle cases where user stack pointer is found to be bogus.
  *
@@ -95,56 +95,56 @@
 	 * do not touch %g7 or %g2 so we handle the two cases fine.
 	 */
 spill_fixup:
-	lduh		[%g6 + AOFF_task_tss + AOFF_thread_flags], %g1
+	ldub		[%g6 + AOFF_task_thread + AOFF_thread_flags], %g1
 	andcc		%g1, SPARC_FLAG_32BIT, %g0
-	lduh		[%g6 + AOFF_task_tss + AOFF_thread_w_saved], %g1
+	ldub		[%g6 + AOFF_task_thread + AOFF_thread_w_saved], %g1
 
 	sll		%g1, 3, %g3
 	add		%g6, %g3, %g3
-	stx		%sp, [%g3 + AOFF_task_tss + AOFF_thread_rwbuf_stkptrs]
+	stx		%sp, [%g3 + AOFF_task_thread + AOFF_thread_rwbuf_stkptrs]
 	sll		%g1, 7, %g3
 	bne,pt		%xcc, 1f
 	 add		%g6, %g3, %g3
-	stx		%l0, [%g3 + AOFF_task_tss + AOFF_thread_reg_window + 0x00]
-	stx		%l1, [%g3 + AOFF_task_tss + AOFF_thread_reg_window + 0x08]
+	stx		%l0, [%g3 + AOFF_task_thread + AOFF_thread_reg_window + 0x00]
+	stx		%l1, [%g3 + AOFF_task_thread + AOFF_thread_reg_window + 0x08]
 
-	stx		%l2, [%g3 + AOFF_task_tss + AOFF_thread_reg_window + 0x10]
-	stx		%l3, [%g3 + AOFF_task_tss + AOFF_thread_reg_window + 0x18]
-	stx		%l4, [%g3 + AOFF_task_tss + AOFF_thread_reg_window + 0x20]
-	stx		%l5, [%g3 + AOFF_task_tss + AOFF_thread_reg_window + 0x28]
-	stx		%l6, [%g3 + AOFF_task_tss + AOFF_thread_reg_window + 0x30]
-	stx		%l7, [%g3 + AOFF_task_tss + AOFF_thread_reg_window + 0x38]
-	stx		%i0, [%g3 + AOFF_task_tss + AOFF_thread_reg_window + 0x40]
-	stx		%i1, [%g3 + AOFF_task_tss + AOFF_thread_reg_window + 0x48]
-
-	stx		%i2, [%g3 + AOFF_task_tss + AOFF_thread_reg_window + 0x50]
-	stx		%i3, [%g3 + AOFF_task_tss + AOFF_thread_reg_window + 0x58]
-	stx		%i4, [%g3 + AOFF_task_tss + AOFF_thread_reg_window + 0x60]
-	stx		%i5, [%g3 + AOFF_task_tss + AOFF_thread_reg_window + 0x68]
-	stx		%i6, [%g3 + AOFF_task_tss + AOFF_thread_reg_window + 0x70]
+	stx		%l2, [%g3 + AOFF_task_thread + AOFF_thread_reg_window + 0x10]
+	stx		%l3, [%g3 + AOFF_task_thread + AOFF_thread_reg_window + 0x18]
+	stx		%l4, [%g3 + AOFF_task_thread + AOFF_thread_reg_window + 0x20]
+	stx		%l5, [%g3 + AOFF_task_thread + AOFF_thread_reg_window + 0x28]
+	stx		%l6, [%g3 + AOFF_task_thread + AOFF_thread_reg_window + 0x30]
+	stx		%l7, [%g3 + AOFF_task_thread + AOFF_thread_reg_window + 0x38]
+	stx		%i0, [%g3 + AOFF_task_thread + AOFF_thread_reg_window + 0x40]
+	stx		%i1, [%g3 + AOFF_task_thread + AOFF_thread_reg_window + 0x48]
+
+	stx		%i2, [%g3 + AOFF_task_thread + AOFF_thread_reg_window + 0x50]
+	stx		%i3, [%g3 + AOFF_task_thread + AOFF_thread_reg_window + 0x58]
+	stx		%i4, [%g3 + AOFF_task_thread + AOFF_thread_reg_window + 0x60]
+	stx		%i5, [%g3 + AOFF_task_thread + AOFF_thread_reg_window + 0x68]
+	stx		%i6, [%g3 + AOFF_task_thread + AOFF_thread_reg_window + 0x70]
 	b,pt		%xcc, 2f
-	 stx		%i7, [%g3 + AOFF_task_tss + AOFF_thread_reg_window + 0x78]
-1:	stw		%l0, [%g3 + AOFF_task_tss + AOFF_thread_reg_window + 0x00]
+	 stx		%i7, [%g3 + AOFF_task_thread + AOFF_thread_reg_window + 0x78]
+1:	stw		%l0, [%g3 + AOFF_task_thread + AOFF_thread_reg_window + 0x00]
 
-	stw		%l1, [%g3 + AOFF_task_tss + AOFF_thread_reg_window + 0x04]
-	stw		%l2, [%g3 + AOFF_task_tss + AOFF_thread_reg_window + 0x08]
-	stw		%l3, [%g3 + AOFF_task_tss + AOFF_thread_reg_window + 0x0c]
-	stw		%l4, [%g3 + AOFF_task_tss + AOFF_thread_reg_window + 0x10]
-	stw		%l5, [%g3 + AOFF_task_tss + AOFF_thread_reg_window + 0x14]
-	stw		%l6, [%g3 + AOFF_task_tss + AOFF_thread_reg_window + 0x18]
-	stw		%l7, [%g3 + AOFF_task_tss + AOFF_thread_reg_window + 0x1c]
-	stw		%i0, [%g3 + AOFF_task_tss + AOFF_thread_reg_window + 0x20]
-
-	stw		%i1, [%g3 + AOFF_task_tss + AOFF_thread_reg_window + 0x24]
-	stw		%i2, [%g3 + AOFF_task_tss + AOFF_thread_reg_window + 0x28]
-	stw		%i3, [%g3 + AOFF_task_tss + AOFF_thread_reg_window + 0x2c]
-	stw		%i4, [%g3 + AOFF_task_tss + AOFF_thread_reg_window + 0x30]
-	stw		%i5, [%g3 + AOFF_task_tss + AOFF_thread_reg_window + 0x34]
-	stw		%i6, [%g3 + AOFF_task_tss + AOFF_thread_reg_window + 0x38]
-	stw		%i7, [%g3 + AOFF_task_tss + AOFF_thread_reg_window + 0x3c]
+	stw		%l1, [%g3 + AOFF_task_thread + AOFF_thread_reg_window + 0x04]
+	stw		%l2, [%g3 + AOFF_task_thread + AOFF_thread_reg_window + 0x08]
+	stw		%l3, [%g3 + AOFF_task_thread + AOFF_thread_reg_window + 0x0c]
+	stw		%l4, [%g3 + AOFF_task_thread + AOFF_thread_reg_window + 0x10]
+	stw		%l5, [%g3 + AOFF_task_thread + AOFF_thread_reg_window + 0x14]
+	stw		%l6, [%g3 + AOFF_task_thread + AOFF_thread_reg_window + 0x18]
+	stw		%l7, [%g3 + AOFF_task_thread + AOFF_thread_reg_window + 0x1c]
+	stw		%i0, [%g3 + AOFF_task_thread + AOFF_thread_reg_window + 0x20]
+
+	stw		%i1, [%g3 + AOFF_task_thread + AOFF_thread_reg_window + 0x24]
+	stw		%i2, [%g3 + AOFF_task_thread + AOFF_thread_reg_window + 0x28]
+	stw		%i3, [%g3 + AOFF_task_thread + AOFF_thread_reg_window + 0x2c]
+	stw		%i4, [%g3 + AOFF_task_thread + AOFF_thread_reg_window + 0x30]
+	stw		%i5, [%g3 + AOFF_task_thread + AOFF_thread_reg_window + 0x34]
+	stw		%i6, [%g3 + AOFF_task_thread + AOFF_thread_reg_window + 0x38]
+	stw		%i7, [%g3 + AOFF_task_thread + AOFF_thread_reg_window + 0x3c]
 2:	add		%g1, 1, %g1
 
-	sth		%g1, [%g6 + AOFF_task_tss + AOFF_thread_w_saved]
+	stb		%g1, [%g6 + AOFF_task_thread + AOFF_thread_w_saved]
 	rdpr		%tstate, %g1
 	andcc		%g1, TSTATE_PRIV, %g0
 	saved
@@ -208,47 +208,47 @@
 	b,pt		%xcc, rtrap
 	 nop						! yes, the nop is correct
 spill_fixup_mna:
-	lduh		[%g6 + AOFF_task_tss + AOFF_thread_flags], %g1
+	ldub		[%g6 + AOFF_task_thread + AOFF_thread_flags], %g1
 	andcc		%g1, SPARC_FLAG_32BIT, %g0
-	lduh		[%g6 + AOFF_task_tss + AOFF_thread_w_saved], %g1
+	ldub		[%g6 + AOFF_task_thread + AOFF_thread_w_saved], %g1
 	sll		%g1, 3, %g3
 	add		%g6, %g3, %g3
-	stx		%sp, [%g3 + AOFF_task_tss + AOFF_thread_rwbuf_stkptrs]
+	stx		%sp, [%g3 + AOFF_task_thread + AOFF_thread_rwbuf_stkptrs]
 
 	sll		%g1, 7, %g3
 	bne,pt		%xcc, 1f
 	 add		%g6, %g3, %g3
-	stx		%l0, [%g3 + AOFF_task_tss + AOFF_thread_reg_window + 0x00]
-	stx		%l1, [%g3 + AOFF_task_tss + AOFF_thread_reg_window + 0x08]
-	stx		%l2, [%g3 + AOFF_task_tss + AOFF_thread_reg_window + 0x10]
-	stx		%l3, [%g3 + AOFF_task_tss + AOFF_thread_reg_window + 0x18]
-	stx		%l4, [%g3 + AOFF_task_tss + AOFF_thread_reg_window + 0x20]
-
-	stx		%l5, [%g3 + AOFF_task_tss + AOFF_thread_reg_window + 0x28]
-	stx		%l6, [%g3 + AOFF_task_tss + AOFF_thread_reg_window + 0x30]
-	stx		%l7, [%g3 + AOFF_task_tss + AOFF_thread_reg_window + 0x38]
-	stx		%i0, [%g3 + AOFF_task_tss + AOFF_thread_reg_window + 0x40]
-	stx		%i1, [%g3 + AOFF_task_tss + AOFF_thread_reg_window + 0x48]
-	stx		%i2, [%g3 + AOFF_task_tss + AOFF_thread_reg_window + 0x50]
-	stx		%i3, [%g3 + AOFF_task_tss + AOFF_thread_reg_window + 0x58]
-	stx		%i4, [%g3 + AOFF_task_tss + AOFF_thread_reg_window + 0x60]
-
-	stx		%i5, [%g3 + AOFF_task_tss + AOFF_thread_reg_window + 0x68]
-	stx		%i6, [%g3 + AOFF_task_tss + AOFF_thread_reg_window + 0x70]
-	stx		%i7, [%g3 + AOFF_task_tss + AOFF_thread_reg_window + 0x78]
+	stx		%l0, [%g3 + AOFF_task_thread + AOFF_thread_reg_window + 0x00]
+	stx		%l1, [%g3 + AOFF_task_thread + AOFF_thread_reg_window + 0x08]
+	stx		%l2, [%g3 + AOFF_task_thread + AOFF_thread_reg_window + 0x10]
+	stx		%l3, [%g3 + AOFF_task_thread + AOFF_thread_reg_window + 0x18]
+	stx		%l4, [%g3 + AOFF_task_thread + AOFF_thread_reg_window + 0x20]
+
+	stx		%l5, [%g3 + AOFF_task_thread + AOFF_thread_reg_window + 0x28]
+	stx		%l6, [%g3 + AOFF_task_thread + AOFF_thread_reg_window + 0x30]
+	stx		%l7, [%g3 + AOFF_task_thread + AOFF_thread_reg_window + 0x38]
+	stx		%i0, [%g3 + AOFF_task_thread + AOFF_thread_reg_window + 0x40]
+	stx		%i1, [%g3 + AOFF_task_thread + AOFF_thread_reg_window + 0x48]
+	stx		%i2, [%g3 + AOFF_task_thread + AOFF_thread_reg_window + 0x50]
+	stx		%i3, [%g3 + AOFF_task_thread + AOFF_thread_reg_window + 0x58]
+	stx		%i4, [%g3 + AOFF_task_thread + AOFF_thread_reg_window + 0x60]
+
+	stx		%i5, [%g3 + AOFF_task_thread + AOFF_thread_reg_window + 0x68]
+	stx		%i6, [%g3 + AOFF_task_thread + AOFF_thread_reg_window + 0x70]
+	stx		%i7, [%g3 + AOFF_task_thread + AOFF_thread_reg_window + 0x78]
 	b,pt		%xcc, 2f
 	 add		%g1, 1, %g1
-1:	std		%l0, [%g3 + AOFF_task_tss + AOFF_thread_reg_window + 0x00]
-	std		%l2, [%g3 + AOFF_task_tss + AOFF_thread_reg_window + 0x08]
-	std		%l4, [%g3 + AOFF_task_tss + AOFF_thread_reg_window + 0x10]
-
-	std		%l6, [%g3 + AOFF_task_tss + AOFF_thread_reg_window + 0x18]
-	std		%i0, [%g3 + AOFF_task_tss + AOFF_thread_reg_window + 0x20]
-	std		%i2, [%g3 + AOFF_task_tss + AOFF_thread_reg_window + 0x28]
-	std		%i4, [%g3 + AOFF_task_tss + AOFF_thread_reg_window + 0x30]
-	std		%i6, [%g3 + AOFF_task_tss + AOFF_thread_reg_window + 0x38]
+1:	std		%l0, [%g3 + AOFF_task_thread + AOFF_thread_reg_window + 0x00]
+	std		%l2, [%g3 + AOFF_task_thread + AOFF_thread_reg_window + 0x08]
+	std		%l4, [%g3 + AOFF_task_thread + AOFF_thread_reg_window + 0x10]
+
+	std		%l6, [%g3 + AOFF_task_thread + AOFF_thread_reg_window + 0x18]
+	std		%i0, [%g3 + AOFF_task_thread + AOFF_thread_reg_window + 0x20]
+	std		%i2, [%g3 + AOFF_task_thread + AOFF_thread_reg_window + 0x28]
+	std		%i4, [%g3 + AOFF_task_thread + AOFF_thread_reg_window + 0x30]
+	std		%i6, [%g3 + AOFF_task_thread + AOFF_thread_reg_window + 0x38]
 	add		%g1, 1, %g1
-2:	sth		%g1, [%g6 + AOFF_task_tss + AOFF_thread_w_saved]
+2:	stb		%g1, [%g6 + AOFF_task_thread + AOFF_thread_w_saved]
 	rdpr		%tstate, %g1
 
 	andcc		%g1, TSTATE_PRIV, %g0
@@ -315,47 +315,47 @@
 	b,pt		%xcc, rtrap
 	 nop						! yes, the nop is correct
 spill_fixup_dax:
-	lduh		[%g6 + AOFF_task_tss + AOFF_thread_flags], %g1
+	ldub		[%g6 + AOFF_task_thread + AOFF_thread_flags], %g1
 	andcc		%g1, SPARC_FLAG_32BIT, %g0
-	lduh		[%g6 + AOFF_task_tss + AOFF_thread_w_saved], %g1
+	ldub		[%g6 + AOFF_task_thread + AOFF_thread_w_saved], %g1
 	sll		%g1, 3, %g3
 	add		%g6, %g3, %g3
-	stx		%sp, [%g3 + AOFF_task_tss + AOFF_thread_rwbuf_stkptrs]
+	stx		%sp, [%g3 + AOFF_task_thread + AOFF_thread_rwbuf_stkptrs]
 
 	sll		%g1, 7, %g3
 	bne,pt		%xcc, 1f
 	 add		%g6, %g3, %g3
-	stx		%l0, [%g3 + AOFF_task_tss + AOFF_thread_reg_window + 0x00]
-	stx		%l1, [%g3 + AOFF_task_tss + AOFF_thread_reg_window + 0x08]
-	stx		%l2, [%g3 + AOFF_task_tss + AOFF_thread_reg_window + 0x10]
-	stx		%l3, [%g3 + AOFF_task_tss + AOFF_thread_reg_window + 0x18]
-	stx		%l4, [%g3 + AOFF_task_tss + AOFF_thread_reg_window + 0x20]
-
-	stx		%l5, [%g3 + AOFF_task_tss + AOFF_thread_reg_window + 0x28]
-	stx		%l6, [%g3 + AOFF_task_tss + AOFF_thread_reg_window + 0x30]
-	stx		%l7, [%g3 + AOFF_task_tss + AOFF_thread_reg_window + 0x38]
-	stx		%i0, [%g3 + AOFF_task_tss + AOFF_thread_reg_window + 0x40]
-	stx		%i1, [%g3 + AOFF_task_tss + AOFF_thread_reg_window + 0x48]
-	stx		%i2, [%g3 + AOFF_task_tss + AOFF_thread_reg_window + 0x50]
-	stx		%i3, [%g3 + AOFF_task_tss + AOFF_thread_reg_window + 0x58]
-	stx		%i4, [%g3 + AOFF_task_tss + AOFF_thread_reg_window + 0x60]
-
-	stx		%i5, [%g3 + AOFF_task_tss + AOFF_thread_reg_window + 0x68]
-	stx		%i6, [%g3 + AOFF_task_tss + AOFF_thread_reg_window + 0x70]
-	stx		%i7, [%g3 + AOFF_task_tss + AOFF_thread_reg_window + 0x78]
+	stx		%l0, [%g3 + AOFF_task_thread + AOFF_thread_reg_window + 0x00]
+	stx		%l1, [%g3 + AOFF_task_thread + AOFF_thread_reg_window + 0x08]
+	stx		%l2, [%g3 + AOFF_task_thread + AOFF_thread_reg_window + 0x10]
+	stx		%l3, [%g3 + AOFF_task_thread + AOFF_thread_reg_window + 0x18]
+	stx		%l4, [%g3 + AOFF_task_thread + AOFF_thread_reg_window + 0x20]
+
+	stx		%l5, [%g3 + AOFF_task_thread + AOFF_thread_reg_window + 0x28]
+	stx		%l6, [%g3 + AOFF_task_thread + AOFF_thread_reg_window + 0x30]
+	stx		%l7, [%g3 + AOFF_task_thread + AOFF_thread_reg_window + 0x38]
+	stx		%i0, [%g3 + AOFF_task_thread + AOFF_thread_reg_window + 0x40]
+	stx		%i1, [%g3 + AOFF_task_thread + AOFF_thread_reg_window + 0x48]
+	stx		%i2, [%g3 + AOFF_task_thread + AOFF_thread_reg_window + 0x50]
+	stx		%i3, [%g3 + AOFF_task_thread + AOFF_thread_reg_window + 0x58]
+	stx		%i4, [%g3 + AOFF_task_thread + AOFF_thread_reg_window + 0x60]
+
+	stx		%i5, [%g3 + AOFF_task_thread + AOFF_thread_reg_window + 0x68]
+	stx		%i6, [%g3 + AOFF_task_thread + AOFF_thread_reg_window + 0x70]
+	stx		%i7, [%g3 + AOFF_task_thread + AOFF_thread_reg_window + 0x78]
 	b,pt		%xcc, 2f
 	 add		%g1, 1, %g1
-1:	std		%l0, [%g3 + AOFF_task_tss + AOFF_thread_reg_window + 0x00]
-	std		%l2, [%g3 + AOFF_task_tss + AOFF_thread_reg_window + 0x08]
-	std		%l4, [%g3 + AOFF_task_tss + AOFF_thread_reg_window + 0x10]
-
-	std		%l6, [%g3 + AOFF_task_tss + AOFF_thread_reg_window + 0x18]
-	std		%i0, [%g3 + AOFF_task_tss + AOFF_thread_reg_window + 0x20]
-	std		%i2, [%g3 + AOFF_task_tss + AOFF_thread_reg_window + 0x28]
-	std		%i4, [%g3 + AOFF_task_tss + AOFF_thread_reg_window + 0x30]
-	std		%i6, [%g3 + AOFF_task_tss + AOFF_thread_reg_window + 0x38]
+1:	std		%l0, [%g3 + AOFF_task_thread + AOFF_thread_reg_window + 0x00]
+	std		%l2, [%g3 + AOFF_task_thread + AOFF_thread_reg_window + 0x08]
+	std		%l4, [%g3 + AOFF_task_thread + AOFF_thread_reg_window + 0x10]
+
+	std		%l6, [%g3 + AOFF_task_thread + AOFF_thread_reg_window + 0x18]
+	std		%i0, [%g3 + AOFF_task_thread + AOFF_thread_reg_window + 0x20]
+	std		%i2, [%g3 + AOFF_task_thread + AOFF_thread_reg_window + 0x28]
+	std		%i4, [%g3 + AOFF_task_thread + AOFF_thread_reg_window + 0x30]
+	std		%i6, [%g3 + AOFF_task_thread + AOFF_thread_reg_window + 0x38]
 	add		%g1, 1, %g1
-2:	sth		%g1, [%g6 + AOFF_task_tss + AOFF_thread_w_saved]
+2:	stb		%g1, [%g6 + AOFF_task_thread + AOFF_thread_w_saved]
 	rdpr		%tstate, %g1
 
 	andcc		%g1, TSTATE_PRIV, %g0

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)