There's no point having a Debugger() clone here.

3 files changed, 7 insertions, 17 deletions

diff --git a/sys/arch/mvme88k/ddb/db_interface.c b/sys/arch/mvme88k/ddb/db_interface.c
index 88b5c18737e..2e223824cf6 100644
--- a/sys/arch/mvme88k/ddb/db_interface.c
+++ b/sys/arch/mvme88k/ddb/db_interface.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: db_interface.c,v 1.12 2001/08/26 02:37:00 miod Exp $	*/
+/*	$OpenBSD: db_interface.c,v 1.13 2001/08/31 01:06:26 miod Exp $	*/
 /*
  * Mach Operating System
  * Copyright (c) 1993-1991 Carnegie Mellon University
@@ -429,14 +429,6 @@ Debugger()
 	/* ends up at ddb_entry_trap below */
 }
 
-/* gimmeabreak - drop execute the ENTRY trap */
-void
-gimmeabreak()
-{
-	asm (ENTRY_ASM); /* entry trap */
-	/* ends up at ddb_entry_trap below */
-}
-
 /* fielded a non maskable interrupt */
 int
 ddb_nmi_trap(level, eframe)
diff --git a/sys/arch/mvme88k/include/db_machdep.h b/sys/arch/mvme88k/include/db_machdep.h
index ba53fc7d9c6..ce50e73d465 100644
--- a/sys/arch/mvme88k/include/db_machdep.h
+++ b/sys/arch/mvme88k/include/db_machdep.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: db_machdep.h,v 1.12 2001/08/26 14:31:07 miod Exp $ */
+/*	$OpenBSD: db_machdep.h,v 1.13 2001/08/31 01:06:29 miod Exp $ */
 /*
  * Mach Operating System
  * Copyright (c) 1993-1991 Carnegie Mellon University
@@ -50,8 +50,6 @@
 #define ENTRY_ASM       	"tb0 0, r0, 132"
 #define DDB_ENTRY_TRAP_NO	132
 
-void gimmeabreak __P((void));
-
 typedef vm_offset_t   db_addr_t;
 typedef int           db_expr_t;
 typedef struct m88100_saved_state db_regs_t;
diff --git a/sys/arch/mvme88k/mvme88k/trap.c b/sys/arch/mvme88k/mvme88k/trap.c
index c6a9db52f65..c4c00c4a363 100644
--- a/sys/arch/mvme88k/mvme88k/trap.c
+++ b/sys/arch/mvme88k/mvme88k/trap.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: trap.c,v 1.19 2001/08/26 14:31:12 miod Exp $	*/
+/*	$OpenBSD: trap.c,v 1.20 2001/08/31 01:06:29 miod Exp $	*/
 /*
  * Copyright (c) 1998 Steve Murphree, Jr.
  * Copyright (c) 1996 Nivas Madhur
@@ -1214,9 +1214,9 @@ error_fault(struct m88100_saved_state *frame)
 	DEBUG_MSG("last exception vector = %d\n", last_vector);
 #endif 
 #if DDB 
-	gimmeabreak();
+	Debugger();
 	DEBUG_MSG("You really can't restart after an error exception!\n");
-	gimmeabreak();
+	Debugger();
 #endif /* DDB */
 	bugreturn();  /* This gets us to Bug instead of a loop forever */
 }
@@ -1228,9 +1228,9 @@ error_reset(struct m88100_saved_state *frame)
 	DEBUG_MSG("This is usually caused by a branch to a NULL function pointer.\n");
 	DEBUG_MSG("e.g. jump to address 0.  Use the debugger trace command to track it down.\n");
 #if DDB 
-	gimmeabreak();
+	Debugger();
 	DEBUG_MSG("It's useless to restart after a reset exception! You might as well reboot.\n");
-	gimmeabreak();
+	Debugger();
 #endif /* DDB */
 	bugreturn();  /* This gets us to Bug instead of a loop forever */
 }