Rename Debugger() into db_enter().

Using a name with the 'db_' prefix makes it invisible from the dynamic
profiler.

ok deraadt@, kettenis@, visa@

9 files changed, 24 insertions, 26 deletions

diff --git a/sys/arch/sparc64/dev/consinit.c b/sys/arch/sparc64/dev/consinit.c
index 89d7c6878dc..5fcb870620f 100644
--- a/sys/arch/sparc64/dev/consinit.c
+++ b/sys/arch/sparc64/dev/consinit.c
@@ -1,4 +1,4 @@
-/*	$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 $	*/
 
 /*-
@@ -111,7 +111,7 @@ prom_cngetc(dev_t dev)
 #ifdef DDB
 	if (ch == '+') {
 		if (nplus++ > 3)
-			Debugger();
+			db_enter();
 	} else
 		nplus = 0;
 #endif
diff --git a/sys/arch/sparc64/dev/fd.c b/sys/arch/sparc64/dev/fd.c
index f79ec2a59e5..8c48b4ee12d 100644
--- a/sys/arch/sparc64/dev/fd.c
+++ b/sys/arch/sparc64/dev/fd.c
@@ -1,4 +1,4 @@
-/*	$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 $	*/
 
 /*-
@@ -1459,7 +1459,7 @@ loop:
 				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
 			}
 		}
diff --git a/sys/arch/sparc64/dev/iommu.c b/sys/arch/sparc64/dev/iommu.c
index 66316b1844c..b2f02f8f541 100644
--- a/sys/arch/sparc64/dev/iommu.c
+++ b/sys/arch/sparc64/dev/iommu.c
@@ -1,4 +1,4 @@
-/*	$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 $	*/
 
 /*
@@ -774,7 +774,7 @@ iommu_dvmamap_load(bus_dma_tag_t t, bus_dma_tag_t t0, bus_dmamap_t map,
 		    (int)sgsize, flags);
 #ifdef DDB
 		if (iommudebug & IDB_BREAK)
-			Debugger();
+			db_enter();
 #endif
 	}		
 #endif	
@@ -843,7 +843,7 @@ iommu_dvmamap_load(bus_dma_tag_t t, bus_dma_tag_t t0, bus_dmamap_t map,
 		iommu_dvmamap_print_map(t, is, map);
 #ifdef DDB
 		if (iommudebug & IDB_BREAK)
-			Debugger();
+			db_enter();
 #endif
 	}
 #endif
@@ -993,7 +993,7 @@ iommu_dvmamap_load_raw(bus_dma_tag_t t, bus_dma_tag_t t0, bus_dmamap_t map,
 		    "failed!\n", (int)sgsize, flags);
 #ifdef DDB
 		if (iommudebug & IDB_BREAK)
-			Debugger();
+			db_enter();
 #else
 		panic("");
 #endif
@@ -1062,7 +1062,7 @@ iommu_dvmamap_load_raw(bus_dma_tag_t t, bus_dma_tag_t t0, bus_dmamap_t map,
 		iommu_dvmamap_print_map(t, is, map);
 #ifdef DDB
 		if (iommudebug & IDB_BREAK)
-			Debugger();
+			db_enter();
 #endif
 	}
 #endif
@@ -1320,7 +1320,7 @@ iommu_dvmamap_unload(bus_dma_tag_t t, bus_dma_tag_t t0, bus_dmamap_t map)
 		printf("iommu_dvmamap_unload: No dvmastart\n");
 #ifdef DDB
 		if (iommudebug & IDB_BREAK)
-			Debugger();
+			db_enter();
 #endif
 		return;
 	}
@@ -1409,7 +1409,7 @@ iommu_dvmamap_validate_map(bus_dma_tag_t t, struct iommu_state *is,
 		iommu_dvmamap_print_map(t, is, map);
 #if defined(DDB) && defined(DEBUG)
 		if (iommudebug & IDB_BREAK)
-			Debugger();
+			db_enter();
 #endif
 	}
 
diff --git a/sys/arch/sparc64/dev/pcons.c b/sys/arch/sparc64/dev/pcons.c
index b447fc33d2d..a195e9cd5bc 100644
--- a/sys/arch/sparc64/dev/pcons.c
+++ b/sys/arch/sparc64/dev/pcons.c
@@ -1,4 +1,4 @@
-/*	$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 $	*/
 
 /*-
@@ -93,7 +93,7 @@ typedef struct cnm_state {
 } 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
diff --git a/sys/arch/sparc64/dev/sab.c b/sys/arch/sparc64/dev/sab.c
index 000003495ec..feb9de16f45 100644
--- a/sys/arch/sparc64/dev/sab.c
+++ b/sys/arch/sparc64/dev/sab.c
@@ -1,4 +1,4 @@
-/*	$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)
@@ -1398,7 +1398,7 @@ sabtty_abort(sc)
 		if (db_console == 0)
 			return;
 		if (db_active == 0)
-			Debugger();
+			db_enter();
 		else
 			callrom();
 #else
diff --git a/sys/arch/sparc64/dev/sbbc.c b/sys/arch/sparc64/dev/sbbc.c
index c2a9c4f4535..eb4b2bd8444 100644
--- a/sys/arch/sparc64/dev/sbbc.c
+++ b/sys/arch/sparc64/dev/sbbc.c
@@ -1,4 +1,4 @@
-/*	$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
  *
@@ -424,7 +424,7 @@ sbbc_intr_cons(struct sbbc_softc *sc, uint32_t reason)
 #ifdef DDB
 	if ((reason & SBBC_SRAM_CONS_BRK) && sc == sbbc_cons_input) {
 		if (db_console)
-			Debugger();
+			db_enter();
 	}
 #endif
 
diff --git a/sys/arch/sparc64/dev/vcons.c b/sys/arch/sparc64/dev/vcons.c
index da5465685f5..213a134cc1c 100644
--- a/sys/arch/sparc64/dev/vcons.c
+++ b/sys/arch/sparc64/dev/vcons.c
@@ -1,4 +1,4 @@
-/*	$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
  *
@@ -140,7 +140,7 @@ vcons_cnlookc(dev_t dev, int *cp)
 	if (hv_cons_getchar(&ch) == H_EOK) {
 #ifdef DDB
 		if (ch == -1 && db_console)
-			Debugger();
+			db_enter();
 #endif
 		*cp = ch;
 		return (1);
diff --git a/sys/arch/sparc64/dev/viommu.c b/sys/arch/sparc64/dev/viommu.c
index 77362d76eeb..4ded11671eb 100644
--- a/sys/arch/sparc64/dev/viommu.c
+++ b/sys/arch/sparc64/dev/viommu.c
@@ -1,4 +1,4 @@
-/*	$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 $	*/
 
 /*
@@ -384,7 +384,7 @@ viommu_dvmamap_load(bus_dma_tag_t t, bus_dma_tag_t t0, bus_dmamap_t map,
 		    (int)sgsize, flags);
 #ifdef DDB
 		if (iommudebug & IDB_BREAK)
-			Debugger();
+			db_enter();
 #endif
 	}		
 #endif	
@@ -579,7 +579,7 @@ viommu_dvmamap_load_raw(bus_dma_tag_t t, bus_dma_tag_t t0, bus_dmamap_t map,
 		    "failed!\n", (int)sgsize, flags);
 #ifdef DDB
 		if (iommudebug & IDB_BREAK)
-			Debugger();
+			db_enter();
 #else
 		panic("");
 #endif
diff --git a/sys/arch/sparc64/dev/zs.c b/sys/arch/sparc64/dev/zs.c
index 5c2668a09b8..8b105b7276b 100644
--- a/sys/arch/sparc64/dev/zs.c
+++ b/sys/arch/sparc64/dev/zs.c
@@ -1,4 +1,4 @@
-/*	$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 $	*/
 
 /*-
@@ -670,8 +670,6 @@ zs_write_data(cs, val)
  * XXX - I think I like the mvme167 code better. -gwr
  ****************************************************************/
 
-extern void Debugger(void);
-
 /*
  * Handle user request to enter kernel debugger.
  */
@@ -694,7 +692,7 @@ zs_abort(cs)
 		extern int db_active;
 		
 		if (!db_active)
-			Debugger();
+			db_enter();
 		else
 			/* Debugger is probably hozed */
 			callrom();