Quiet warnings on Alpha. (db_expr_t is a long on alpha, int on x86)

7 files changed, 26 insertions, 27 deletions

diff --git a/sys/ddb/db_command.c b/sys/ddb/db_command.c
index 6e0e932..e5a9f03 100644
--- a/sys/ddb/db_command.c
+++ b/sys/ddb/db_command.c
@@ -23,7 +23,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- *	$Id: db_command.c,v 1.30 1999/05/07 23:08:23 mckusick Exp $
+ *	$Id: db_command.c,v 1.31 1999/05/09 10:51:03 phk Exp $
  */
 
 /*
@@ -532,7 +532,7 @@ db_fncall(dummy1, dummy2, dummy3, dummy4)
 
 	retval = (*func)(args[0], args[1], args[2], args[3], args[4],
 			 args[5], args[6], args[7], args[8], args[9] );
-	db_printf("%#r\n", retval);
+	db_printf("%#lr\n", (long)retval);
 }
 
 /* Enter GDB remote protocol debugger on the next trap. */
diff --git a/sys/ddb/db_examine.c b/sys/ddb/db_examine.c
index 8e0e1db..190c107 100644
--- a/sys/ddb/db_examine.c
+++ b/sys/ddb/db_examine.c
@@ -23,7 +23,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- *	$Id: db_examine.c,v 1.24 1998/07/08 10:53:47 bde Exp $
+ *	$Id: db_examine.c,v 1.25 1999/05/13 06:07:43 bde Exp $
  */
 
 /*
@@ -122,40 +122,40 @@ db_examine(addr, fmt, count)
 			    case 'r':	/* signed, current radix */
 				value = db_get_value(addr, size, TRUE);
 				addr += size;
-				db_printf("%+-*r", width, value);
+				db_printf("%+-*lr", width, (long)value);
 				break;
 			    case 'x':	/* unsigned hex */
 				value = db_get_value(addr, size, FALSE);
 				addr += size;
-				db_printf("%-*x", width, value);
+				db_printf("%-*lx", width, (long)value);
 				break;
 			    case 'z':	/* signed hex */
 				value = db_get_value(addr, size, TRUE);
 				addr += size;
-				db_printf("%-*z", width, value);
+				db_printf("%-*lz", width, (long)value);
 				break;
 			    case 'd':	/* signed decimal */
 				value = db_get_value(addr, size, TRUE);
 				addr += size;
-				db_printf("%-*d", width, value);
+				db_printf("%-*ld", width, (long)value);
 				break;
 			    case 'u':	/* unsigned decimal */
 				value = db_get_value(addr, size, FALSE);
 				addr += size;
-				db_printf("%-*u", width, value);
+				db_printf("%-*lu", width, (long)value);
 				break;
 			    case 'o':	/* unsigned octal */
 				value = db_get_value(addr, size, FALSE);
 				addr += size;
-				db_printf("%-*o", width, value);
+				db_printf("%-*lo", width, (long)value);
 				break;
 			    case 'c':	/* character */
 				value = db_get_value(addr, 1, FALSE);
 				addr += 1;
 				if (value >= ' ' && value <= '~')
-				    db_printf("%c", value);
+				    db_printf("%c", (int)value);
 				else
-				    db_printf("\\%03o", value);
+				    db_printf("\\%03o", (int)value);
 				break;
 			    case 's':	/* null-terminated string */
 				for (;;) {
@@ -164,9 +164,9 @@ db_examine(addr, fmt, count)
 				    if (value == 0)
 					break;
 				    if (value >= ' ' && value <= '~')
-					db_printf("%c", value);
+					db_printf("%c", (int)value);
 				    else
-					db_printf("\\%03o", value);
+					db_printf("\\%03o", (int)value);
 				}
 				break;
 			    case 'i':	/* instruction */
@@ -230,9 +230,9 @@ db_print_cmd(addr, have_addr, count, modif)
 	    case 'c':
 		value = addr & 0xFF;
 		if (value >= ' ' && value <= '~')
-		    db_printf("%c", value);
+		    db_printf("%c", (int)value);
 		else
-		    db_printf("\\%03o", value);
+		    db_printf("\\%03o", (int)value);
 		break;
 	}
 	db_printf("\n");
diff --git a/sys/ddb/db_print.c b/sys/ddb/db_print.c
index 218be1e..a02f992 100644
--- a/sys/ddb/db_print.c
+++ b/sys/ddb/db_print.c
@@ -23,7 +23,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- *	$Id: db_print.c,v 1.23 1998/07/08 10:53:49 bde Exp $
+ *	$Id: db_print.c,v 1.24 1999/01/27 23:45:37 dillon Exp $
  */
 
 /*
@@ -59,7 +59,7 @@ db_show_regs(dummy1, dummy2, dummy3, dummy4)
 		offset != value) {
 		db_printf("\t%s", name);
 		if (offset != 0)
-		    db_printf("+%+#r", offset);
+		    db_printf("+%+#lr", (long)offset);
 	    }
 	    db_printf("\n");
 	}
diff --git a/sys/ddb/db_run.c b/sys/ddb/db_run.c
index 5288546..3d16d13 100644
--- a/sys/ddb/db_run.c
+++ b/sys/ddb/db_run.c
@@ -23,7 +23,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- *	$Id: db_run.c,v 1.15 1998/06/28 00:52:50 dfr Exp $
+ *	$Id: db_run.c,v 1.16 1998/07/05 10:12:18 dfr Exp $
  */
 
 /*
@@ -286,7 +286,6 @@ void
 db_clear_single_step(regs)
 	db_regs_t *regs;
 {
-	register db_breakpoint_t	bkpt;
 
 	if (db_not_taken_bkpt != 0) {
 	    db_delete_temp_breakpoint(db_not_taken_bkpt);
diff --git a/sys/ddb/db_sym.c b/sys/ddb/db_sym.c
index c791c3b..293f3ec 100644
--- a/sys/ddb/db_sym.c
+++ b/sys/ddb/db_sym.c
@@ -23,7 +23,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- *	$Id: db_sym.c,v 1.29 1999/01/27 23:45:37 dillon Exp $
+ *	$Id: db_sym.c,v 1.30 1999/02/12 12:44:19 bde Exp $
  */
 
 /*
@@ -310,7 +310,7 @@ db_printsym(off, strategy)
 	}
 	db_printf("%s", name);
 	if (d)
-		db_printf("+%+#r", d);
+		db_printf("+%+#lr", (long)d);
 	if (strategy == DB_STGY_PROC) {
 		if (db_line_at_pc(cursym, &filename, &linenum, off))
 			db_printf(" [%s:%d]", filename, linenum);
diff --git a/sys/ddb/db_watch.c b/sys/ddb/db_watch.c
index 7769341..f853620 100644
--- a/sys/ddb/db_watch.c
+++ b/sys/ddb/db_watch.c
@@ -23,7 +23,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- *	$Id: db_watch.c,v 1.16 1998/02/13 02:19:29 bde Exp $
+ *	$Id: db_watch.c,v 1.17 1998/07/08 06:43:57 bde Exp $
  */
 
 /*
@@ -174,10 +174,10 @@ db_list_watchpoints()
 	for (watch = db_watchpoint_list;
 	     watch != 0;
 	     watch = watch->link)
-	    db_printf("%s%8p  %8x  %x\n",
+	    db_printf("%s%8p  %8lx  %lx\n",
 		      db_map_current(watch->map) ? "*" : " ",
-		      (void *)watch->map, watch->loaddr,
-		      watch->hiaddr - watch->loaddr);
+		      (void *)watch->map, (long)watch->loaddr,
+		      (long)watch->hiaddr - (long)watch->loaddr);
 }
 
 /* Delete watchpoint */
diff --git a/sys/ddb/db_write_cmd.c b/sys/ddb/db_write_cmd.c
index 26ae37b..d745100 100644
--- a/sys/ddb/db_write_cmd.c
+++ b/sys/ddb/db_write_cmd.c
@@ -23,7 +23,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- *	$Id: db_write_cmd.c,v 1.10 1997/06/14 11:52:37 bde Exp $
+ *	$Id: db_write_cmd.c,v 1.11 1998/07/08 10:53:52 bde Exp $
  */
 
 /*
@@ -78,7 +78,7 @@ db_write_cmd(address, have_addr, count, modif)
 	while (db_expression(&new_value)) {
 	    old_value = db_get_value(addr, size, FALSE);
 	    db_printsym(addr, DB_STGY_ANY);
-	    db_printf("\t\t%#8r\t=\t%#8r\n", old_value, new_value);
+	    db_printf("\t\t%#8lr\t=\t%#8lr\n", (long)old_value,(long)new_value);
 	    db_put_value(addr, size, new_value);
 	    addr += size;