patch-2.1.43 linux/arch/sparc64/kernel/rtrap.S

• Lines: 203
• Date: Thu Jun 12 16:22:05 1997
• Orig file: v2.1.42/linux/arch/sparc64/kernel/rtrap.S
• Orig date: Thu May 29 21:53:04 1997

diff -u --recursive --new-file v2.1.42/linux/arch/sparc64/kernel/rtrap.S linux/arch/sparc64/kernel/rtrap.S
@@ -1,4 +1,4 @@
-/* $Id: rtrap.S,v 1.18 1997/05/27 06:28:05 davem Exp $
+/* $Id: rtrap.S,v 1.21 1997/06/02 07:26:54 davem Exp $
  * rtrap.S: Preparing for return from trap on Sparc V9.
  *
  * Copyright (C) 1997 Jakub Jelinek (jj@sunsite.mff.cuni.cz)
@@ -17,109 +17,114 @@
 
 	.text
 	.align	32
-	.globl	rtrap
-rtrap:
-	sethi	%hi(bh_active), %l2
-	or	%l2, %lo(bh_active), %l2
-	sethi	%hi(bh_mask), %l1
-	or	%l1, %lo(bh_mask), %l1
-	ldx	[%l2 + %g4], %l3
-	ldx	[%l1 + %g4], %l4
-	andcc	%l3, %l4, %g0
-	nop
+	.globl	rtrap_clr_l6, rtrap
+rtrap_clr_l6:
+	ba,pt		%xcc, rtrap
+	 clr		%l6
+rtrap:	sethi		%hi(bh_active), %l2
+	or		%l2, %lo(bh_active), %l2
+	sethi		%hi(bh_mask), %l1
+	or		%l1, %lo(bh_mask), %l1
+	ldx		[%l2 + %g4], %l3
+	ldx		[%l1 + %g4], %l4
 
-	be,pt	%xcc, 2f
+	andcc		%l3, %l4, %g0
+	be,pt		%xcc, 2f
 	 nop
-	call	do_bottom_half
+	call		do_bottom_half
 	 nop
-2:	ldx	[%sp + STACK_BIAS + REGWIN_SZ + PT_V9_TSTATE], %l1
-	sethi	%hi(0xf << 20), %l4
-	andcc	%l1, TSTATE_PRIV, %l3
-	and	%l1, %l4, %l4
-
-	rdpr	%pstate, %l7
-	andn	%l1, %l4, %l1
-	be,pt	%icc, to_user
-	 andn	%l7, PSTATE_IE, %l7
-3:	ldx	[%g6 + AOFF_task_tss + AOFF_thread_ctx], %l6
-	ldx	[%sp + STACK_BIAS + REGWIN_SZ + PT_V9_G1], %g1
-	ldx	[%sp + STACK_BIAS + REGWIN_SZ + PT_V9_G2], %g2
-	ldx	[%sp + STACK_BIAS + REGWIN_SZ + PT_V9_G3], %g3
-
-	ldx	[%sp + STACK_BIAS + REGWIN_SZ + PT_V9_G4], %g4
-	ldx	[%sp + STACK_BIAS + REGWIN_SZ + PT_V9_G5], %g5
-	ldx	[%sp + STACK_BIAS + REGWIN_SZ + PT_V9_G6], %g6
-	ldx	[%sp + STACK_BIAS + REGWIN_SZ + PT_V9_G7], %g7
-	ldx	[%sp + STACK_BIAS + REGWIN_SZ + PT_V9_I0], %i0
-	ldx	[%sp + STACK_BIAS + REGWIN_SZ + PT_V9_I1], %i1
-	ldx	[%sp + STACK_BIAS + REGWIN_SZ + PT_V9_I2], %i2
-	ldx	[%sp + STACK_BIAS + REGWIN_SZ + PT_V9_I3], %i3
-
-	ldx	[%sp + STACK_BIAS + REGWIN_SZ + PT_V9_I4], %i4
-	ldx	[%sp + STACK_BIAS + REGWIN_SZ + PT_V9_I5], %i5
-	ldx	[%sp + STACK_BIAS + REGWIN_SZ + PT_V9_I6], %i6
-	ldx	[%sp + STACK_BIAS + REGWIN_SZ + PT_V9_I7], %i7
-	ldx	[%sp + STACK_BIAS + REGWIN_SZ + PT_V9_Y], %o3
-	ldx	[%sp + STACK_BIAS + REGWIN_SZ + PT_V9_TPC], %l2
-	ldx	[%sp + STACK_BIAS + REGWIN_SZ + PT_V9_TNPC], %o2
-	wr	%o3, %g0, %y
-
-	srl	%l4, 20, %l4
-	wrpr	%l7, %g0, %pstate
-	wrpr	%l4, 0x0, %pil
-	wrpr	%g0, 0x1, %tl
-	wrpr	%l1, %g0, %tstate
-	wrpr	%l2, %g0, %tpc
-	brnz,pn	%l3, 1f
-	 wrpr	%o2, %g0, %tnpc
-
-	mov	PRIMARY_CONTEXT, %l7
-	sethi	%uhi(KERNBASE), %l5
-	sllx	%l5, 32, %l5
-	stxa	%l6, [%l7] ASI_DMMU
-	flush	%l5
-	rdpr	%wstate, %l1
-	rdpr	%otherwin, %l2
-	srl	%l1, 3, %l1
-
-	wrpr	%l2, %g0, %canrestore
-	wrpr	%l1, %g0, %wstate
-	wrpr	%g0, %g0, %otherwin
-1:	restore
-	retry
+2:	ldx		[%sp + STACK_BIAS + REGWIN_SZ + PT_V9_TSTATE], %l1
+	sethi		%hi(0xf << 20), %l4
+	andcc		%l1, TSTATE_PRIV, %l3
+
+	and		%l1, %l4, %l4
+	rdpr		%pstate, %l7
+	andn		%l1, %l4, %l1
+	be,pt		%icc, to_user
+	 andn		%l7, PSTATE_IE, %l7
+3:	ldx		[%g6 + AOFF_task_tss + AOFF_thread_ctx], %l0
+	ldx		[%sp + STACK_BIAS + REGWIN_SZ + PT_V9_G1], %g1
+	ldx		[%sp + STACK_BIAS + REGWIN_SZ + PT_V9_G2], %g2
+
+	ldx		[%sp + STACK_BIAS + REGWIN_SZ + PT_V9_G3], %g3
+	ldx		[%sp + STACK_BIAS + REGWIN_SZ + PT_V9_G4], %g4
+	ldx		[%sp + STACK_BIAS + REGWIN_SZ + PT_V9_G5], %g5
+	ldx		[%sp + STACK_BIAS + REGWIN_SZ + PT_V9_G6], %g6
+	ldx		[%sp + STACK_BIAS + REGWIN_SZ + PT_V9_G7], %g7
+	wrpr		%l7, PSTATE_AG, %pstate
+	ldx		[%sp + STACK_BIAS + REGWIN_SZ + PT_V9_I0], %i0
+	ldx		[%sp + STACK_BIAS + REGWIN_SZ + PT_V9_I1], %i1
+
+	ldx		[%sp + STACK_BIAS + REGWIN_SZ + PT_V9_I2], %i2
+	ldx		[%sp + STACK_BIAS + REGWIN_SZ + PT_V9_I3], %i3
+	ldx		[%sp + STACK_BIAS + REGWIN_SZ + PT_V9_I4], %i4
+	ldx		[%sp + STACK_BIAS + REGWIN_SZ + PT_V9_I5], %i5
+	ldx		[%sp + STACK_BIAS + REGWIN_SZ + PT_V9_I6], %i6
+	ldx		[%sp + STACK_BIAS + REGWIN_SZ + PT_V9_I7], %i7
+	ldx		[%sp + STACK_BIAS + REGWIN_SZ + PT_V9_Y], %o3
+	ldx		[%sp + STACK_BIAS + REGWIN_SZ + PT_V9_TPC], %l2
+
+	ldx		[%sp + STACK_BIAS + REGWIN_SZ + PT_V9_TNPC], %o2
+	wr		%o3, %g0, %y
+	srl		%l4, 20, %l4
+	wrpr		%l4, 0x0, %pil
+	wrpr		%g0, 0x1, %tl
+	wrpr		%l1, %g0, %tstate
+	wrpr		%l2, %g0, %tpc
+	mov		PRIMARY_CONTEXT, %l7
+
+	wrpr		%o2, %g0, %tnpc
+	brnz,a,pn	%l3, 1f
+	 restore
+	sethi		%uhi(KERNBASE), %l5
+	sllx		%l5, 32, %l5
+	stxa		%l0, [%l7] ASI_DMMU
+	flush		%l5
+	rdpr		%wstate, %l1
+
+	rdpr		%otherwin, %l2
+	srl		%l1, 3, %l1
+	wrpr		%l2, %g0, %canrestore
+	wrpr		%l1, %g0, %wstate
+	wrpr		%g0, %g0, %otherwin
+	restore
+	rdpr		%canrestore, %g1
+	wrpr		%g1, 0x0, %cleanwin
+
+1:	retry
 to_user:
 	sethi	%hi(need_resched), %l0
 	or	%l0, %lo(need_resched), %l0
 	ld	[%l0 + %g4], %l0
-
 	wrpr	%l7, PSTATE_IE, %pstate
 	brz,pt	%l0, check_signal
 	 ldx	[%g6 + AOFF_task_signal], %l0
+	nop
+
 	call	schedule
 	 nop
-	ldx	[%g6 + AOFF_task_signal], %l0
-	nop
+	ba,pt	%xcc, check_signal
+	 ldx	[%g6 + AOFF_task_signal], %l0
 check_signal:
 	ldx	[%g6 + AOFF_task_blocked], %o0
-
-	or	%l7, PSTATE_AG, %l7		! Will need this for setting back wstate
 	andncc	%l0, %o0, %g0
-	be,pt	%xcc, check_user_wins
-	 mov	%l5, %o2  
+	be,a,pt	%xcc, check_user_wins
+	 ldx	[%g6 + AOFF_task_tss + AOFF_thread_w_saved], %o2
+
+	mov	%l5, %o2  
 	mov	%l6, %o3
 	call	do_signal
 	 add	%sp, STACK_BIAS + REGWIN_SZ, %o1
-check_user_wins:
-#if 0
-	call	user_rtrap_report
-	 add	%sp, STACK_BIAS + REGWIN_SZ, %o0
-#endif
 	ldx	[%g6 + AOFF_task_tss + AOFF_thread_w_saved], %o2
-
+	clr	%l6
+check_user_wins:
 	brz,pt	%o2, 3b
-	 add	%sp, STACK_BIAS + REGWIN_SZ, %o1
+	 nop
+
 	call	fault_in_user_windows
-	 add	%o7, 3b-.-4, %o7
+	 add	%sp, STACK_BIAS + REGWIN_SZ, %o0
+	ba,a,pt	%xcc, 3b
+	nop
 	nop
 	nop
 	nop