patch-1.3.71 linux/arch/sparc/kernel/switch.S

• Lines: 65
• Date: Mon Mar 4 08:49:56 1996
• Orig file: v1.3.70/linux/arch/sparc/kernel/switch.S
• Orig date: Sat Nov 25 19:04:37 1995

diff -u --recursive --new-file v1.3.70/linux/arch/sparc/kernel/switch.S linux/arch/sparc/kernel/switch.S
@@ -1,4 +1,4 @@
-/* $Id: switch.S,v 1.9 1995/11/25 00:58:32 davem Exp $
+/* $Id: switch.S,v 1.14 1995/12/29 21:47:22 davem Exp $
  * switch.S: Sparc task switch code.
  *
  * Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu)
@@ -13,8 +13,6 @@
 #include <asm/winmacro.h>
 
 #define sw_ntask     g1
-#define sw_sp        g2
-#define sw_pc        g3
 #define sw_psr       g4
 #define sw_wim       g5
 #define sw_tmp       g6
@@ -26,7 +24,7 @@
  * First successful task switch 05/13/95 21:52:37
  */
 	.align 4
-	.globl	C_LABEL(sparc_switch_to), C_LABEL(mmu_switch_lowlevel)
+	.globl	C_LABEL(sparc_switch_to)
 C_LABEL(sparc_switch_to):
 	mov	%o0, %sw_ntask
 
@@ -34,37 +32,24 @@
 	FLUSH_ALL_KERNEL_WINDOWS; 
 	STORE_WINDOW(sp)
 	rd	%psr, %sw_psr
-	sethi	%hi(PSR_EF), %sw_tmp
-	andn	%sw_psr, %sw_tmp, %sw_psr
-	LOAD_CURRENT(sw_tmp)
+	LOAD_CURRENT(sw_tmp, sw_wim)
 	rd	%wim, %sw_wim
 	std	%sw_psr, [%sw_tmp + THREAD_KPSR]
 	std	%sp, [%sw_tmp + THREAD_KSP]
 
 	/* Load new kernel state. */
 	wr	%sw_psr, PSR_ET, %psr
+	WRITE_PAUSE
 	sethi	%hi(C_LABEL(current_set)), %sw_tmp
 	st	%sw_ntask, [%sw_tmp + %lo(C_LABEL(current_set))]
 	ldd	[%sw_ntask + THREAD_KPSR], %sw_psr
-	ldd	[%sw_ntask + THREAD_KSP], %sw_sp
 	wr	%sw_psr, PSR_ET, %psr
 	WRITE_PAUSE
 	wr	%sw_wim, 0x0, %wim
 	WRITE_PAUSE
-	mov	%sw_sp, %sp
+	ldd	[%sw_ntask + THREAD_KSP], %sp
 	LOAD_WINDOW(sp)
-	mov	%sw_pc, %o7
 
-	/* Jump into the proper context. */
-	ld	[%sw_ntask + THREAD_CONTEXT], %sw_ctx
-	tst	%sw_ctx
-	bneg	1f			! this must be swapper
-	 nop
-
-C_LABEL(mmu_switch_lowlevel):
-	sethi	%hi(AC_CONTEXT), %sw_tmp	! else set new context
-	stba	%sw_ctx, [%sw_tmp] ASI_CONTROL
-1:
 	wr	%sw_psr, 0x0, %psr		! traps back on
 	WRITE_PAUSE