Module Name: src
Committed By: andvar
Date: Thu Dec 14 20:17:19 UTC 2023
Modified Files:
src/sys/arch/sparc64/dev: vnet.c
src/sys/arch/sparc64/sparc64: netbsd32_machdep_13.c
Log Message:
Use console_debugger() vs Debugger() which allows to avoid #ifdef DDB blocks.
>From uwe@
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/sparc64/dev/vnet.c
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/sparc64/sparc64/netbsd32_machdep_13.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/dev/vnet.c
diff -u src/sys/arch/sparc64/dev/vnet.c:1.9 src/sys/arch/sparc64/dev/vnet.c:1.10
--- src/sys/arch/sparc64/dev/vnet.c:1.9 Wed Dec 13 23:11:35 2023
+++ src/sys/arch/sparc64/dev/vnet.c Thu Dec 14 20:17:18 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: vnet.c,v 1.9 2023/12/13 23:11:35 andvar Exp $ */
+/* $NetBSD: vnet.c,v 1.10 2023/12/14 20:17:18 andvar Exp $ */
/* $OpenBSD: vnet.c,v 1.62 2020/07/10 13:26:36 patrick Exp $ */
/*
* Copyright (c) 2009, 2015 Mark Kettenis
@@ -441,9 +441,7 @@ vnet_rx_intr(void *arg)
default:
DPRINTF(("%s: unhandled type %0x02/%0x02/%0x02\n",
__func__, lp->type, lp->stype, lp->ctrl));
-#ifdef DDB
- Debugger();
-#endif
+ console_debugger();
ldc_reset(lc);
break;
}
Index: src/sys/arch/sparc64/sparc64/netbsd32_machdep_13.c
diff -u src/sys/arch/sparc64/sparc64/netbsd32_machdep_13.c:1.4 src/sys/arch/sparc64/sparc64/netbsd32_machdep_13.c:1.5
--- src/sys/arch/sparc64/sparc64/netbsd32_machdep_13.c:1.4 Wed Dec 13 23:11:35 2023
+++ src/sys/arch/sparc64/sparc64/netbsd32_machdep_13.c Thu Dec 14 20:17:18 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_machdep_13.c,v 1.4 2023/12/13 23:11:35 andvar Exp $ */
+/* $NetBSD: netbsd32_machdep_13.c,v 1.5 2023/12/14 20:17:18 andvar Exp $ */
/*
* Copyright (c) 1998, 2001 Matthew R. Green
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_machdep_13.c,v 1.4 2023/12/13 23:11:35 andvar Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_machdep_13.c,v 1.5 2023/12/14 20:17:18 andvar Exp $");
#ifdef _KERNEL_OPT
#include "opt_compat_netbsd.h"
@@ -105,9 +105,7 @@ compat_13_netbsd32_sigreturn(struct lwp
#ifdef DEBUG
printf("%s: rwindow_save(%p) failed, sending SIGILL\n",
__func__, p);
-#ifdef DDB
- Debugger();
-#endif
+ console_debugger();
#endif
mutex_enter(p->p_lock);
sigexit(l, SIGILL);
@@ -116,9 +114,7 @@ compat_13_netbsd32_sigreturn(struct lwp
if (sigdebug & SDB_FOLLOW) {
printf("%s: %s[%d], sigcntxp %u\n", __func__,
p->p_comm, p->p_pid, SCARG(uap, sigcntxp));
-#ifdef DDB
- if (sigdebug & SDB_DDB) Debugger();
-#endif
+ if (sigdebug & SDB_DDB) console_debugger();
}
#endif
scp = (struct netbsd32_sigcontext13 *)(u_long)SCARG(uap, sigcntxp);
@@ -126,9 +122,7 @@ compat_13_netbsd32_sigreturn(struct lwp
{
#ifdef DEBUG
printf("%s: copyin failed\n", __func__);
-#ifdef DDB
- Debugger();
-#endif
+ console_debugger();
#endif
return (EINVAL);
}
@@ -145,9 +139,7 @@ compat_13_netbsd32_sigreturn(struct lwp
{
printf("%s: pc %d or npc %d invalid\n",
__func__, sc.sc_pc, sc.sc_npc);
-#ifdef DDB
- Debugger();
-#endif
+ console_debugger();
return (EINVAL);
}
#else
@@ -164,9 +156,7 @@ compat_13_netbsd32_sigreturn(struct lwp
if (sigdebug & SDB_FOLLOW) {
printf("%s: return trapframe pc=%d sp=%d tstate=%x\n", __func__,
(int)tf->tf_pc, (int)tf->tf_out[6], (int)tf->tf_tstate);
-#ifdef DDB
- if (sigdebug & SDB_DDB) Debugger();
-#endif
+ if (sigdebug & SDB_DDB) console_debugger();
}
#endif
mutex_enter(p->p_lock);
