Unifdef TLB_TRACE and TLBTRACE, no functional change.

3 files changed, 3 insertions, 78 deletions

diff --git a/sys/arch/mips64/mips64/exception.S b/sys/arch/mips64/mips64/exception.S
index 8b8c021dd54..6b55f93c9fe 100644
--- a/sys/arch/mips64/mips64/exception.S
+++ b/sys/arch/mips64/mips64/exception.S
@@ -1,4 +1,4 @@
-/*	$OpenBSD: exception.S,v 1.12 2007/05/09 19:23:17 miod Exp $ */
+/*	$OpenBSD: exception.S,v 1.13 2007/05/25 20:47:19 miod Exp $ */
 
 /*
  * Copyright (c) 2002-2003 Opsycon AB  (www.opsycon.se / www.opsycon.com)
@@ -134,25 +134,6 @@ u_exception_table:
 	.globl	exception
 exception:
 	.set	noat
-#ifdef TLB_TRACE
-	dmfc0	k0, COP_0_EXC_PC
-	PTR_L	k1, tlbtrcptr
-	PTR_S	k0, 0(k1)
-	dmfc0	k0, COP_0_BAD_VADDR
-        PTR_S   k0, REGSZ(k1)
-	mfc0	k0, COP_0_CAUSE_REG
-        PTR_S	k0, 2*REGSZ(k1)
-	mfc0	k0, COP_0_STATUS_REG
-        PTR_S	k0, 3*REGSZ(k1)
-
-        PTR_L   k1, tlbtrcptr
-        PTR_ADDU k1, 4*REGSZ
-        LI      k0, 0x100
-        not     k0, k0
-        and     k1, k0
-        LA      k0, tlbtrcptr
-        PTR_S   k1, 0(k0)
-#endif
 	mfc0	k0, COP_0_STATUS_REG
 	mfc0	k1, COP_0_CAUSE_REG
 	and	k0, k0, SR_KSU_USER
diff --git a/sys/arch/mips64/mips64/tlbhandler.S b/sys/arch/mips64/mips64/tlbhandler.S
index 21782aec400..10d8cd37803 100644
--- a/sys/arch/mips64/mips64/tlbhandler.S
+++ b/sys/arch/mips64/mips64/tlbhandler.S
@@ -1,4 +1,4 @@
-/*	$OpenBSD: tlbhandler.S,v 1.14 2007/05/01 20:40:18 miod Exp $ */
+/*	$OpenBSD: tlbhandler.S,v 1.15 2007/05/25 20:47:19 miod Exp $ */
 
 /*
  * Copyright (c) 1995-2004 Opsycon AB  (www.opsycon.se / www.opsycon.com)
@@ -57,45 +57,6 @@
 	.set	noat
 	.ent	tlb_miss, 0
 tlb_miss:
-#ifdef TLB_TRACE
-	dmfc0	k0, COP_0_EXC_PC
-	PTR_L	k1, tlbtrcptr
-	PTR_S	k0, 0(k1)
-	dmfc0	k0, COP_0_BAD_VADDR
-	PTR_S	zero, 2*REGSZ(k1)
-	PTR_S	zero, 3*REGSZ(k1)
-	bltz	k0, 1f			# kernel address
-	PTR_S	k0, REGSZ(k1)
-
-	PTR_L	k1, curprocpaddr
-	PTR_L	k1, PCB_SEGTAB(k1)
-	PTR_SRL	k0, k0, SEGSHIFT - LOGREGSZ
-	andi	k0, k0, (PMAP_SEGTABSIZE - 1) << LOGREGSZ
-	PTR_ADDU k1, k1, k0
-	PTR_L	k0, 0(k1)		# get pointer to page table
-	PTR_L	k1, tlbtrcptr
-	PTR_S	k0, 2*REGSZ(k1)
-	beqz	k0, 1f
-	dmfc0	k1, COP_0_BAD_VADDR
-
-	PTR_SRL	k1, k1, PGSHIFT - 2
-	andi	k1, k1, ((NPTEPG/2) - 1) << 3
-	PTR_ADDU k1, k1, k0		# index into segment map
-	lwu	k0, 0(k1)		# get page PTE
-	dsll	k0, k0, 32
-	lwu	k1, 4(k1)
-	or	k0, k1
-	PTR_L	k1, tlbtrcptr
-	PTR_S	k0, 3*REGSZ(k1)
-1:
-	PTR_L	k1, tlbtrcptr
-	PTR_ADDU k1, 4*REGSZ
-	LI	k0, 0x100
-	nor	k0, zero, k0
-	and	k1, k0
-	LA	k0, tlbtrcptr
-	PTR_S	k1, 0(k0)
-#endif
 	PTR_L	k1, curprocpaddr
 	dmfc0	k0, COP_0_BAD_VADDR
 	bltz	k0, _k_miss		# kernel address space
diff --git a/sys/arch/mips64/mips64/trap.c b/sys/arch/mips64/mips64/trap.c
index dbae8da612c..78cafb30c45 100644
--- a/sys/arch/mips64/mips64/trap.c
+++ b/sys/arch/mips64/mips64/trap.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: trap.c,v 1.35 2007/05/09 19:23:17 miod Exp $	*/
+/*	$OpenBSD: trap.c,v 1.36 2007/05/25 20:47:19 miod Exp $	*/
 /* tracked to 1.23 */
 
 /*
@@ -861,23 +861,6 @@ trapDump(msg)
 		printf(" RA %p SP %p ADR %p\n", ptrp->ra, ptrp->sp, ptrp->vadr);
 	}
 
-#ifdef TLBTRACE
-	if (tlbtrcptr != NULL) {
-		register_t *next;
-
-		printf("tlbtrace:\n");
-		next = tlbtrcptr;
-		do {
-			if (next[0] != NULL) {
-				printf("pc %p, va %p segtab %p pte %p\n",
-				    next[0], next[1], next[2], next[3]);
-			}
-			next +=  4;
-			next = (register_t *)((long)next & ~0x100);
-		} while (next != tlbtrcptr);
-	}
-#endif
-
 	splx(s);
 }
 #endif