summaryrefslogtreecommitdiff
path: root/sys/arch/luna88k
diff options
context:
space:
mode:
authorMartin Pieuchot <mpi@cvs.openbsd.org>2017-04-30 16:45:47 +0000
committerMartin Pieuchot <mpi@cvs.openbsd.org>2017-04-30 16:45:47 +0000
commite62fafe0fa1eeeb884ab8eaf16544bea713623e0 (patch)
treea8086015aa47b90f864ae82e4621f00dfa5b1fa4 /sys/arch/luna88k
parentcae22d750b8ecab9026d8c9364adf6d4174e81c8 (diff)
Rename Debugger() into db_enter().
Using a name with the 'db_' prefix makes it invisible from the dynamic profiler. ok deraadt@, kettenis@, visa@
Diffstat (limited to 'sys/arch/luna88k')
-rw-r--r--sys/arch/luna88k/dev/mb89352.c4
-rw-r--r--sys/arch/luna88k/dev/mb89352var.h6
-rw-r--r--sys/arch/luna88k/dev/siotty.c4
-rw-r--r--sys/arch/luna88k/luna88k/machdep.c6
4 files changed, 10 insertions, 10 deletions
diff --git a/sys/arch/luna88k/dev/mb89352.c b/sys/arch/luna88k/dev/mb89352.c
index a68d4bc3d02..d0dbe8e1729 100644
--- a/sys/arch/luna88k/dev/mb89352.c
+++ b/sys/arch/luna88k/dev/mb89352.c
@@ -1,4 +1,4 @@
-/* $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 */
@@ -140,7 +140,7 @@
#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
diff --git a/sys/arch/luna88k/dev/mb89352var.h b/sys/arch/luna88k/dev/mb89352var.h
index da2d7c7f654..85fc053c394 100644
--- a/sys/arch/luna88k/dev/mb89352var.h
+++ b/sys/arch/luna88k/dev/mb89352var.h
@@ -1,4 +1,4 @@
-/* $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 */
@@ -190,8 +190,8 @@ struct spc_softc {
#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()
diff --git a/sys/arch/luna88k/dev/siotty.c b/sys/arch/luna88k/dev/siotty.c
index 9799db08da5..3fc73b84b7b 100644
--- a/sys/arch/luna88k/dev/siotty.c
+++ b/sys/arch/luna88k/dev/siotty.c
@@ -1,4 +1,4 @@
-/* $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 $ */
/*-
@@ -162,7 +162,7 @@ siottyintr(int chan)
#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
diff --git a/sys/arch/luna88k/luna88k/machdep.c b/sys/arch/luna88k/luna88k/machdep.c
index 1ebb31de176..1d684f75b27 100644
--- a/sys/arch/luna88k/luna88k/machdep.c
+++ b/sys/arch/luna88k/luna88k/machdep.c
@@ -1,4 +1,4 @@
-/* $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
@@ -248,7 +248,7 @@ consinit()
db_machine_init();
ddb_init();
if (boothowto & RB_KDB)
- Debugger();
+ db_enter();
#endif
}
@@ -1323,7 +1323,7 @@ luna88k_ipi_handler(struct trapframe *eframe)
* 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) {