From: niklas <niklas@openbsd.org>
Date: Fri, 21 Mar 1997 02:10:42 +0000 (+0000)
Subject: Yet more DDB type correctness
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=ec4d28f628f7d4f423a5963b413e4dfc97a8b7b6;p=openbsd

Yet more DDB type correctness
---

diff --git a/sys/arch/i386/i386/db_trace.c b/sys/arch/i386/i386/db_trace.c
index 2a4acc02337..d841bec0513 100644
--- a/sys/arch/i386/i386/db_trace.c
+++ b/sys/arch/i386/i386/db_trace.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: db_trace.c,v 1.3 1996/05/07 07:21:35 deraadt Exp $	*/
+/*	$OpenBSD: db_trace.c,v 1.4 1997/03/21 02:10:42 niklas Exp $	*/
 /*	$NetBSD: db_trace.c,v 1.18 1996/05/03 19:42:01 christos Exp $	*/
 
 /* 
@@ -43,20 +43,20 @@
  * Machine register set.
  */
 struct db_variable db_regs[] = {
-	{ "es",		&ddb_regs.tf_es,     FCN_NULL },
-	{ "ds",		&ddb_regs.tf_ds,     FCN_NULL },
-	{ "edi",	&ddb_regs.tf_edi,    FCN_NULL },
-	{ "esi",	&ddb_regs.tf_esi,    FCN_NULL },
-	{ "ebp",	&ddb_regs.tf_ebp,    FCN_NULL },
-	{ "ebx",	&ddb_regs.tf_ebx,    FCN_NULL },
-	{ "edx",	&ddb_regs.tf_edx,    FCN_NULL },
-	{ "ecx",	&ddb_regs.tf_ecx,    FCN_NULL },
-	{ "eax",	&ddb_regs.tf_eax,    FCN_NULL },
-	{ "eip",	&ddb_regs.tf_eip,    FCN_NULL },
-	{ "cs",		&ddb_regs.tf_cs,     FCN_NULL },
-	{ "eflags",	&ddb_regs.tf_eflags, FCN_NULL },
-	{ "esp",	&ddb_regs.tf_esp,    FCN_NULL },
-	{ "ss",		&ddb_regs.tf_ss,     FCN_NULL },
+	{ "es",		(long *)&ddb_regs.tf_es,     FCN_NULL },
+	{ "ds",		(long *)&ddb_regs.tf_ds,     FCN_NULL },
+	{ "edi",	(long *)&ddb_regs.tf_edi,    FCN_NULL },
+	{ "esi",	(long *)&ddb_regs.tf_esi,    FCN_NULL },
+	{ "ebp",	(long *)&ddb_regs.tf_ebp,    FCN_NULL },
+	{ "ebx",	(long *)&ddb_regs.tf_ebx,    FCN_NULL },
+	{ "edx",	(long *)&ddb_regs.tf_edx,    FCN_NULL },
+	{ "ecx",	(long *)&ddb_regs.tf_ecx,    FCN_NULL },
+	{ "eax",	(long *)&ddb_regs.tf_eax,    FCN_NULL },
+	{ "eip",	(long *)&ddb_regs.tf_eip,    FCN_NULL },
+	{ "cs",		(long *)&ddb_regs.tf_cs,     FCN_NULL },
+	{ "eflags",	(long *)&ddb_regs.tf_eflags, FCN_NULL },
+	{ "esp",	(long *)&ddb_regs.tf_esp,    FCN_NULL },
+	{ "ss",		(long *)&ddb_regs.tf_ss,     FCN_NULL },
 };
 struct db_variable *db_eregs = db_regs + sizeof(db_regs)/sizeof(db_regs[0]);
 
diff --git a/sys/arch/mvme88k/ddb/db_trace.c b/sys/arch/mvme88k/ddb/db_trace.c
index 9af1296fda6..8bac2cca018 100644
--- a/sys/arch/mvme88k/ddb/db_trace.c
+++ b/sys/arch/mvme88k/ddb/db_trace.c
@@ -146,7 +146,7 @@ db_setf_regs(
 	*regp = *valuep;
 }
 
-#define N(s, x)  {s, (int *)&(((db_regs_t *) 0)->x), db_setf_regs}
+#define N(s, x)  {s, (long *)&(((db_regs_t *) 0)->x), db_setf_regs}
 
 struct db_variable db_regs[] = {
     N("r1", r[1]),     N("r2", r[2]), 	 N("r3", r[3]),	   N("r4", r[4]),
diff --git a/sys/arch/pc532/pc532/db_trace.c b/sys/arch/pc532/pc532/db_trace.c
index 3d32b0df2d1..321adf3e793 100644
--- a/sys/arch/pc532/pc532/db_trace.c
+++ b/sys/arch/pc532/pc532/db_trace.c
@@ -54,45 +54,45 @@ int db_ns532_kreg_value();
  * Machine register set.
  */
 struct db_variable db_regs[] = {
-	{ "r0",	(int *)&ddb_regs.r0,  db_ns532_reg_value },
-	{ "r1",	(int *)&ddb_regs.r1,  db_ns532_reg_value },
-	{ "r2",	(int *)&ddb_regs.r2,  db_ns532_reg_value },
-	{ "r3",	(int *)&ddb_regs.r3,  db_ns532_reg_value },
-	{ "r4",	(int *)&ddb_regs.r4,  db_ns532_reg_value },
-	{ "r5",	(int *)&ddb_regs.r5,  db_ns532_reg_value },
-	{ "r6",	(int *)&ddb_regs.r6,  db_ns532_reg_value },
-	{ "r7",	(int *)&ddb_regs.r7,  db_ns532_reg_value },
-	{ "sp",	(int *)&ddb_regs.usp, db_ns532_reg_value },
-	{ "fp",	(int *)&ddb_regs.fp,  db_ns532_reg_value },
-	{ "sb", (int *)&ddb_regs.sb,  db_ns532_reg_value },
-	{ "pc", (int *)&ddb_regs.pc,  db_ns532_reg_value },
-	{ "psr",(int *)&ddb_regs.psr, db_ns532_reg_value },
-	{ "tear",(int *)&ddb_regs.tear,db_ns532_reg_value },
-	{ "msr",(int *)&ddb_regs.msr, db_ns532_reg_value },
-	{ "ipl",(int *)&db_active_ipl,db_ns532_reg_value },
+	{ "r0",	(long *)&ddb_regs.r0,  db_ns532_reg_value },
+	{ "r1",	(long *)&ddb_regs.r1,  db_ns532_reg_value },
+	{ "r2",	(long *)&ddb_regs.r2,  db_ns532_reg_value },
+	{ "r3",	(long *)&ddb_regs.r3,  db_ns532_reg_value },
+	{ "r4",	(long *)&ddb_regs.r4,  db_ns532_reg_value },
+	{ "r5",	(long *)&ddb_regs.r5,  db_ns532_reg_value },
+	{ "r6",	(long *)&ddb_regs.r6,  db_ns532_reg_value },
+	{ "r7",	(long *)&ddb_regs.r7,  db_ns532_reg_value },
+	{ "sp",	(long *)&ddb_regs.usp, db_ns532_reg_value },
+	{ "fp",	(long *)&ddb_regs.fp,  db_ns532_reg_value },
+	{ "sb", (long *)&ddb_regs.sb,  db_ns532_reg_value },
+	{ "pc", (long *)&ddb_regs.pc,  db_ns532_reg_value },
+	{ "psr",(long *)&ddb_regs.psr, db_ns532_reg_value },
+	{ "tear",(long *)&ddb_regs.tear,db_ns532_reg_value },
+	{ "msr",(long *)&ddb_regs.msr, db_ns532_reg_value },
+	{ "ipl",(long *)&db_active_ipl,db_ns532_reg_value },
 #ifdef FLOATS_SAVED
-	{ "f0",	(int *)&ddb_regs.l0a, db_ns532_reg_value },
-	{ "f1",	(int *)&ddb_regs.l0b, db_ns532_reg_value },
-	{ "f2",	(int *)&ddb_regs.l1a, db_ns532_reg_value },
-	{ "f3",	(int *)&ddb_regs.l1b, db_ns532_reg_value },
-	{ "f4",	(int *)&ddb_regs.l2a, db_ns532_reg_value },
-	{ "f5",	(int *)&ddb_regs.l2b, db_ns532_reg_value },
-	{ "f6",	(int *)&ddb_regs.l3a, db_ns532_reg_value },
-	{ "f7",	(int *)&ddb_regs.l3b, db_ns532_reg_value },
-	{ "fsr",(int *)&ddb_regs.fsr, db_ns532_reg_value },
+	{ "f0",	(long *)&ddb_regs.l0a, db_ns532_reg_value },
+	{ "f1",	(long *)&ddb_regs.l0b, db_ns532_reg_value },
+	{ "f2",	(long *)&ddb_regs.l1a, db_ns532_reg_value },
+	{ "f3",	(long *)&ddb_regs.l1b, db_ns532_reg_value },
+	{ "f4",	(long *)&ddb_regs.l2a, db_ns532_reg_value },
+	{ "f5",	(long *)&ddb_regs.l2b, db_ns532_reg_value },
+	{ "f6",	(long *)&ddb_regs.l3a, db_ns532_reg_value },
+	{ "f7",	(long *)&ddb_regs.l3b, db_ns532_reg_value },
+	{ "fsr",(long *)&ddb_regs.fsr, db_ns532_reg_value },
 #endif FLOATS_SAVED
-	{ "ksp",	(int *) 0,	db_spec_regs },
-	{ "intbase",	(int *) 0,	db_spec_regs },
-	{ "ptb",	(int *) 0,	db_spec_regs },
-	{ "ivar",	(int *) 0,	db_spec_regs },
-	{ "rtear", 	(int *) 0,	db_spec_regs }, /* current reg value */
-	{ "mcr",	(int *) 0,	db_spec_regs },
-	{ "rmsr",	(int *) 0,	db_spec_regs }, /* current reg value */
-	{ "dcr",	(int *) 0,	db_spec_regs },
-	{ "dsr",	(int *) 0,	db_spec_regs },
-	{ "car",	(int *) 0,	db_spec_regs },
-	{ "bpc",	(int *) 0,	db_spec_regs },
-	{ "cfg",	(int *) 0,	db_spec_regs }
+	{ "ksp",	(long *) 0,	db_spec_regs },
+	{ "intbase",	(long *) 0,	db_spec_regs },
+	{ "ptb",	(long *) 0,	db_spec_regs },
+	{ "ivar",	(long *) 0,	db_spec_regs },
+	{ "rtear", 	(long *) 0,	db_spec_regs }, /* current reg value */
+	{ "mcr",	(long *) 0,	db_spec_regs },
+	{ "rmsr",	(long *) 0,	db_spec_regs }, /* current reg value */
+	{ "dcr",	(long *) 0,	db_spec_regs },
+	{ "dsr",	(long *) 0,	db_spec_regs },
+	{ "car",	(long *) 0,	db_spec_regs },
+	{ "bpc",	(long *) 0,	db_spec_regs },
+	{ "cfg",	(long *) 0,	db_spec_regs }
 };
 struct db_variable *db_eregs = db_regs + sizeof(db_regs)/sizeof(db_regs[0]);
 
diff --git a/sys/arch/powerpc/powerpc/db_trace.c b/sys/arch/powerpc/powerpc/db_trace.c
index 08d42b6af01..624af3db705 100644
--- a/sys/arch/powerpc/powerpc/db_trace.c
+++ b/sys/arch/powerpc/powerpc/db_trace.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: db_trace.c,v 1.2 1996/12/28 06:21:53 rahnds Exp $	*/
+/*	$OpenBSD: db_trace.c,v 1.3 1997/03/21 02:10:48 niklas Exp $	*/
 /*	$NetBSD: db_trace.c,v 1.15 1996/02/22 23:23:41 gwr Exp $	*/
 
 /* 
@@ -37,39 +37,39 @@
 #include <ddb/db_variables.h>
 
 struct db_variable db_regs[] = { 
-	{ "r1",  (int *) &ddb_regs.r1,	FCN_NULL },
-	{ "r2",  (int *) &ddb_regs.r2,	FCN_NULL },
-	{ "r3",  (int *) &ddb_regs.r3,	FCN_NULL },
-	{ "r4",  (int *) &ddb_regs.r4,	FCN_NULL },
-	{ "r5",  (int *) &ddb_regs.r5,	FCN_NULL },
-	{ "r6",  (int *) &ddb_regs.r6,	FCN_NULL },
-	{ "r7",  (int *) &ddb_regs.r7,	FCN_NULL },
-	{ "r8",  (int *) &ddb_regs.r8,	FCN_NULL },
-	{ "r9",  (int *) &ddb_regs.r9,	FCN_NULL },
-	{ "r10", (int *) &ddb_regs.r10,	FCN_NULL },
-	{ "r11", (int *) &ddb_regs.r11,	FCN_NULL },
-	{ "r12", (int *) &ddb_regs.r12,	FCN_NULL },
-	{ "r13", (int *) &ddb_regs.r13,	FCN_NULL },
-	{ "r14", (int *) &ddb_regs.r13,	FCN_NULL },
-	{ "r15", (int *) &ddb_regs.r13,	FCN_NULL },
-	{ "r16", (int *) &ddb_regs.r13,	FCN_NULL },
-	{ "r17", (int *) &ddb_regs.r17,	FCN_NULL },
-	{ "r18", (int *) &ddb_regs.r18,	FCN_NULL },
-	{ "r19", (int *) &ddb_regs.r19,	FCN_NULL },
-	{ "r20", (int *) &ddb_regs.r20,	FCN_NULL },
-	{ "r21", (int *) &ddb_regs.r21,	FCN_NULL },
-	{ "r22", (int *) &ddb_regs.r22,	FCN_NULL },
-	{ "r23", (int *) &ddb_regs.r23,	FCN_NULL },
-	{ "r24", (int *) &ddb_regs.r24,	FCN_NULL },
-	{ "r25", (int *) &ddb_regs.r25,	FCN_NULL },
-	{ "r26", (int *) &ddb_regs.r26,	FCN_NULL },
-	{ "r27", (int *) &ddb_regs.r27,	FCN_NULL },
-	{ "r28", (int *) &ddb_regs.r28,	FCN_NULL },
-	{ "r29", (int *) &ddb_regs.r29,	FCN_NULL },
-	{ "r30", (int *) &ddb_regs.r30,	FCN_NULL },
-	{ "r31", (int *) &ddb_regs.r31,	FCN_NULL },
-	{ "r32", (int *) &ddb_regs.r32,	FCN_NULL },
-	{ "iar", (int *) &ddb_regs.iar,	FCN_NULL },
+	{ "r1",  (long *)&ddb_regs.r1,	FCN_NULL },
+	{ "r2",  (long *)&ddb_regs.r2,	FCN_NULL },
+	{ "r3",  (long *)&ddb_regs.r3,	FCN_NULL },
+	{ "r4",  (long *)&ddb_regs.r4,	FCN_NULL },
+	{ "r5",  (long *)&ddb_regs.r5,	FCN_NULL },
+	{ "r6",  (long *)&ddb_regs.r6,	FCN_NULL },
+	{ "r7",  (long *)&ddb_regs.r7,	FCN_NULL },
+	{ "r8",  (long *)&ddb_regs.r8,	FCN_NULL },
+	{ "r9",  (long *)&ddb_regs.r9,	FCN_NULL },
+	{ "r10", (long *)&ddb_regs.r10,	FCN_NULL },
+	{ "r11", (long *)&ddb_regs.r11,	FCN_NULL },
+	{ "r12", (long *)&ddb_regs.r12,	FCN_NULL },
+	{ "r13", (long *)&ddb_regs.r13,	FCN_NULL },
+	{ "r14", (long *)&ddb_regs.r13,	FCN_NULL },
+	{ "r15", (long *)&ddb_regs.r13,	FCN_NULL },
+	{ "r16", (long *)&ddb_regs.r13,	FCN_NULL },
+	{ "r17", (long *)&ddb_regs.r17,	FCN_NULL },
+	{ "r18", (long *)&ddb_regs.r18,	FCN_NULL },
+	{ "r19", (long *)&ddb_regs.r19,	FCN_NULL },
+	{ "r20", (long *)&ddb_regs.r20,	FCN_NULL },
+	{ "r21", (long *)&ddb_regs.r21,	FCN_NULL },
+	{ "r22", (long *)&ddb_regs.r22,	FCN_NULL },
+	{ "r23", (long *)&ddb_regs.r23,	FCN_NULL },
+	{ "r24", (long *)&ddb_regs.r24,	FCN_NULL },
+	{ "r25", (long *)&ddb_regs.r25,	FCN_NULL },
+	{ "r26", (long *)&ddb_regs.r26,	FCN_NULL },
+	{ "r27", (long *)&ddb_regs.r27,	FCN_NULL },
+	{ "r28", (long *)&ddb_regs.r28,	FCN_NULL },
+	{ "r29", (long *)&ddb_regs.r29,	FCN_NULL },
+	{ "r30", (long *)&ddb_regs.r30,	FCN_NULL },
+	{ "r31", (long *)&ddb_regs.r31,	FCN_NULL },
+	{ "r32", (long *)&ddb_regs.r32,	FCN_NULL },
+	{ "iar", (long *)&ddb_regs.iar,	FCN_NULL },
 };
 struct db_variable *db_eregs = db_regs + sizeof(db_regs)/sizeof(db_regs[0]);
 
diff --git a/sys/arch/vax/vax/db_machdep.c b/sys/arch/vax/vax/db_machdep.c
index 932683e313e..f2e45d7fa7d 100644
--- a/sys/arch/vax/vax/db_machdep.c
+++ b/sys/arch/vax/vax/db_machdep.c
@@ -187,23 +187,23 @@ Debugger()
  * Machine register set.
  */
 struct db_variable db_regs[] = {
-	{"r0",	&ddb_regs.r0,	FCN_NULL},
-	{"r1",	&ddb_regs.r1,	FCN_NULL},
-	{"r2",	&ddb_regs.r2,	FCN_NULL},
-	{"r3",	&ddb_regs.r3,	FCN_NULL},
-	{"r4",	&ddb_regs.r4,	FCN_NULL},
-	{"r5",	&ddb_regs.r5,	FCN_NULL},
-	{"r6",	&ddb_regs.r6,	FCN_NULL},
-	{"r7",	&ddb_regs.r7,	FCN_NULL},
-	{"r8",	&ddb_regs.r8,	FCN_NULL},
-	{"r9",	&ddb_regs.r9,	FCN_NULL},
-	{"r10",	&ddb_regs.r10,	FCN_NULL},
-	{"r11",	&ddb_regs.r11,	FCN_NULL},
-	{"ap",	&ddb_regs.ap,	FCN_NULL},
-	{"fp",	&ddb_regs.fp,	FCN_NULL},
-	{"sp",	&ddb_regs.sp,	FCN_NULL},
-	{"pc",	&ddb_regs.pc,	FCN_NULL},
-	{"psl",	&ddb_regs.psl,	FCN_NULL},
+	{"r0",	(long *)&ddb_regs.r0,	FCN_NULL},
+	{"r1",	(long *)&ddb_regs.r1,	FCN_NULL},
+	{"r2",	(long *)&ddb_regs.r2,	FCN_NULL},
+	{"r3",	(long *)&ddb_regs.r3,	FCN_NULL},
+	{"r4",	(long *)&ddb_regs.r4,	FCN_NULL},
+	{"r5",	(long *)&ddb_regs.r5,	FCN_NULL},
+	{"r6",	(long *)&ddb_regs.r6,	FCN_NULL},
+	{"r7",	(long *)&ddb_regs.r7,	FCN_NULL},
+	{"r8",	(long *)&ddb_regs.r8,	FCN_NULL},
+	{"r9",	(long *)&ddb_regs.r9,	FCN_NULL},
+	{"r10",	(long *)&ddb_regs.r10,	FCN_NULL},
+	{"r11",	(long *)&ddb_regs.r11,	FCN_NULL},
+	{"ap",	(long *)&ddb_regs.ap,	FCN_NULL},
+	{"fp",	(long *)&ddb_regs.fp,	FCN_NULL},
+	{"sp",	(long *)&ddb_regs.sp,	FCN_NULL},
+	{"pc",	(long *)&ddb_regs.pc,	FCN_NULL},
+	{"psl",	(long *)&ddb_regs.psl,	FCN_NULL},
 };
 struct db_variable *db_eregs = db_regs + sizeof(db_regs)/sizeof(db_regs[0]);