-/* $OpenBSD: db_interface.c,v 1.22 2016/04/27 11:03:24 mpi Exp $ */
+/* $OpenBSD: db_interface.c,v 1.23 2017/04/30 16:45:45 mpi Exp $ */
/* $NetBSD: db_interface.c,v 1.8 1999/10/12 17:08:57 jdolecek Exp $ */
/*
}
void
-Debugger()
+db_enter()
{
__asm volatile("call_pal 0x81"); /* bugchk */
-/* $OpenBSD: lock_machdep.c,v 1.4 2016/03/19 11:34:22 mpi Exp $ */
+/* $OpenBSD: lock_machdep.c,v 1.5 2017/04/30 16:45:45 mpi Exp $ */
/*
* Copyright (c) 2007 Artur Grabowski <art@openbsd.org>
if (nticks == 0) {
db_printf("__mp_lock(%p): lock spun out", mpl);
- Debugger();
+ db_enter();
}
#endif
}
#ifdef MP_LOCKDEBUG
if (mpl->mpl_cpu != curcpu()) {
db_printf("__mp_unlock(%p): not held lock\n", mpl);
- Debugger();
+ db_enter();
}
#endif
#ifdef MP_LOCKDEBUG
if (mpl->mpl_cpu != curcpu()) {
db_printf("__mp_release_all(%p): not held lock\n", mpl);
- Debugger();
+ db_enter();
}
#endif
#ifdef MP_LOCKDEBUG
if (mpl->mpl_cpu != curcpu()) {
db_printf("__mp_release_all_but_one(%p): not held lock\n", mpl);
- Debugger();
+ db_enter();
}
#endif
-/* $OpenBSD: machdep.c,v 1.179 2017/04/30 13:04:49 mpi Exp $ */
+/* $OpenBSD: machdep.c,v 1.180 2017/04/30 16:45:45 mpi Exp $ */
/* $NetBSD: machdep.c,v 1.210 2000/06/01 17:12:38 thorpej Exp $ */
/*-
ddb_init();
if (boothowto & RB_KDB)
- Debugger();
+ db_enter();
#endif
/*
* Figure out our clock frequency, from RPB fields.
-/* $OpenBSD: sgmap_typedep.c,v 1.14 2014/07/11 12:55:32 dlg Exp $ */
+/* $OpenBSD: sgmap_typedep.c,v 1.15 2017/04/30 16:45:45 mpi Exp $ */
/* $NetBSD: sgmap_typedep.c,v 1.17 2001/07/19 04:27:37 thorpej Exp $ */
/*-
#if defined(SGMAP_DEBUG) && defined(DDB)
if (__C(SGMAP_TYPE,_debug) > 1)
- Debugger();
+ db_enter();
#endif
if (error == 0) {
#if defined(SGMAP_DEBUG) && defined(DDB)
if (__C(SGMAP_TYPE,_debug) > 1)
- Debugger();
+ db_enter();
#endif
if (error == 0) {
#if defined(SGMAP_DEBUG) && defined(DDB)
if (__C(SGMAP_TYPE,_debug) > 1)
- Debugger();
+ db_enter();
#endif
if (error == 0) {
-/* $OpenBSD: scc.c,v 1.29 2010/07/02 17:27:01 nicm Exp $ */
+/* $OpenBSD: scc.c,v 1.30 2017/04/30 16:45:45 mpi Exp $ */
/* $NetBSD: scc.c,v 1.58 2002/03/17 19:40:27 atatat Exp $ */
/*
if ((value & ZSRR0_BREAK) && CONSOLE_ON_UNIT(sc->sc_dv.dv_unit)) {
#ifdef DDB
splx(s); /* spl0()? */
- Debugger();
+ db_enter();
return;
#else
/* XXX maybe fall back to PROM? */
-/* $OpenBSD: cpu.c,v 1.102 2016/07/28 21:57:57 kettenis Exp $ */
+/* $OpenBSD: cpu.c,v 1.103 2017/04/30 16:45:45 mpi Exp $ */
/* $NetBSD: cpu.c,v 1.1 2003/04/26 18:39:26 fvdl Exp $ */
/*-
printf("%s: failed to become ready\n", ci->ci_dev->dv_xname);
#if defined(MPDEBUG) && defined(DDB)
printf("dropping into debugger; continue from here to resume boot\n");
- Debugger();
+ db_enter();
#endif
}
printf("cpu failed to start\n");
#if defined(MPDEBUG) && defined(DDB)
printf("dropping into debugger; continue from here to resume boot\n");
- Debugger();
+ db_enter();
#endif
}
}
-/* $OpenBSD: db_interface.c,v 1.27 2017/04/20 14:13:00 visa Exp $ */
+/* $OpenBSD: db_interface.c,v 1.28 2017/04/30 16:45:45 mpi Exp $ */
/* $NetBSD: db_interface.c,v 1.1 2003/04/26 18:39:27 fvdl Exp $ */
/*
void
x86_ipi_db(struct cpu_info *ci)
{
- Debugger();
+ db_enter();
}
#endif /* MULTIPROCESSOR */
}
void
-Debugger(void)
+db_enter(void)
{
breakpoint();
}
-/* $OpenBSD: lock_machdep.c,v 1.13 2017/04/20 13:20:17 visa Exp $ */
+/* $OpenBSD: lock_machdep.c,v 1.14 2017/04/30 16:45:45 mpi Exp $ */
/*
* Copyright (c) 2007 Artur Grabowski <art@openbsd.org>
if (--nticks <= 0) {
db_printf("__mp_lock(%p): lock spun out", mpl);
- Debugger();
+ db_enter();
nticks = __mp_lock_spinout;
}
}
#ifdef MP_LOCKDEBUG
if (!__mp_lock_held(mpl)) {
db_printf("__mp_unlock(%p): not held lock\n", mpl);
- Debugger();
+ db_enter();
}
#endif
#ifdef MP_LOCKDEBUG
if (!__mp_lock_held(mpl)) {
db_printf("__mp_release_all_but_one(%p): not held lock\n", mpl);
- Debugger();
+ db_enter();
}
#endif
-/* $OpenBSD: machdep.c,v 1.227 2017/04/30 13:04:49 mpi Exp $ */
+/* $OpenBSD: machdep.c,v 1.228 2017/04/30 16:45:45 mpi Exp $ */
/* $NetBSD: machdep.c,v 1.3 2003/05/07 22:58:18 fvdl Exp $ */
/*-
db_machine_init();
ddb_init();
if (boothowto & RB_KDB)
- Debugger();
+ db_enter();
#endif
}
-/* $OpenBSD: db_interface.c,v 1.11 2016/04/20 07:59:25 mpi Exp $ */
+/* $OpenBSD: db_interface.c,v 1.12 2017/04/30 16:45:45 mpi Exp $ */
/* $NetBSD: db_interface.c,v 1.34 2003/10/26 23:11:15 chris Exp $ */
/*
}
void
-Debugger(void)
+db_enter(void)
{
asm(".word 0xe7ffffff");
}
-/* $OpenBSD: undefined.c,v 1.9 2017/04/30 13:04:49 mpi Exp $ */
+/* $OpenBSD: undefined.c,v 1.10 2017/04/30 16:45:45 mpi Exp $ */
/* $NetBSD: undefined.c,v 1.22 2003/11/29 22:21:29 bjh21 Exp $ */
/*
if ((fault_code & FAULT_USER) == 0) {
printf("Undefined instruction in kernel\n");
#ifdef DDB
- Debugger();
+ db_enter();
#endif
}
-/* $OpenBSD: ampintc.c,v 1.19 2017/03/21 21:51:03 kettenis Exp $ */
+/* $OpenBSD: ampintc.c,v 1.20 2017/04/30 16:45:45 mpi Exp $ */
/*
* Copyright (c) 2007,2009,2011 Dale Rahn <drahn@openbsd.org>
*
if ((cnt++ % 100) == 0) {
printf("irq %d fired * _100\n", iack_val);
#ifdef DDB
- Debugger();
+ db_enter();
#endif
}
-/* $OpenBSD: arm64_mutex.c,v 1.1 2016/12/17 23:38:33 patrick Exp $ */
+/* $OpenBSD: arm64_mutex.c,v 1.2 2017/04/30 16:45:45 mpi Exp $ */
/*
* Copyright (c) 2004 Artur Grabowski <art@openbsd.org>
* All rights reserved.
#ifdef MP_LOCKDEBUG
if (--ticks == 0) {
db_printf("%s(%p): lock spun out", __func__, mtx);
- Debugger();
+ db_enter();
ticks = __mp_lock_spinout;
}
#endif
-/* $OpenBSD: db_interface.c,v 1.2 2017/02/17 17:16:04 patrick Exp $ */
+/* $OpenBSD: db_interface.c,v 1.3 2017/04/30 16:45:45 mpi Exp $ */
/* $NetBSD: db_interface.c,v 1.34 2003/10/26 23:11:15 chris Exp $ */
/*
}
void
-Debugger(void)
+db_enter(void)
{
asm("brk 0");
}
-/* $OpenBSD: machdep.c,v 1.14 2017/04/29 10:05:49 jsg Exp $ */
+/* $OpenBSD: machdep.c,v 1.15 2017/04/30 16:45:45 mpi Exp $ */
/*
* Copyright (c) 2014 Patrick Wildt <patrick@blueri.se>
*
ddb_init();
if (boothowto & RB_KDB)
- Debugger();
+ db_enter();
#endif
softintr_init();
-/* $OpenBSD: agintc.c,v 1.2 2017/04/29 18:13:25 kettenis Exp $ */
+/* $OpenBSD: agintc.c,v 1.3 2017/04/30 16:45:45 mpi Exp $ */
/*
* Copyright (c) 2007, 2009, 2011, 2017 Dale Rahn <drahn@dalerahn.com>
*
if ((cnt++ % 100) == 0) {
printf("irq %d fired * _100\n", irq);
#ifdef DDB
- Debugger();
+ db_enter();
#endif
}
}
-/* $OpenBSD: ampintc.c,v 1.8 2017/04/08 22:31:33 kettenis Exp $ */
+/* $OpenBSD: ampintc.c,v 1.9 2017/04/30 16:45:45 mpi Exp $ */
/*
* Copyright (c) 2007,2009,2011 Dale Rahn <drahn@openbsd.org>
*
if ((cnt++ % 100) == 0) {
printf("irq %d fired * _100\n", iack_val);
#ifdef DDB
- Debugger();
+ db_enter();
#endif
}
-/* $OpenBSD: bcm2836_intr.c,v 1.2 2017/02/24 17:16:41 patrick Exp $ */
+/* $OpenBSD: bcm2836_intr.c,v 1.3 2017/04/30 16:45:45 mpi Exp $ */
/*
* Copyright (c) 2007,2009 Dale Rahn <drahn@openbsd.org>
* Copyright (c) 2015 Patrick Wildt <patrick@blueri.se>
static int cnt = 0;
if ((cnt++ % 100) == 0) {
printf("irq %d fired * _100\n", irq);
- Debugger();
+ db_enter();
}
}
#endif
-/* $OpenBSD: pluart.c,v 1.4 2017/04/30 13:04:49 mpi Exp $ */
+/* $OpenBSD: pluart.c,v 1.5 2017/04/30 16:45:45 mpi Exp $ */
/*
* Copyright (c) 2014 Patrick Wildt <patrick@blueri.se>
#ifdef DDB
if (ISSET(sc->sc_hwflags, COM_HW_CONSOLE)) {
if (db_console)
- Debugger();
+ db_enter();
continue;
}
#endif
-/* $OpenBSD: armv7_machdep.c,v 1.47 2017/03/24 13:04:16 patrick Exp $ */
+/* $OpenBSD: armv7_machdep.c,v 1.48 2017/04/30 16:45:45 mpi Exp $ */
/* $NetBSD: lubbock_machdep.c,v 1.2 2003/07/15 00:25:06 lukem Exp $ */
/*
ddb_init();
if (boothowto & RB_KDB)
- Debugger();
+ db_enter();
#endif
printf("board type: %u\n", board_id);
-/* $OpenBSD: bcm2836_intr.c,v 1.2 2016/08/07 18:43:17 kettenis Exp $ */
+/* $OpenBSD: bcm2836_intr.c,v 1.3 2017/04/30 16:45:45 mpi Exp $ */
/*
* Copyright (c) 2007,2009 Dale Rahn <drahn@openbsd.org>
* Copyright (c) 2015 Patrick Wildt <patrick@blueri.se>
static int cnt = 0;
if ((cnt++ % 100) == 0) {
printf("irq %d fired * _100\n", irq);
- Debugger();
+ db_enter();
}
}
#endif
-/* $OpenBSD: pluart.c,v 1.3 2017/04/30 13:04:49 mpi Exp $ */
+/* $OpenBSD: pluart.c,v 1.4 2017/04/30 16:45:45 mpi Exp $ */
/*
* Copyright (c) 2014 Patrick Wildt <patrick@blueri.se>
#ifdef DDB
if (ISSET(sc->sc_hwflags, COM_HW_CONSOLE)) {
if (db_console)
- Debugger();
+ db_enter();
continue;
}
#endif
-/* $OpenBSD: if_cpsw.c,v 1.42 2017/01/22 10:17:37 dlg Exp $ */
+/* $OpenBSD: if_cpsw.c,v 1.43 2017/04/30 16:45:45 mpi Exp $ */
/* $NetBSD: if_cpsw.c,v 1.3 2013/04/17 14:36:34 bouyer Exp $ */
/*
cpsw_get_txdesc(sc, sc->sc_txhead, &bd);
if (bd.buflen == 0) {
- /* Debugger(); */
+ /* db_enter(); */
}
if ((bd.flags & CPDMA_BD_SOP) == 0)
stat = bus_space_read_4(sc->sc_bst, sc->sc_bsh, CPSW_CPDMA_RX_CP(0));
printf("CPSW_CPDMA_RX0_CP %x\n", stat);
- /* Debugger(); */
+ /* db_enter(); */
bus_space_write_4(sc->sc_bst, sc->sc_bsh, CPSW_CPDMA_DMA_INTMASK_CLEAR, dmastat);
dmastat = bus_space_read_4(sc->sc_bst, sc->sc_bsh, CPSW_CPDMA_DMA_INTSTAT_MASKED);
-/* $OpenBSD: db_interface.c,v 1.38 2016/09/19 21:18:35 jasper Exp $ */
+/* $OpenBSD: db_interface.c,v 1.39 2017/04/30 16:45:45 mpi Exp $ */
/*
* Copyright (c) 1999-2003 Michael Shalayeff
int db_active = 0;
void
-Debugger()
+db_enter(void)
{
extern int kernelmapped; /* from locore.S */
if (kernelmapped)
-/* $OpenBSD: lock_machdep.c,v 1.9 2016/03/19 11:34:22 mpi Exp $ */
+/* $OpenBSD: lock_machdep.c,v 1.10 2017/04/30 16:45:45 mpi Exp $ */
/*
* Copyright (c) 2007 Artur Grabowski <art@openbsd.org>
if (nticks == 0) {
db_printf("__mp_lock(%p): lock spun out", mpl);
- Debugger();
+ db_enter();
}
#endif
}
if (mpl->mpl_cpu != curcpu()) {
db_printf("__mp_unlock(%p): lock not held - %p != %p\n",
mpl, mpl->mpl_cpu, curcpu());
- Debugger();
+ db_enter();
}
#endif
if (mpl->mpl_cpu != curcpu()) {
db_printf("__mp_release_all(%p): lock not held - %p != %p\n",
mpl, mpl->mpl_cpu, curcpu());
- Debugger();
+ db_enter();
}
#endif
if (mpl->mpl_cpu != curcpu()) {
db_printf("__mp_release_all_but_one(%p): lock not held - "
"%p != %p\n", mpl, mpl->mpl_cpu, curcpu());
- Debugger();
+ db_enter();
}
#endif
-/* $OpenBSD: locore.S,v 1.195 2016/05/23 20:11:49 deraadt Exp $ */
+/* $OpenBSD: locore.S,v 1.196 2017/04/30 16:45:45 mpi Exp $ */
/*
* Copyright (c) 1998-2004 Michael Shalayeff
stw t1, R%kernelmapped(t1)
#ifdef DDB
- .import Debugger, code
+ .import db_enter, code
/* have to call debugger from here, from virtual mode */
ldil L%boothowto, r1
ldw R%boothowto(r1), r1
-/* $OpenBSD: pmap.c,v 1.172 2016/10/19 08:28:20 guenther Exp $ */
+/* $OpenBSD: pmap.c,v 1.173 2017/04/30 16:45:45 mpi Exp $ */
/*
* Copyright (c) 1998-2004 Michael Shalayeff
if (pmap_initialized && (pg = PHYS_TO_VM_PAGE(PTE_PAGE(pte)))) {
if (pmap_check_alias(pg, va, pte))
- Debugger();
+ db_enter();
}
}
#endif
-/* $OpenBSD: cpu.c,v 1.81 2017/03/28 17:28:35 kettenis Exp $ */
+/* $OpenBSD: cpu.c,v 1.82 2017/04/30 16:45:45 mpi Exp $ */
/* $NetBSD: cpu.c,v 1.1.2.7 2000/06/26 02:04:05 sommerfeld Exp $ */
/*-
if (!(ci->ci_flags & CPUF_RUNNING)) {
printf("%s failed to become ready\n", ci->ci_dev.dv_xname);
#ifdef DDB
- Debugger();
+ db_enter();
#endif
}
-/* $OpenBSD: db_interface.c,v 1.34 2017/03/03 20:49:47 bluhm Exp $ */
+/* $OpenBSD: db_interface.c,v 1.35 2017/04/30 16:45:45 mpi Exp $ */
/* $NetBSD: db_interface.c,v 1.22 1996/05/03 19:42:00 christos Exp $ */
/*
}
void
-Debugger(void)
+db_enter(void)
{
__asm__("int $3");
}
-/* $OpenBSD: db_mp.c,v 1.9 2017/04/20 14:13:00 visa Exp $ */
+/* $OpenBSD: db_mp.c,v 1.10 2017/04/30 16:45:45 mpi Exp $ */
/*
* Copyright (c) 2003, 2004 Andreas Gunnarsson <andreas@openbsd.org>
void
i386_ipi_db(struct cpu_info *ci)
{
- Debugger();
+ db_enter();
}
-/* $OpenBSD: lock_machdep.c,v 1.22 2017/04/20 13:20:17 visa Exp $ */
+/* $OpenBSD: lock_machdep.c,v 1.23 2017/04/30 16:45:45 mpi Exp $ */
/* $NetBSD: lock_machdep.c,v 1.1.2.3 2000/05/03 14:40:30 sommerfeld Exp $ */
/*-
if (--nticks <= 0) {
db_printf("__mp_lock(%p): lock spun out", mpl);
- Debugger();
+ db_enter();
nticks = __mp_lock_spinout;
}
}
#ifdef MP_LOCKDEBUG
if (!__mp_lock_held(mpl)) {
db_printf("__mp_unlock(%p): not held lock\n", mpl);
- Debugger();
+ db_enter();
}
#endif
-/* $OpenBSD: machdep.c,v 1.599 2017/04/30 13:04:49 mpi Exp $ */
+/* $OpenBSD: machdep.c,v 1.600 2017/04/30 16:45:45 mpi Exp $ */
/* $NetBSD: machdep.c,v 1.214 1996/11/10 03:16:17 thorpej Exp $ */
/*-
db_machine_init();
ddb_init();
if (boothowto & RB_KDB)
- Debugger();
+ db_enter();
#endif
softintr_init();
-/* $OpenBSD: power.c,v 1.6 2014/07/11 08:18:30 guenther Exp $ */
+/* $OpenBSD: power.c,v 1.7 2017/04/30 16:45:45 mpi Exp $ */
/*
* Copyright (c) 2007 Martin Reindl.
if (status & BTN_POWER_BIT) {
#ifdef DEBUG
printf("%s switched\n", sc->sc_dev.dv_xname);
- Debugger();
+ db_enter();
#endif
_reg_write_1(LANDISK_PWRSW_INTCLR, 1);
if (allowpowerdown == 1) {
-/* $OpenBSD: machdep.c,v 1.44 2016/10/09 11:25:39 tom Exp $ */
+/* $OpenBSD: machdep.c,v 1.45 2017/04/30 16:45:45 mpi Exp $ */
/* $NetBSD: machdep.c,v 1.1 2006/09/01 21:26:18 uwe Exp $ */
/*-
db_machine_init();
ddb_init();
if (boothowto & RB_KDB) {
- Debugger();
+ db_enter();
}
#endif
-/* $OpenBSD: bonito.c,v 1.31 2016/03/06 19:42:27 mpi Exp $ */
+/* $OpenBSD: bonito.c,v 1.32 2017/04/30 16:45:45 mpi Exp $ */
/* $NetBSD: bonito_mainbus.c,v 1.11 2008/04/28 20:23:10 martin Exp $ */
/* $NetBSD: bonito_pci.c,v 1.5 2008/04/28 20:23:28 martin Exp $ */
REGVAL(BONITO_INTISR), REGVAL(BONITO_INTEN),
frame->ipl, bonito_imask[frame->ipl]);
#ifdef DDB
- Debugger();
+ db_enter();
#endif
#endif
}
-/* $OpenBSD: generic2e_machdep.c,v 1.8 2016/08/30 12:15:28 jsg Exp $ */
+/* $OpenBSD: generic2e_machdep.c,v 1.9 2017/04/30 16:45:45 mpi Exp $ */
/*
* Copyright (c) 2010 Miodrag Vallat.
" isaimr %08x\n", ocw1, ocw2, frame->ipl,
bonito_imask[frame->ipl], loongson_isaimr);
#ifdef DDB
- Debugger();
+ db_enter();
#endif
#endif
}
-/* $OpenBSD: machdep.c,v 1.76 2017/04/22 15:37:39 visa Exp $ */
+/* $OpenBSD: machdep.c,v 1.77 2017/04/30 16:45:45 mpi Exp $ */
/*
* Copyright (c) 2009, 2010, 2014 Miodrag Vallat.
#ifdef DDB
db_machine_init();
if (boothowto & RB_KDB)
- Debugger();
+ db_enter();
#endif
/*
-/* $OpenBSD: mb89352.c,v 1.21 2017/03/16 18:15:20 miod Exp $ */
+/* $OpenBSD: mb89352.c,v 1.22 2017/04/30 16:45:45 mpi Exp $ */
/* $NetBSD: mb89352.c,v 1.5 2000/03/23 07:01:31 thorpej Exp $ */
/* NecBSD: mb89352.c,v 1.4 1998/03/14 07:31:20 kmatsuda Exp */
#include <luna88k/dev/mb89352var.h>
#ifndef DDB
-#define Debugger() panic("should call debugger here (mb89352.c)")
+#define db_enter() panic("should call debugger here (mb89352.c)")
#endif /* ! DDB */
#ifdef SPC_DEBUG
-/* $OpenBSD: mb89352var.h,v 1.5 2014/05/08 22:17:33 miod Exp $ */
+/* $OpenBSD: mb89352var.h,v 1.6 2017/04/30 16:45:45 mpi Exp $ */
/* $NetBSD: mb89352var.h,v 1.6 2003/08/02 12:48:09 tsutsui Exp $ */
/* NecBSD: mb89352var.h,v 1.4 1998/03/14 07:31:22 kmatsuda Exp */
#define SPC_DOBREAK 0x40
extern int spc_debug; /* SPC_SHOWSTART|SPC_SHOWMISC|SPC_SHOWTRACE; */
#define SPC_PRINT(b, s) do {if ((spc_debug & (b)) != 0) printf s;} while (0)
-#define SPC_BREAK() do {if ((spc_debug & SPC_DOBREAK) != 0) Debugger();} while (0)
-#define SPC_ASSERT(x) do {if (x) {} else {printf("%s at line %d: assertion failed\n", sc->sc_dev.dv_xname, __LINE__); Debugger();}} while (0)
+#define SPC_BREAK() do {if ((spc_debug & SPC_DOBREAK) != 0) db_enter();} while (0)
+#define SPC_ASSERT(x) do {if (x) {} else {printf("%s at line %d: assertion failed\n", sc->sc_dev.dv_xname, __LINE__); db_enter();}} while (0)
#else
#define SPC_PRINT(b, s)
#define SPC_BREAK()
-/* $OpenBSD: siotty.c,v 1.17 2017/03/20 19:37:54 miod Exp $ */
+/* $OpenBSD: siotty.c,v 1.18 2017/04/30 16:45:45 mpi Exp $ */
/* $NetBSD: siotty.c,v 1.9 2002/03/17 19:40:43 atatat Exp $ */
/*-
#if 0 && defined(DDB) /* ?!?! fails to resume ?!?! */
if ((rr & RR_BREAK) && tp->t_dev == cn_tab->cn_dev) {
if (db_console)
- Debugger();
+ db_enter();
return;
}
#endif
-/* $OpenBSD: machdep.c,v 1.123 2017/03/19 10:57:29 miod Exp $ */
+/* $OpenBSD: machdep.c,v 1.124 2017/04/30 16:45:45 mpi Exp $ */
/*
* Copyright (c) 1998, 1999, 2000, 2001 Steve Murphree, Jr.
* Copyright (c) 1996 Nivas Madhur
db_machine_init();
ddb_init();
if (boothowto & RB_KDB)
- Debugger();
+ db_enter();
#endif
}
* If ddb is hoping to us, it's our turn to enter ddb now.
*/
if (ci->ci_cpuid == ddb_mp_nextcpu)
- Debugger();
+ db_enter();
#endif
}
if (ipi & CI_IPI_NOTIFY) {
-/* $OpenBSD: db_interface.c,v 1.21 2016/03/09 08:58:50 mpi Exp $ */
+/* $OpenBSD: db_interface.c,v 1.22 2017/04/30 16:45:45 mpi Exp $ */
/*
* Mach Operating System
* Copyright (c) 1993-1991 Carnegie Mellon University
}
void
-Debugger()
+db_enter(void)
{
asm (ENTRY_ASM); /* entry trap */
/* ends up at ddb_entry_trap below */
-/* $OpenBSD: mplock.c,v 1.4 2016/03/19 11:34:22 mpi Exp $ */
+/* $OpenBSD: mplock.c,v 1.5 2017/04/30 16:45:45 mpi Exp $ */
/*
* Copyright (c) 2004 Niklas Hallqvist. All rights reserved.
if (nticks == 0) {
db_printf("__mp_lock(0x%x): lock spun out", mpl);
- Debugger();
+ db_enter();
}
#endif
}
#ifdef MP_LOCKDEBUG
if (mpl->mpl_cpu != ci) {
db_printf("__mp_unlock(%p): not held lock\n", mpl);
- Debugger();
+ db_enter();
}
#endif
#ifdef MP_LOCKDEBUG
if (mpl->mpl_cpu != ci) {
db_printf("__mp_release_all(%p): not held lock\n", mpl);
- Debugger();
+ db_enter();
}
#endif
#ifdef MP_LOCKDEBUG
if (mpl->mpl_cpu != ci) {
db_printf("__mp_release_all_but_one(%p): not held lock\n", mpl);
- Debugger();
+ db_enter();
}
#endif
-/* $OpenBSD: macintr.c,v 1.53 2015/09/08 08:29:35 deraadt Exp $ */
+/* $OpenBSD: macintr.c,v 1.54 2017/04/30 16:45:45 mpi Exp $ */
/*-
* Copyright (c) 2008 Dale Rahn <drahn@openbsd.org>
{
#ifdef DDB
if (db_console)
- Debugger();
+ db_enter();
#else
printf("programmer button pressed, debugger not available\n");
#endif
-/* $OpenBSD: openpic.c,v 1.83 2015/09/08 08:29:35 deraadt Exp $ */
+/* $OpenBSD: openpic.c,v 1.84 2017/04/30 16:45:45 mpi Exp $ */
/*-
* Copyright (c) 2008 Dale Rahn <drahn@openbsd.org>
openpic_ipi_ddb(void)
{
#ifdef DDB
- Debugger();
+ db_enter();
#endif
}
#endif /* MULTIPROCESSOR */
-/* $OpenBSD: pgs.c,v 1.3 2013/07/01 16:53:24 jasper Exp $ */
+/* $OpenBSD: pgs.c,v 1.4 2017/04/30 16:45:45 mpi Exp $ */
/*
* Copyright (c) 2010 Jasper Lievisse Adriaanse <jasper@openbsd.org>
*
{
#ifdef DDB
if (db_console)
- Debugger();
+ db_enter();
#else
printf("programmer-switch pressed, debugger not available.\n");
#endif
-/* $OpenBSD: sysbutton.c,v 1.4 2008/06/13 00:31:09 krw Exp $ */
+/* $OpenBSD: sysbutton.c,v 1.5 2017/04/30 16:45:45 mpi Exp $ */
/*
* Copyright (c) 2007 Gordon Willem Klok <gwk@openbsd.org>
*
*/
#ifdef DDB
if (db_console)
- Debugger();
+ db_enter();
#endif
return 1;
-/* $OpenBSD: zs.c,v 1.26 2016/03/14 23:08:05 krw Exp $ */
+/* $OpenBSD: zs.c,v 1.27 2017/04/30 16:45:45 mpi Exp $ */
/* $NetBSD: zs.c,v 1.17 2001/06/19 13:42:15 wiz Exp $ */
/*
extern int db_active;
if (!db_active)
- Debugger();
+ db_enter();
}
#endif
}
-/* $OpenBSD: machdep.c,v 1.179 2016/10/09 11:25:40 tom Exp $ */
+/* $OpenBSD: machdep.c,v 1.180 2017/04/30 16:45:45 mpi Exp $ */
/* $NetBSD: machdep.c,v 1.4 1996/10/16 19:33:11 ws Exp $ */
/*
#ifdef DDB
if (boothowto & RB_KDB)
- Debugger();
+ db_enter();
#endif
/*
-/* $OpenBSD: ipifuncs.c,v 1.13 2017/02/19 08:35:13 visa Exp $ */
+/* $OpenBSD: ipifuncs.c,v 1.14 2017/04/30 16:45:45 mpi Exp $ */
/* $NetBSD: ipifuncs.c,v 1.40 2008/04/28 20:23:10 martin Exp $ */
/*-
mips64_ipi_ddb(void)
{
#ifdef DDB
- Debugger();
+ db_enter();
#endif
}
-/* $OpenBSD: lcore_ddb.S,v 1.13 2012/10/03 11:18:23 miod Exp $ */
+/* $OpenBSD: lcore_ddb.S,v 1.14 2017/04/30 16:45:45 mpi Exp $ */
/*
* Copyright (c) 2001-2003 Opsycon AB (www.opsycon.se / www.opsycon.com)
sw zero, PCB_ONFAULT(t0)
END(kdbpokeb)
-LEAF(Debugger, 0)
+LEAF(db_enter, 0)
break BREAK_SOVER_VAL
jr ra
NOP
-END(Debugger)
+END(db_enter)
LEAF(setjmp, 0)
MFC0 v0, COP_0_STATUS_REG
-/* $OpenBSD: lock_machdep.c,v 1.2 2016/03/19 11:34:22 mpi Exp $ */
+/* $OpenBSD: lock_machdep.c,v 1.3 2017/04/30 16:45:45 mpi Exp $ */
/*
* Copyright (c) 2007 Artur Grabowski <art@openbsd.org>
if (nticks == 0) {
db_printf("__mp_lock(%p): lock spun out", mpl);
- Debugger();
+ db_enter();
}
#endif
}
#ifdef MP_LOCKDEBUG
if (mpl->mpl_cpu != curcpu()) {
db_printf("__mp_unlock(%p): not held lock\n", mpl);
- Debugger();
+ db_enter();
}
#endif
#ifdef MP_LOCKDEBUG
if (mpl->mpl_cpu != curcpu()) {
db_printf("__mp_release_all(%p): not held lock\n", mpl);
- Debugger();
+ db_enter();
}
#endif
#ifdef MP_LOCKDEBUG
if (mpl->mpl_cpu != curcpu()) {
db_printf("__mp_release_all_but_one(%p): not held lock\n", mpl);
- Debugger();
+ db_enter();
}
#endif
-/* $OpenBSD: mutex.c,v 1.5 2017/04/20 13:57:30 visa Exp $ */
+/* $OpenBSD: mutex.c,v 1.6 2017/04/30 16:45:45 mpi Exp $ */
/*
* Copyright (c) 2004 Artur Grabowski <art@openbsd.org>
#ifdef MP_LOCKDEBUG
if (--nticks == 0) {
db_printf("%s(%p): lock spun out", __func__, mtx);
- Debugger();
+ db_enter();
nticks = __mp_lock_spinout;
}
#endif
-/* $OpenBSD: machdep.c,v 1.87 2017/04/24 13:54:28 visa Exp $ */
+/* $OpenBSD: machdep.c,v 1.88 2017/04/30 16:45:45 mpi Exp $ */
/*
* Copyright (c) 2009, 2010 Miodrag Vallat.
#ifdef DDB
db_machine_init();
if (boothowto & RB_KDB)
- Debugger();
+ db_enter();
#endif
#ifdef MULTIPROCESSOR
-/* $OpenBSD: db_interface.c,v 1.2 2016/03/06 13:41:34 mpi Exp $ */
+/* $OpenBSD: db_interface.c,v 1.3 2017/04/30 16:45:45 mpi Exp $ */
/* $NetBSD: db_interface.c,v 1.12 2001/07/22 11:29:46 wiz Exp $ */
/*
int db_trap_glue(struct trapframe *frame); /* called from locore */
void
-Debugger()
+db_enter()
{
ddb_trap();
}
void
ppc_ipi_db(struct cpu_info *ci)
{
- Debugger();
+ db_enter();
}
void
-/* $OpenBSD: lock_machdep.c,v 1.4 2016/03/19 11:34:22 mpi Exp $ */
+/* $OpenBSD: lock_machdep.c,v 1.5 2017/04/30 16:45:45 mpi Exp $ */
/*
* Copyright (c) 2007 Artur Grabowski <art@openbsd.org>
if (nticks == 0) {
db_printf("__mp_lock(%p): lock spun out", mpl);
- Debugger();
+ db_enter();
}
#endif
}
#ifdef MP_LOCKDEBUG
if (mpl->mpl_cpu != curcpu()) {
db_printf("__mp_unlock(%p): not held lock\n", mpl);
- Debugger();
+ db_enter();
}
#endif
#ifdef MP_LOCKDEBUG
if (mpl->mpl_cpu != curcpu()) {
db_printf("__mp_release_all(%p): not held lock\n", mpl);
- Debugger();
+ db_enter();
}
#endif
#ifdef MP_LOCKDEBUG
if (mpl->mpl_cpu != curcpu()) {
db_printf("__mp_release_all_but_one(%p): not held lock\n", mpl);
- Debugger();
+ db_enter();
}
#endif
-/* $OpenBSD: mutex.c,v 1.4 2017/04/20 13:57:30 visa Exp $ */
+/* $OpenBSD: mutex.c,v 1.5 2017/04/30 16:45:45 mpi Exp $ */
/*
* Copyright (c) 2004 Artur Grabowski <art@openbsd.org>
#if defined(MP_LOCKDEBUG)
if (--nticks == 0) {
db_printf("%s: %p lock spun out", __func__, mtx);
- Debugger();
+ db_enter();
}
#endif
}
-/* $OpenBSD: zs.c,v 1.14 2017/04/30 13:04:49 mpi Exp $ */
+/* $OpenBSD: zs.c,v 1.15 2017/04/30 16:45:45 mpi Exp $ */
/* $NetBSD: zs.c,v 1.37 2011/02/20 07:59:50 matt Exp $ */
/*-
zs_abort(struct zs_chanstate *cs)
{
#if defined(DDB)
- Debugger();
+ db_enter();
#endif
}
-/* $OpenBSD: machdep.c,v 1.155 2017/04/02 15:48:19 visa Exp $ */
+/* $OpenBSD: machdep.c,v 1.156 2017/04/30 16:45:45 mpi Exp $ */
/*
* Copyright (c) 2003-2004 Opsycon AB (www.opsycon.se / www.opsycon.com)
#ifdef DDB
db_machine_init();
if (boothowto & RB_KDB)
- Debugger();
+ db_enter();
#endif
/*
-/* $OpenBSD: scif.c,v 1.16 2016/03/05 17:16:33 tobiasu Exp $ */
+/* $OpenBSD: scif.c,v 1.17 2017/04/30 16:45:45 mpi Exp $ */
/* $NetBSD: scif.c,v 1.47 2006/07/23 22:06:06 ad Exp $ */
/*-
#ifdef DDB
if (ISSET(sc->sc_hwflags, SCIF_HW_CONSOLE) &&
db_console != 0) {
- Debugger();
+ db_enter();
}
#endif /* DDB */
}
-/* $OpenBSD: db_interface.c,v 1.9 2017/01/21 05:42:03 guenther Exp $ */
+/* $OpenBSD: db_interface.c,v 1.10 2017/04/30 16:45:45 mpi Exp $ */
/* $NetBSD: db_interface.c,v 1.37 2006/09/06 00:11:49 uwe Exp $ */
/*-
}
void
-Debugger(void)
+db_enter(void)
{
__asm volatile("trapa %0" :: "i"(_SH_TRA_BREAK));
}
-/* $OpenBSD: machdep.c,v 1.71 2016/10/09 11:25:40 tom Exp $ */
+/* $OpenBSD: machdep.c,v 1.72 2017/04/30 16:45:45 mpi Exp $ */
/* $NetBSD: machdep.c,v 1.4 1996/10/16 19:33:11 ws Exp $ */
/*
#ifdef DDB
if (boothowto & RB_KDB)
- Debugger();
+ db_enter();
#endif
if (boothowto & RB_CONFIG) {
-/* $OpenBSD: consinit.c,v 1.15 2016/03/07 13:21:51 naddy Exp $ */
+/* $OpenBSD: consinit.c,v 1.16 2017/04/30 16:45:45 mpi Exp $ */
/* $NetBSD: consinit.c,v 1.9 2000/10/20 05:32:35 mrg Exp $ */
/*-
#ifdef DDB
if (ch == '+') {
if (nplus++ > 3)
- Debugger();
+ db_enter();
} else
nplus = 0;
#endif
-/* $OpenBSD: fd.c,v 1.46 2016/06/07 06:37:33 dlg Exp $ */
+/* $OpenBSD: fd.c,v 1.47 2017/04/30 16:45:45 mpi Exp $ */
/* $NetBSD: fd.c,v 1.112 2003/08/07 16:29:35 agc Exp $ */
/*-
printf("fdcintr: block %lld != blkno %lld\n",
(long long)block, (long long)fd->sc_blkno);
#if defined(FD_DEBUG) && defined(DDB)
- Debugger();
+ db_enter();
#endif
}
}
-/* $OpenBSD: iommu.c,v 1.73 2016/05/04 18:26:12 kettenis Exp $ */
+/* $OpenBSD: iommu.c,v 1.74 2017/04/30 16:45:45 mpi Exp $ */
/* $NetBSD: iommu.c,v 1.47 2002/02/08 20:03:45 eeh Exp $ */
/*
(int)sgsize, flags);
#ifdef DDB
if (iommudebug & IDB_BREAK)
- Debugger();
+ db_enter();
#endif
}
#endif
iommu_dvmamap_print_map(t, is, map);
#ifdef DDB
if (iommudebug & IDB_BREAK)
- Debugger();
+ db_enter();
#endif
}
#endif
"failed!\n", (int)sgsize, flags);
#ifdef DDB
if (iommudebug & IDB_BREAK)
- Debugger();
+ db_enter();
#else
panic("");
#endif
iommu_dvmamap_print_map(t, is, map);
#ifdef DDB
if (iommudebug & IDB_BREAK)
- Debugger();
+ db_enter();
#endif
}
#endif
printf("iommu_dvmamap_unload: No dvmastart\n");
#ifdef DDB
if (iommudebug & IDB_BREAK)
- Debugger();
+ db_enter();
#endif
return;
}
iommu_dvmamap_print_map(t, is, map);
#if defined(DDB) && defined(DEBUG)
if (iommudebug & IDB_BREAK)
- Debugger();
+ db_enter();
#endif
}
-/* $OpenBSD: pcons.c,v 1.21 2016/03/07 13:21:51 naddy Exp $ */
+/* $OpenBSD: pcons.c,v 1.22 2017/04/30 16:45:45 mpi Exp $ */
/* $NetBSD: pcons.c,v 1.7 2001/05/02 10:32:20 scw Exp $ */
/*-
} cnm_state_t;
#ifdef DDB
#include <ddb/db_var.h>
-#define cn_trap() do { if (db_console) Debugger(); } while (0)
+#define cn_trap() do { if (db_console) db_enter(); } while (0)
#else
#define cn_trap()
#endif
-/* $OpenBSD: sab.c,v 1.31 2013/05/30 16:15:01 deraadt Exp $ */
+/* $OpenBSD: sab.c,v 1.32 2017/04/30 16:45:45 mpi Exp $ */
/*
* Copyright (c) 2001 Jason L. Wright (jason@thought.net)
if (db_console == 0)
return;
if (db_active == 0)
- Debugger();
+ db_enter();
else
callrom();
#else
-/* $OpenBSD: sbbc.c,v 1.11 2012/10/20 12:00:33 miod Exp $ */
+/* $OpenBSD: sbbc.c,v 1.12 2017/04/30 16:45:45 mpi Exp $ */
/*
* Copyright (c) 2008 Mark Kettenis
*
#ifdef DDB
if ((reason & SBBC_SRAM_CONS_BRK) && sc == sbbc_cons_input) {
if (db_console)
- Debugger();
+ db_enter();
}
#endif
-/* $OpenBSD: vcons.c,v 1.14 2014/05/10 11:49:31 kettenis Exp $ */
+/* $OpenBSD: vcons.c,v 1.15 2017/04/30 16:45:45 mpi Exp $ */
/*
* Copyright (c) 2008 Mark Kettenis
*
if (hv_cons_getchar(&ch) == H_EOK) {
#ifdef DDB
if (ch == -1 && db_console)
- Debugger();
+ db_enter();
#endif
*cp = ch;
return (1);
-/* $OpenBSD: viommu.c,v 1.17 2016/05/04 18:26:12 kettenis Exp $ */
+/* $OpenBSD: viommu.c,v 1.18 2017/04/30 16:45:45 mpi Exp $ */
/* $NetBSD: iommu.c,v 1.47 2002/02/08 20:03:45 eeh Exp $ */
/*
(int)sgsize, flags);
#ifdef DDB
if (iommudebug & IDB_BREAK)
- Debugger();
+ db_enter();
#endif
}
#endif
"failed!\n", (int)sgsize, flags);
#ifdef DDB
if (iommudebug & IDB_BREAK)
- Debugger();
+ db_enter();
#else
panic("");
#endif
-/* $OpenBSD: zs.c,v 1.28 2017/04/30 13:04:49 mpi Exp $ */
+/* $OpenBSD: zs.c,v 1.29 2017/04/30 16:45:45 mpi Exp $ */
/* $NetBSD: zs.c,v 1.29 2001/05/30 15:24:24 lukem Exp $ */
/*-
* XXX - I think I like the mvme167 code better. -gwr
****************************************************************/
-extern void Debugger(void);
-
/*
* Handle user request to enter kernel debugger.
*/
extern int db_active;
if (!db_active)
- Debugger();
+ db_enter();
else
/* Debugger is probably hozed */
callrom();
-/* $OpenBSD: autoconf.c,v 1.127 2016/10/18 00:43:57 guenther Exp $ */
+/* $OpenBSD: autoconf.c,v 1.128 2017/04/30 16:45:45 mpi Exp $ */
/* $NetBSD: autoconf.c,v 1.51 2001/07/24 19:32:11 eeh Exp $ */
/*
/* specialties */
if (*cp == 'd') {
#if defined(DDB)
- Debugger();
+ db_enter();
#else
printf("kernel has no debugger\n");
#endif
-/* $OpenBSD: clock.c,v 1.58 2016/03/07 13:21:51 naddy Exp $ */
+/* $OpenBSD: clock.c,v 1.59 2017/04/30 16:45:45 mpi Exp $ */
/* $NetBSD: clock.c,v 1.41 2001/07/24 19:29:25 eeh Exp $ */
/*
"tick_base %llx\n", (long long)t, (long long)clk,
(long long)tk, (long long)tick_base);
#ifdef DDB
- Debugger();
+ db_enter();
#endif
tick_base = 0;
}
-/* $OpenBSD: db_interface.c,v 1.47 2016/11/07 00:26:33 guenther Exp $ */
+/* $OpenBSD: db_interface.c,v 1.48 2017/04/30 16:45:45 mpi Exp $ */
/* $NetBSD: db_interface.c,v 1.61 2001/07/31 06:55:47 eeh Exp $ */
/*
}
void
-Debugger(void)
+db_enter(void)
{
/* We use the breakpoint to trap into DDB */
asm("ta 1; nop");
-/* $OpenBSD: intr.c,v 1.55 2016/06/13 01:08:13 dlg Exp $ */
+/* $OpenBSD: intr.c,v 1.56 2017/04/30 16:45:45 mpi Exp $ */
/* $NetBSD: intr.c,v 1.39 2001/07/19 23:38:11 eeh Exp $ */
/*
nstray = 1;
}
#ifdef DDB
- Debugger();
+ db_enter();
#endif
}
if (!ih->ih_number) {
printf("\nintr_establish: NULL vector fun %p arg %p pil %p",
ih->ih_fun, ih->ih_arg, ih->ih_number, ih->ih_pil);
- Debugger();
+ db_enter();
}
#endif
-/* $OpenBSD: lock_machdep.c,v 1.13 2017/04/04 12:30:04 visa Exp $ */
+/* $OpenBSD: lock_machdep.c,v 1.14 2017/04/30 16:45:45 mpi Exp $ */
/*
* Copyright (c) 2007 Artur Grabowski <art@openbsd.org>
if (--nticks <= 0) {
db_printf("__mp_lock(%p): lock spun out", mpl);
- Debugger();
+ db_enter();
nticks = __mp_lock_spinout;
}
}
-/* $OpenBSD: locore.s,v 1.184 2016/10/18 00:43:57 guenther Exp $ */
+/* $OpenBSD: locore.s,v 1.185 2017/04/30 16:45:45 mpi Exp $ */
/* $NetBSD: locore.s,v 1.137 2001/08/13 06:10:10 jdolecek Exp $ */
/*
#undef FPPROC
/* Let us use same syntax as C code */
-#define Debugger() ta 1; nop
+#define db_enter() ta 1; nop
/* use as needed to align things on longword boundaries */
#define _ALIGN .align 8
be,pn %icc, ufill_trap
nop
- Debugger()
+ db_enter()
NOTREACHED
flush_others:
NOTREACHED
pcbspill_fail:
- Debugger()
+ db_enter()
NOTREACHED
jmpl %g2, %g0
nop
- Debugger()
+ db_enter()
NOTREACHED
#else
bgeu,pn %xcc, 3f
-/* $OpenBSD: pmap.c,v 1.98 2016/09/15 02:00:17 dlg Exp $ */
+/* $OpenBSD: pmap.c,v 1.99 2017/04/30 16:45:45 mpi Exp $ */
/* $NetBSD: pmap.c,v 1.107 2001/08/31 16:47:41 eeh Exp $ */
#undef NO_VCACHE /* Don't forget the locked TLB in dostart */
/*
#include <ddb/db_extern.h>
#include <ddb/db_access.h>
#include <ddb/db_output.h>
-#define Debugger() __asm volatile("ta 1; nop");
+#define db_enter() __asm volatile("ta 1; nop");
#else
-#define Debugger()
+#define db_enter()
#define db_printf printf
#endif
if (pv != NULL) {
printf("pmap_release: pm=%p page %llx still in use\n", pm,
(unsigned long long)(((u_int64_t)i<<STSHIFT)|((u_int64_t)k<<PDSHIFT)|((u_int64_t)j<<PTSHIFT)));
- Debugger();
+ db_enter();
}
}
stxa(pdirentp, ASI_PHYS_CACHED, 0);
/* We need to flip the valid bit and clear the access statistics. */
if (pseg_set(pm, va, 0, 0)) {
printf("pmap_kremove: gotten pseg empty!\n");
- Debugger();
+ db_enter();
/* panic? */
}
/* We need to flip the valid bit and clear the access statistics. */
if (pseg_set(pm, va, 0, 0)) {
printf("pmap_remove: gotten pseg empty!\n");
- Debugger();
+ db_enter();
/* panic? */
}
atomic_dec_long(&pm->pm_stats.resident_count);
KDASSERT((data & TLB_NFO) == 0);
if (pseg_set(pm, sva, data, 0)) {
printf("pmap_protect: gotten pseg empty!\n");
- Debugger();
+ db_enter();
/* panic? */
}
KDASSERT((data & TLB_NFO) == 0);
if (pseg_set(pv->pv_pmap, pv->pv_va & PV_VAMASK, data, 0)) {
printf("pmap_clear_modify: gotten pseg empty!\n");
- Debugger();
+ db_enter();
/* panic? */
}
if (pv->pv_pmap->pm_ctx || pv->pv_pmap == pmap_kernel()) {
KDASSERT((data & TLB_NFO) == 0);
if (pseg_set(pv->pv_pmap, pv->pv_va & PV_VAMASK, data, 0)) {
printf("pmap_clear_reference: gotten pseg empty!\n");
- Debugger();
+ db_enter();
/* panic? */
}
if (pv->pv_pmap->pm_ctx || pv->pv_pmap == pmap_kernel()) {
if (pseg_set(pmap, va & PV_VAMASK, data, 0)) {
printf("pmap_unwire: gotten pseg empty!\n");
- Debugger();
+ db_enter();
/* panic? */
}
mtx_leave(&pmap->pm_mtx);
KDASSERT((data & TLB_NFO) == 0);
if (pseg_set(pv->pv_pmap, pv->pv_va & PV_VAMASK, data, 0)) {
printf("pmap_page_protect: gotten pseg empty!\n");
- Debugger();
+ db_enter();
/* panic? */
}
if (pv->pv_pmap->pm_ctx || pv->pv_pmap == pmap_kernel()) {
/* Clear mapping */
if (pseg_set(pv->pv_pmap, pv->pv_va & PV_VAMASK, 0, 0)) {
printf("pmap_page_protect: gotten pseg empty!\n");
- Debugger();
+ db_enter();
/* panic? */
}
if (pv->pv_pmap->pm_ctx || pv->pv_pmap == pmap_kernel()) {
pv->pv_va |= pmap_tte2flags(data);
if (pseg_set(pv->pv_pmap, pv->pv_va & PV_VAMASK, 0, 0)) {
printf("pmap_page_protect: gotten pseg empty!\n");
- Debugger();
+ db_enter();
/* panic? */
}
if (pv->pv_pmap->pm_ctx || pv->pv_pmap == pmap_kernel()) {
"ctxbusy[%d] = %p, pm(%p)->pm_ctx = %p\n",
oldctx, (void *)(u_long)ctxbusy[oldctx], pm,
(void *)(u_long)pm->pm_physaddr);
- Debugger();
+ db_enter();
}
#endif
/* We should verify it has not been stolen and reallocated... */
pseg_get(pv->pv_pmap, va) & ~(SUN4U_TLB_CV|SUN4U_TLB_CP),
0)) {
printf("pmap_page_cache: aliased pseg empty!\n");
- Debugger();
+ db_enter();
/* panic? */
}
} else if (mode && (!(pv->pv_va & PV_NVC))) {
if (pseg_set(pv->pv_pmap, va,
pseg_get(pv->pv_pmap, va) | SUN4U_TLB_CV, 0)) {
printf("pmap_page_cache: aliased pseg empty!\n");
- Debugger();
+ db_enter();
/* panic? */
}
} else {
if (pseg_set(pv->pv_pmap, va,
pseg_get(pv->pv_pmap, va) & ~SUN4U_TLB_CV, 0)) {
printf("pmap_page_cache: aliased pseg empty!\n");
- Debugger();
+ db_enter();
/* panic? */
}
}
-/* $OpenBSD: vm_machdep.c,v 1.36 2017/02/12 04:55:08 guenther Exp $ */
+/* $OpenBSD: vm_machdep.c,v 1.37 2017/04/30 16:45:45 mpi Exp $ */
/* $NetBSD: vm_machdep.c,v 1.38 2001/06/30 00:02:20 eeh Exp $ */
/*
printf("cpu_fork: tstate=%lx pc=%lx npc=%lx rsp=%lx\n",
(long)tf2->tf_tstate, (long)tf2->tf_pc, (long)tf2->tf_npc,
(long)(tf2->tf_out[6]));
- Debugger();
+ db_enter();
#endif
}
-/* $OpenBSD: db_usrreq.c,v 1.18 2016/09/04 09:22:29 mpi Exp $ */
+/* $OpenBSD: db_usrreq.c,v 1.19 2017/04/30 16:45:45 mpi Exp $ */
/*
* Copyright (c) 1996 Michael Shalayeff. All rights reserved.
if (securelevel < 1 ||
(pr->ps_flags & PS_CONTROLT && cn_tab &&
cn_tab->cn_dev == pr->ps_session->s_ttyp->t_dev)) {
- Debugger();
+ db_enter();
newp = NULL;
} else
return (ENODEV);
-/* $OpenBSD: aic6250.c,v 1.2 2013/10/23 10:07:14 miod Exp $ */
+/* $OpenBSD: aic6250.c,v 1.3 2017/04/30 16:45:45 mpi Exp $ */
/*
* Copyright (c) 2010, 2013 Miodrag Vallat.
#include <dev/ic/aic6250var.h>
#ifndef DDB
-#define Debugger() panic("should call debugger here (aic6250.c)")
+#define db_enter() panic("should call debugger here (aic6250.c)")
#endif /* ! DDB */
#ifdef AIC_DEBUG
-/* $OpenBSD: aic6250var.h,v 1.2 2013/10/23 10:07:14 miod Exp $ */
+/* $OpenBSD: aic6250var.h,v 1.3 2017/04/30 16:45:45 mpi Exp $ */
/*
* Copyright (c) 2010, 2013 Miodrag Vallat.
#define AIC_DOBREAK 0x40
#define AIC_PRINT(b, s) do {if ((aic6250_debug & (b)) != 0) printf s;} while (0)
#define AIC_BREAK() \
- do { if ((aic6250_debug & AIC_DOBREAK) != 0) Debugger(); } while (0)
+ do { if ((aic6250_debug & AIC_DOBREAK) != 0) db_enter(); } while (0)
#define AIC_ASSERT(x) \
do { \
if (!(x)) { \
printf("%s at line %d: assertion failed\n", \
sc->sc_dev.dv_xname, __LINE__); \
- Debugger(); \
+ db_enter(); \
} \
} while (0)
#else
-/* $OpenBSD: aic6360.c,v 1.27 2014/09/14 14:17:24 jsg Exp $ */
+/* $OpenBSD: aic6360.c,v 1.28 2017/04/30 16:45:46 mpi Exp $ */
/* $NetBSD: aic6360.c,v 1.52 1996/12/10 21:27:51 thorpej Exp $ */
#ifdef DDB
#include <dev/ic/aic6360var.h>
#ifndef DDB
-#define Debugger() panic("should call debugger here (aic6360.c)")
+#define db_enter() panic("should call debugger here (aic6360.c)")
#endif /* ! DDB */
#ifdef AIC_DEBUG
-/* $OpenBSD: aic6360var.h,v 1.8 2011/04/06 18:14:35 miod Exp $ */
+/* $OpenBSD: aic6360var.h,v 1.9 2017/04/30 16:45:45 mpi Exp $ */
/* $NetBSD: aic6360.c,v 1.52 1996/12/10 21:27:51 thorpej Exp $ */
/*
#define AIC_DOBREAK 0x40
#define AIC_PRINT(b, s) do {if ((aic_debug & (b)) != 0) printf s;} while (0)
#define AIC_BREAK() \
- do { if ((aic_debug & AIC_DOBREAK) != 0) Debugger(); } while (0)
+ do { if ((aic_debug & AIC_DOBREAK) != 0) db_enter(); } while (0)
#define AIC_ASSERT(x) \
do { \
if (!(x)) { \
printf("%s at line %d: assertion failed\n", \
sc->sc_dev.dv_xname, __LINE__); \
- Debugger(); \
+ db_enter(); \
} \
} while (0)
#else
-/* $OpenBSD: com.c,v 1.162 2017/04/30 13:04:49 mpi Exp $ */
+/* $OpenBSD: com.c,v 1.163 2017/04/30 16:45:46 mpi Exp $ */
/* $NetBSD: com.c,v 1.82.4.1 1996/06/02 09:08:00 mrg Exp $ */
/*
if (ISSET(sc->sc_hwflags,
COM_HW_CONSOLE)) {
if (db_console)
- Debugger();
+ db_enter();
goto next;
}
#endif
-/* $OpenBSD: ncr5380sbc.c,v 1.32 2015/01/15 17:54:14 miod Exp $ */
+/* $OpenBSD: ncr5380sbc.c,v 1.33 2017/04/30 16:45:46 mpi Exp $ */
/* $NetBSD: ncr5380sbc.c,v 1.13 1996/10/13 01:37:25 christos Exp $ */
/*
#ifndef DDB
/* This is used only in recoverable places. */
-#define Debugger() printf("Debug: ncr5380.c:%d\n", __LINE__)
+#define db_enter() printf("Debug: ncr5380.c:%d\n", __LINE__)
#endif
#ifdef NCR5380_DEBUG
struct ncr5380_softc *ncr5380_debug_sc;
#define NCR_BREAK() \
- do { if (ncr5380_debug & NCR_DBG_BREAK) Debugger(); } while (0)
+ do { if (ncr5380_debug & NCR_DBG_BREAK) db_enter(); } while (0)
static void ncr5380_show_scsi_cmd(struct scsi_xfer *);
static void ncr5380_show_sense(struct scsi_xfer *);
-/* $OpenBSD: osiop.c,v 1.50 2014/12/19 07:23:57 deraadt Exp $ */
+/* $OpenBSD: osiop.c,v 1.51 2017/04/30 16:45:46 mpi Exp $ */
/* $NetBSD: osiop.c,v 1.9 2002/04/05 18:27:54 bouyer Exp $ */
/*
if (acb == NULL || acb->xs == NULL) {
printf("osiop_scsidone: NULL acb %p or scsi_xfer\n", acb);
#if defined(OSIOP_DEBUG) && defined(DDB)
- Debugger();
+ db_enter();
#endif
return;
}
scraddr, scraddr + sizeof(osiop_script));
printf(" istat %x dstat %x sstat0 %x\n", istat, dstat, sstat0);
#ifdef DDB
- Debugger();
+ db_enter();
#endif
}
#endif
osiop_read_1(sc, OSIOP_SBCL),
osiop_read_4(sc, OSIOP_DSP));
#if defined(OSIOP_DEBUG) && defined(DDB)
- /*Debugger(); XXX is*/
+ /*db_enter(); XXX is*/
#endif
}
switch (OSIOP_PHASE(osiop_read_1(sc, OSIOP_SBCL))) {
"curaddr %lx curlen %lx i %d\n",
acb->curaddr, acb->curlen, i);
#if defined(OSIOP_DEBUG) && defined(DDB)
- Debugger();
+ db_enter();
#endif
}
#ifdef OSIOP_DEBUG
-/* $OpenBSD: wd33c93.c,v 1.9 2016/12/26 17:38:14 jca Exp $ */
+/* $OpenBSD: wd33c93.c,v 1.10 2017/04/30 16:45:46 mpi Exp $ */
/* $NetBSD: wd33c93.c,v 1.24 2010/11/13 13:52:02 uebayasi Exp $ */
/*
printf("wd33c93_wait: TIMEO @%d with asr=0x%x csr=0x%x\n",
line, val, csr);
#ifdef DDB
- Debugger();
+ db_enter();
#endif
#endif
return(val); /* Maybe I should abort */
sc->sc_dev.dv_xname, asr, csr);
#ifdef DDB
- Debugger();
+ db_enter();
#endif
SET_SBIC_control(sc, SBIC_CTL_EDI | SBIC_CTL_IDI);
-/* $OpenBSD: dwc2.c,v 1.43 2017/03/10 11:18:48 mpi Exp $ */
+/* $OpenBSD: dwc2.c,v 1.44 2017/04/30 16:45:46 mpi Exp $ */
/* $NetBSD: dwc2.c,v 1.32 2014/09/02 23:26:20 macallan Exp $ */
/*-
struct dwc2_softc *sc = priv;
struct dwc2_hsotg *hsotg = sc->sc_hsotg;
-/* Debugger(); */
+/* db_enter(); */
#if 0
struct usbd_xfer *xfer = dwork->xfer;
struct dwc2_xfer *dxfer = DWC2_XFER2DXFER(xfer);
-/* $OpenBSD: wskbd.c,v 1.85 2017/03/11 11:55:03 mpi Exp $ */
+/* $OpenBSD: wskbd.c,v 1.86 2017/04/30 16:45:46 mpi Exp $ */
/* $NetBSD: wskbd.c,v 1.80 2005/05/04 01:52:16 augustss Exp $ */
/*
#ifdef DDB
if (ksym == KS_Cmd_Debugger) {
if (sc->sc_isconsole && db_console)
- Debugger();
+ db_enter();
/* discard this key (ddb discarded command modifiers) */
*type = WSCONS_EVENT_KEY_UP;
return (1);
#ifdef DDB
case 2:
if (sc->sc_isconsole && db_console)
- Debugger();
+ db_enter();
/* discard this key (ddb discarded command modifiers) */
*type = WSCONS_EVENT_KEY_UP;
break;
-/* $OpenBSD: subr_prf.c,v 1.90 2017/04/30 13:04:49 mpi Exp $ */
+/* $OpenBSD: subr_prf.c,v 1.91 2017/04/30 16:45:46 mpi Exp $ */
/* $NetBSD: subr_prf.c,v 1.45 1997/10/24 18:14:25 chuck Exp $ */
/*-
#ifdef DDB
if (db_panic)
- Debugger();
+ db_enter();
else
db_stack_dump();
#endif
case 3:
#ifdef DDB
db_stack_dump();
- Debugger();
+ db_enter();
#endif
break;
default:
-/* $OpenBSD: subr_userconf.c,v 1.44 2015/09/11 07:13:58 miod Exp $ */
+/* $OpenBSD: subr_userconf.c,v 1.45 2017/04/30 16:45:46 mpi Exp $ */
/*
* Copyright (c) 1996-2001 Mats O Jansson <moj@stacken.kth.se>
break;
#if defined(DDB)
case 'D':
- Debugger();
+ db_enter();
break;
#endif
case 'd':
-/* $OpenBSD: subr_witness.c,v 1.1 2017/04/20 12:59:36 visa Exp $ */
+/* $OpenBSD: subr_witness.c,v 1.2 2017/04/30 16:45:46 mpi Exp $ */
/*-
* Copyright (c) 2008 Isilon Systems, Inc.
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * from BSDI $Id: subr_witness.c,v 1.1 2017/04/20 12:59:36 visa Exp $
- * and BSDI $Id: subr_witness.c,v 1.1 2017/04/20 12:59:36 visa Exp $
+ * from BSDI $Id: subr_witness.c,v 1.2 2017/04/30 16:45:46 mpi Exp $
+ * and BSDI $Id: subr_witness.c,v 1.2 2017/04/30 16:45:46 mpi Exp $
*/
/*
if (!cond)
return;
- Debugger();
+ db_enter();
}
-/* $OpenBSD: systm.h,v 1.127 2017/04/30 13:04:49 mpi Exp $ */
+/* $OpenBSD: systm.h,v 1.128 2017/04/30 16:45:46 mpi Exp $ */
/* $NetBSD: systm.h,v 1.50 1996/06/09 04:55:09 briggs Exp $ */
/*-
#if defined(DDB)
/* debugger entry points */
-void Debugger(void); /* in DDB only */
+void db_enter(void); /* in DDB only */
#endif
#ifdef BOOT_CONFIG
projects / openbsd / commitdiff