Switch db_expr_t from int to long, per consistency with other platforms.

3 files changed, 10 insertions, 12 deletions

diff --git a/sys/arch/mvme88k/ddb/db_interface.c b/sys/arch/mvme88k/ddb/db_interface.c
index 3d5516d93b1..f93b63afc58 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.32 2003/12/19 22:30:17 miod Exp $	*/
+/*	$OpenBSD: db_interface.c,v 1.33 2003/12/21 13:23:32 miod Exp $	*/
 /*
  * Mach Operating System
  * Copyright (c) 1993-1991 Carnegie Mellon University
@@ -355,7 +355,7 @@ void
 m88k_db_registers(addr, have_addr, count, modif)
 	db_expr_t addr;
 	int have_addr;
-	int count;
+	db_expr_t count;
 	char *modif;
 {
 	m88k_db_print_frame((db_expr_t)DDB_REGS, TRUE, 0, modif);
diff --git a/sys/arch/mvme88k/ddb/db_sstep.c b/sys/arch/mvme88k/ddb/db_sstep.c
index 3b8e79eea37..5b1563ffb3d 100644
--- a/sys/arch/mvme88k/ddb/db_sstep.c
+++ b/sys/arch/mvme88k/ddb/db_sstep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: db_sstep.c,v 1.12 2003/10/11 22:08:57 miod Exp $	*/
+/*	$OpenBSD: db_sstep.c,v 1.13 2003/12/21 13:23:32 miod Exp $	*/
 /*
  * Mach Operating System
  * Copyright (c) 1993-1991 Carnegie Mellon University
@@ -268,7 +268,7 @@ branch_taken(inst, pc, func, func_data)
  *              frame. Only makes sense for general registers.
  */
 
-register_t
+db_expr_t
 getreg_val(frame, regno)
 	db_regs_t *frame;
 	int regno;
@@ -277,10 +277,8 @@ getreg_val(frame, regno)
 		return 0;
 	else if (regno < 31)
 		return frame->r[regno];
-	else {
+	else
 		panic("bad register number (%d) to getreg_val.", regno);
-		return 0;/*to make compiler happy */
-	}
 }
 
 #ifdef INTERNAL_SSTEP
diff --git a/sys/arch/mvme88k/ddb/db_trace.c b/sys/arch/mvme88k/ddb/db_trace.c
index 2f184b9e42d..925b883ac43 100644
--- a/sys/arch/mvme88k/ddb/db_trace.c
+++ b/sys/arch/mvme88k/ddb/db_trace.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: db_trace.c,v 1.20 2003/12/19 22:30:17 miod Exp $	*/
+/*	$OpenBSD: db_trace.c,v 1.21 2003/12/21 13:23:32 miod Exp $	*/
 /*
  * Mach Operating System
  * Copyright (c) 1993-1991 Carnegie Mellon University
@@ -559,13 +559,13 @@ static int next_address_likely_wrong = 0;
  *
  */
 static int
-stack_decode(unsigned addr, unsigned *stack, int (*pr)(const char *, ...))
+stack_decode(db_addr_t addr, unsigned *stack, int (*pr)(const char *, ...))
 {
 	db_sym_t proc;
-	unsigned offset_from_proc;
+	db_expr_t offset_from_proc;
 	unsigned instructions_to_search;
-	unsigned check_addr;
-	unsigned function_addr;	    /* start of function */
+	db_addr_t check_addr;
+	db_addr_t function_addr;    /* start of function */
 	unsigned r31 = *stack;	    /* the r31 of the function */
 	unsigned inst;		    /* text of an instruction */
 	unsigned ret_addr;	    /* address to which we return */