Fixed bogus type of valuep in struct db_variable. It was `int *' and

became `long *' for alpha, but should always have been `db_expr_t *'.
Fixed variable types to match.

8 files changed, 23 insertions, 22 deletions

diff --git a/sys/ddb/db_lex.c b/sys/ddb/db_lex.c
index f8fb26c..e66d43d 100644
--- a/sys/ddb/db_lex.c
+++ b/sys/ddb/db_lex.c
@@ -23,7 +23,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- *	$Id: db_lex.c,v 1.15 1998/06/07 17:09:37 dfr Exp $
+ *	$Id: db_lex.c,v 1.16 1998/06/27 15:40:56 dfr Exp $
  */
 
 /*
@@ -114,10 +114,10 @@ db_read_token()
 	return (t);
 }
 
-long	db_tok_number;
+db_expr_t	db_tok_number;
 char	db_tok_string[TOK_STRING_SIZE];
 
-long	db_radix = 16;
+db_expr_t	db_radix = 16;
 
 void
 db_flush_lex()
diff --git a/sys/ddb/db_lex.h b/sys/ddb/db_lex.h
index 68d6735..726eaa4 100644
--- a/sys/ddb/db_lex.h
+++ b/sys/ddb/db_lex.h
@@ -23,7 +23,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- *	$Id: db_lex.h,v 1.9 1997/02/22 09:28:25 peter Exp $
+ *	$Id: db_lex.h,v 1.10 1998/06/27 15:40:56 dfr Exp $
  */
 
 #ifndef _DDB_DB_LEX_H_
@@ -41,7 +41,7 @@ int	db_read_line __P((void));
 int	db_read_token __P((void));
 void	db_unread_token __P((int t));
 
-extern long	db_tok_number;
+extern db_expr_t	db_tok_number;
 #define	TOK_STRING_SIZE		120
 extern char	db_tok_string[TOK_STRING_SIZE];
 
diff --git a/sys/ddb/db_output.c b/sys/ddb/db_output.c
index 6aef208..4959154 100644
--- a/sys/ddb/db_output.c
+++ b/sys/ddb/db_output.c
@@ -23,7 +23,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- *	$Id: db_output.c,v 1.22 1997/04/01 14:31:06 bde Exp $
+ *	$Id: db_output.c,v 1.23 1998/06/07 17:09:37 dfr Exp $
  */
 
 /*
@@ -58,10 +58,10 @@
  */
 static int	db_output_position = 0;		/* output column */
 static int	db_last_non_space = 0;		/* last non-space character */
-long	db_tab_stop_width = 8;		/* how wide are tab stops? */
+db_expr_t	db_tab_stop_width = 8;		/* how wide are tab stops? */
 #define	NEXT_TAB(i) \
 	((((i) + db_tab_stop_width) / db_tab_stop_width) * db_tab_stop_width)
-long	db_max_width = 79;		/* output line width */
+db_expr_t	db_max_width = 79;		/* output line width */
 
 static void db_putchar __P((int c, void *arg));
 
diff --git a/sys/ddb/db_print.c b/sys/ddb/db_print.c
index 2e2bcde..86e95b6 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.20 1998/06/10 10:56:11 dfr Exp $
+ *	$Id: db_print.c,v 1.21 1998/07/08 06:43:54 bde Exp $
  */
 
 /*
@@ -55,7 +55,8 @@ db_show_regs(dummy1, dummy2, dummy3, dummy4)
 	    db_read_variable(regp, &value);
 	    db_printf("%-12s%#10ln", regp->name, (unsigned long)value);
 	    db_find_xtrn_sym_and_offset((db_addr_t)value, &name, &offset);
-	    if (name != 0 && offset <= db_maxoff && offset != value) {
+	    if (name != 0 && offset <= (unsigned long)db_maxoff &&
+		offset != value) {
 		db_printf("\t%s", name);
 		if (offset != 0)
 		    db_printf("+%+#n", offset);
diff --git a/sys/ddb/db_sym.c b/sys/ddb/db_sym.c
index 4f313e9..3b1dd2e 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.23 1998/06/28 00:55:00 dfr Exp $
+ *	$Id: db_sym.c,v 1.24 1998/07/08 06:43:56 bde Exp $
  */
 
 /*
@@ -281,7 +281,7 @@ db_symbol_values(sym, namep, valuep)
  * not accept symbols whose value is "small" (and use plain hex).
  */
 
-unsigned long	db_maxoff = 0x10000;
+db_expr_t	db_maxoff = 0x10000;
 
 void
 db_printsym(off, strategy)
@@ -303,7 +303,7 @@ db_printsym(off, strategy)
 		db_printf("%+#ln", (long)off);
 		return;
 	}
-	if (name == 0 || d >= db_maxoff) {
+	if (name == 0 || d >= (unsigned long)db_maxoff) {
 		db_printf("%#ln", (unsigned long)off);
 		return;
 	}
diff --git a/sys/ddb/db_variables.c b/sys/ddb/db_variables.c
index 74a45bb..7cd6ee4 100644
--- a/sys/ddb/db_variables.c
+++ b/sys/ddb/db_variables.c
@@ -23,7 +23,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- *	$Id: db_variables.c,v 1.14 1997/06/14 11:52:37 bde Exp $
+ *	$Id: db_variables.c,v 1.15 1998/06/07 17:09:38 dfr Exp $
  */
 
 /*
@@ -46,7 +46,7 @@ static int	db_set_variable __P((db_expr_t value));
 
 static struct db_variable db_vars[] = {
 	{ "radix",	&db_radix, FCN_NULL },
-	{ "maxoff",	(long *)&db_maxoff, FCN_NULL },
+	{ "maxoff",	&db_maxoff, FCN_NULL },
 	{ "maxwidth",	&db_max_width, FCN_NULL },
 	{ "tabstops",	&db_tab_stop_width, FCN_NULL },
 };
diff --git a/sys/ddb/db_variables.h b/sys/ddb/db_variables.h
index 1359f01..20d3338 100644
--- a/sys/ddb/db_variables.h
+++ b/sys/ddb/db_variables.h
@@ -23,7 +23,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- *	$Id: db_variables.h,v 1.8 1997/06/30 23:54:50 bde Exp $
+ *	$Id: db_variables.h,v 1.9 1998/06/07 17:09:38 dfr Exp $
  */
 
 /*
@@ -42,7 +42,7 @@ typedef	int	db_varfcn_t __P((struct db_variable *vp, db_expr_t *valuep,
 				 int op));
 struct db_variable {
 	char	*name;		/* Name of variable */
-	long	*valuep;	/* value of variable */
+	db_expr_t *valuep;	/* value of variable */
 				/* function to call when reading/writing */
 	db_varfcn_t *fcn;
 #define DB_VAR_GET	0
diff --git a/sys/ddb/ddb.h b/sys/ddb/ddb.h
index 01ef378..753dca9 100644
--- a/sys/ddb/ddb.h
+++ b/sys/ddb/ddb.h
@@ -27,7 +27,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: ddb.h,v 1.17 1998/05/19 18:42:09 phk Exp $
+ *	$Id: ddb.h,v 1.18 1998/06/07 17:09:38 dfr Exp $
  */
 
 /*
@@ -66,14 +66,14 @@ func_name(addr, have_addr, count, modif)			\
 	char *modif;
 
 extern char *esym;
-extern unsigned long db_maxoff;
+extern db_expr_t db_maxoff;
 extern int db_indent;
 extern int db_inst_count;
 extern int db_load_count;
 extern int db_store_count;
-extern long db_radix;
-extern long db_max_width;
-extern long db_tab_stop_width;
+extern db_expr_t db_radix;
+extern db_expr_t db_max_width;
+extern db_expr_t db_tab_stop_width;
 
 struct vm_map;