Module Name: src
Committed By: chs
Date: Sun Aug 8 18:19:56 UTC 2010
Modified Files:
src/sys/arch/sparc64/sparc64: trap.c
Log Message:
remove some unreachable debug code.
To generate a diff of this commit:
cvs rdiff -u -r1.161 -r1.162 src/sys/arch/sparc64/sparc64/trap.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/sparc64/sparc64/trap.c
diff -u src/sys/arch/sparc64/sparc64/trap.c:1.161 src/sys/arch/sparc64/sparc64/trap.c:1.162
--- src/sys/arch/sparc64/sparc64/trap.c:1.161 Sat Mar 20 23:31:30 2010
+++ src/sys/arch/sparc64/sparc64/trap.c Sun Aug 8 18:19:56 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: trap.c,v 1.161 2010/03/20 23:31:30 chs Exp $ */
+/* $NetBSD: trap.c,v 1.162 2010/08/08 18:19:56 chs Exp $ */
/*
* Copyright (c) 1996-2002 Eduardo Horvath. All rights reserved.
@@ -50,7 +50,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.161 2010/03/20 23:31:30 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.162 2010/08/08 18:19:56 chs Exp $");
#include "opt_ddb.h"
#include "opt_multiprocessor.h"
@@ -1000,9 +1000,6 @@
vaddr_t onfault;
u_quad_t sticks;
ksiginfo_t ksi;
-#ifdef DEBUG
- static int lastdouble;
-#endif
#ifdef DEBUG
if (tf->tf_pc == tf->tf_npc) {
@@ -1052,22 +1049,6 @@
/* Find the faulting va to give to uvm_fault */
va = trunc_page(addr);
-#ifdef DEBUG
- if (lastdouble) {
- printf("cpu%d: stacked data fault @ %lx (pc %lx);",
- cpu_number(), addr, pc);
- lastdouble = 0;
- if (curproc == NULL)
- printf("NULL proc\n");
- else
- printf("pid %d(%s); sigmask %x, sigcatch %x\n",
- l->l_proc->p_pid, l->l_proc->p_comm,
- /* XXX */
- l->l_sigmask.__bits[0],
- l->l_proc->p_sigctx.ps_sigcatch.__bits[0]);
- }
-#endif
-
/*
* Now munch on protections.
*
@@ -1263,9 +1244,6 @@
vaddr_t onfault;
u_quad_t sticks;
ksiginfo_t ksi;
-#ifdef DEBUG
- static int lastdouble;
-#endif
#ifdef DEBUG
if (tf->tf_pc == tf->tf_npc) {
@@ -1322,22 +1300,6 @@
goto out; /* No fault. Why were we called? */
}
-#ifdef DEBUG
- if (lastdouble) {
- printf("stacked data error @ %lx (pc %lx); sfsr %lx",
- sfva, pc, sfsr);
- lastdouble = 0;
- if (curproc == NULL)
- printf("NULL proc\n");
- else
- printf("pid %d(%s); sigmask %x, sigcatch %x\n",
- curproc->p_pid, curproc->p_comm,
- /* XXX */
- curlwp->l_sigmask.__bits[0],
- curproc->p_sigctx.ps_sigcatch.__bits[0]);
- }
-#endif
-
if (tstate & TSTATE_PRIV) {
onfault = (vaddr_t)pcb->pcb_onfault;
if (!onfault) {
@@ -1539,9 +1501,6 @@
vm_prot_t access_type;
u_quad_t sticks;
ksiginfo_t ksi;
-#ifdef DEBUG
- static int lastdouble;
-#endif
char buf[768];
#ifdef DEBUG
@@ -1608,19 +1567,6 @@
va = trunc_page(pc);
-#ifdef DEBUG
- if (lastdouble) {
- printf("stacked text error @ pc %lx; sfsr %lx", pc, sfsr);
- lastdouble = 0;
- if (curproc == NULL)
- printf("NULL proc\n");
- else
- printf("pid %d(%s); sigmask %x, sigcatch %x\n",
- curproc->p_pid, curproc->p_comm,
- curlwp->l_sigmask.__bits[0],
- curproc->p_sigctx.ps_sigcatch.__bits[0]);
- }
-#endif
/* Now munch on protections... */
access_type = VM_PROT_EXECUTE;
