Module Name: src Committed By: andvar Date: Wed Dec 13 23:11:35 UTC 2023
Modified Files: src/sys/arch/sparc64/dev: vnet.c src/sys/arch/sparc64/sparc64: netbsd32_machdep_13.c Log Message: Add #ifdef DDB blocks around Debugger(); calls to make kernel build without DDB. To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/sys/arch/sparc64/dev/vnet.c cvs rdiff -u -r1.3 -r1.4 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.8 src/sys/arch/sparc64/dev/vnet.c:1.9 --- src/sys/arch/sparc64/dev/vnet.c:1.8 Wed Dec 13 22:53:04 2023 +++ src/sys/arch/sparc64/dev/vnet.c Wed Dec 13 23:11:35 2023 @@ -1,4 +1,4 @@ -/* $NetBSD: vnet.c,v 1.8 2023/12/13 22:53:04 andvar Exp $ */ +/* $NetBSD: vnet.c,v 1.9 2023/12/13 23:11:35 andvar Exp $ */ /* $OpenBSD: vnet.c,v 1.62 2020/07/10 13:26:36 patrick Exp $ */ /* * Copyright (c) 2009, 2015 Mark Kettenis @@ -441,7 +441,9 @@ 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 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.3 src/sys/arch/sparc64/sparc64/netbsd32_machdep_13.c:1.4 --- src/sys/arch/sparc64/sparc64/netbsd32_machdep_13.c:1.3 Wed Jan 30 10:11:11 2019 +++ src/sys/arch/sparc64/sparc64/netbsd32_machdep_13.c Wed Dec 13 23:11:35 2023 @@ -1,4 +1,4 @@ -/* $NetBSD: netbsd32_machdep_13.c,v 1.3 2019/01/30 10:11:11 hannken Exp $ */ +/* $NetBSD: netbsd32_machdep_13.c,v 1.4 2023/12/13 23:11:35 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.3 2019/01/30 10:11:11 hannken Exp $"); +__KERNEL_RCSID(0, "$NetBSD: netbsd32_machdep_13.c,v 1.4 2023/12/13 23:11:35 andvar Exp $"); #ifdef _KERNEL_OPT #include "opt_compat_netbsd.h" @@ -105,8 +105,10 @@ compat_13_netbsd32_sigreturn(struct lwp #ifdef DEBUG printf("%s: rwindow_save(%p) failed, sending SIGILL\n", __func__, p); +#ifdef DDB Debugger(); #endif +#endif mutex_enter(p->p_lock); sigexit(l, SIGILL); } @@ -114,7 +116,9 @@ 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 } #endif scp = (struct netbsd32_sigcontext13 *)(u_long)SCARG(uap, sigcntxp); @@ -122,8 +126,10 @@ compat_13_netbsd32_sigreturn(struct lwp { #ifdef DEBUG printf("%s: copyin failed\n", __func__); +#ifdef DDB Debugger(); #endif +#endif return (EINVAL); } scp = ≻ @@ -139,7 +145,9 @@ 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 return (EINVAL); } #else @@ -156,7 +164,9 @@ 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 } #endif mutex_enter(p->p_lock);