Module Name: src
Committed By: jdc
Date: Thu Aug 9 06:55:02 UTC 2012
Modified Files:
src/sys/arch/sparc64/sparc64 [netbsd-6]: trap.c
Log Message:
Pull up revision 1.177 (requested by martin in ticket #462).
Do not spam the console when sending a sigill due to a T_ILLINST trap,
new openssl probes for the cpu sub family/features by trying some new
instructions and catching sigill.
In all other cases, move the printf inside a #ifdef DEBUG.
To generate a diff of this commit:
cvs rdiff -u -r1.168.8.3 -r1.168.8.4 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.168.8.3 src/sys/arch/sparc64/sparc64/trap.c:1.168.8.4
--- src/sys/arch/sparc64/sparc64/trap.c:1.168.8.3 Thu Apr 26 02:57:48 2012
+++ src/sys/arch/sparc64/sparc64/trap.c Thu Aug 9 06:55:01 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: trap.c,v 1.168.8.3 2012/04/26 02:57:48 riz Exp $ */
+/* $NetBSD: trap.c,v 1.168.8.4 2012/08/09 06:55:01 jdc 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.168.8.3 2012/04/26 02:57:48 riz Exp $");
+__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.168.8.4 2012/08/09 06:55:01 jdc Exp $");
#include "opt_ddb.h"
#include "opt_multiprocessor.h"
@@ -627,13 +627,15 @@ badtrap:
preempt();
break;
- case T_ILLINST:
case T_INST_EXCEPT:
case T_TEXTFAULT:
+#ifdef DEBUG
/* This is not an MMU issue!!!! */
printf("trap: pid=%d.%d comm=%s textfault at %lx!! sending SIGILL due to trap %d: %s\n",
l->l_proc->p_pid, l->l_lid, l->l_proc->p_comm,
pc, type, type < N_TRAP_TYPES ? trap_type[type] : T);
+#endif
+ case T_ILLINST:
#if defined(DDB) && defined(DEBUG)
if (trapdebug & TDB_STOPSIG)
Debugger();
