libmach, acid, db: 64-bit support

5 files changed, 9 insertions, 8 deletions

diff --git a/src/cmd/db/defs.h b/src/cmd/db/defs.h
index 63fde3ba..7929cc63 100644
--- a/src/cmd/db/defs.h
+++ b/src/cmd/db/defs.h
@@ -11,7 +11,7 @@
 #include <mach.h>
 
 typedef long WORD;
-typedef ulong ADDR;
+typedef u64int ADDR;
 
 #define	HUGEINT	0x7fffffff	/* enormous WORD */
 
diff --git a/src/cmd/db/expr.c b/src/cmd/db/expr.c
index 8d33e7f4..74c9319a 100644
--- a/src/cmd/db/expr.c
+++ b/src/cmd/db/expr.c
@@ -166,7 +166,7 @@ item(int a)
 {	/* name [ . local ] | number | . | ^  | <register | 'x | | */
 	char	*base;
 	char	savc;
-	ulong u;
+	u64int u;
 	Symbol s;
 	char gsym[MAXSYM], lsym[MAXSYM];
 
@@ -388,7 +388,7 @@ dbround(long a, long b)
 ulong
 dbrget(Map *map, char *name)
 {
-	ulong u;
+	u64int u;
 
 	USED(map);
 	if(rget(correg, name, &u) < 0)
diff --git a/src/cmd/db/print.c b/src/cmd/db/print.c
index 05096a76..3f1a5805 100644
--- a/src/cmd/db/print.c
+++ b/src/cmd/db/print.c
@@ -22,7 +22,7 @@ static void	printfp(Map*, int);
  *	callback on stack trace
  */
 static int
-ptrace(Map *map, Regs *regs, ulong pc, ulong nextpc, Symbol *sym, int depth)
+ptrace(Map *map, Regs *regs, u64int pc, u64int nextpc, Symbol *sym, int depth)
 {
 	char buf[512];
 
@@ -48,7 +48,7 @@ ptrace(Map *map, Regs *regs, ulong pc, ulong nextpc, Symbol *sym, int depth)
 static ulong *adrregvals;
 
 static int
-adrrw(Regs *regs, char *name, ulong *val, int isr)
+adrrw(Regs *regs, char *name, u64int *val, int isr)
 {
 	int i;
 
@@ -215,6 +215,7 @@ printdollar(int modif)
 	default:
 		error("bad `$' command");
 	}
+	USED(r);
 
 }
 
@@ -359,7 +360,7 @@ void
 printpc(void)
 {
 	char buf[512];
-	ulong u;
+	u64int u;
 
 	if(rget(correg, mach->pc, &u) < 0)
 		error("%r");
diff --git a/src/cmd/db/regs.c b/src/cmd/db/regs.c
index 4a9a4426..370fb997 100644
--- a/src/cmd/db/regs.c
+++ b/src/cmd/db/regs.c
@@ -13,7 +13,7 @@ printregs(int c)
 {
 	Regdesc *rp;
 	int i;
-	ulong u;
+	ADDR u;
 
 	if(correg == nil){
 		dprint("registers not mapped\n");
diff --git a/src/cmd/db/trcrun.c b/src/cmd/db/trcrun.c
index 807f902e..0168bcf4 100644
--- a/src/cmd/db/trcrun.c
+++ b/src/cmd/db/trcrun.c
@@ -208,7 +208,7 @@ void
 runstep(ulong loc, int keepnote)
 {
 	int nfoll;
-	ulong foll[3];
+	ADDR foll[3];
 	BKPT bkpt[3];
 	int i;