patch-2.3.99-pre9 linux/arch/mips64/kernel/r4k_tlb_glue.S

Next file: linux/arch/mips64/kernel/scall_64.S
Previous file: linux/arch/mips64/kernel/r4k_tlb_debug.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.3.99-pre8/linux/arch/mips64/kernel/r4k_tlb_glue.S linux/arch/mips64/kernel/r4k_tlb_glue.S
@@ -1,4 +1,4 @@
-/* $Id: r4k_tlb_glue.S,v 1.2 2000/01/17 23:32:46 ralf Exp $
+/* $Id: r4k_tlb_glue.S,v 1.5 1999/11/23 17:12:49 ralf Exp $
  *
  * This file is subject to the terms and conditions of the GNU General Public
  * License.  See the file "COPYING" in the main directory of this archive
@@ -23,10 +23,26 @@
 	END(__tlb_refill_debug_tramp)
 	__FINIT
 
-	.macro	tlb_handler name
+	.macro	__BUILD_cli
+	CLI
+	.endm
+
+	.macro	__BUILD_sti
+	STI
+	.endm
+
+	.macro	tlb_handler name interruptible
 	NESTED(__\name, PT_SIZE, sp)
 	SAVE_ALL
-	CLI
+#if DEBUG_MIPS64
+jal dodebug2
+ld $4, PT_R4(sp)
+ld $5, PT_R5(sp)
+ld $6, PT_R6(sp)
+ld $7, PT_R7(sp)
+ld $2, PT_R2(sp)
+#endif
+	__BUILD_\interruptible
 	dmfc0	t0, CP0_BADVADDR
 	sd	t0, PT_BVADDR(sp)
 	move	a0, sp
@@ -35,8 +51,8 @@
 	END(__\name)
 	.endm
 
-	tlb_handler	tlb_refill_debug
-	tlb_handler	xtlb_refill_debug
-	tlb_handler	xtlb_mod_debug
-	tlb_handler	xtlb_tlbl_debug
-	tlb_handler	xtlb_tlbs_debug
+	tlb_handler	tlb_refill_debug cli
+	tlb_handler	xtlb_refill_debug cli
+	tlb_handler	xtlb_mod_debug sti
+	tlb_handler	xtlb_tlbl_debug sti
+	tlb_handler	xtlb_tlbs_debug sti

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