merge

9 files changed, 15 insertions, 16 deletions

diff --git a/src/cmd/acid/acid.h b/src/cmd/acid/acid.h
index d83d7c09..5b1339fe 100644
--- a/src/cmd/acid/acid.h
+++ b/src/cmd/acid/acid.h
@@ -204,7 +204,7 @@ void	call(char*, Node*, Node*, Node*, Node*);
 void	catcher(void*, char*);
 void	checkqid(int, int);
 void	cmd(void);
-Node*	con(int);
+Node*	con(s64int);
 List*	construct(Node*);
 void	ctrace(int);
 void	decl(Node*);
@@ -217,12 +217,12 @@ Lsym*	enter(char*, int);
 void	error(char*, ...);
 void	execute(Node*);
 void	fatal(char*, ...);
-ulong	findframe(ulong);
+u64int	findframe(u64int);
 void	flatten(Node**, Node*);
 void	gc(void);
 char*	getstatus(int);
 void*	gmalloc(long);
-void	indir(Map*, ulong, char, Node*);
+void	indir(Map*, u64int, char, Node*);
 void	indirreg(Regs*, char*, char, Node*);
 void	initexpr(void);
 void	initprint(void);
@@ -251,7 +251,7 @@ void	pstr(String*);
 void	pushfd(int);
 void	pushfile(char*);
 void	pushstr(Node*);
-ulong	raddr(char*);
+u64int	raddr(char*);
 void	readtext(char*);
 void	readcore(void);
 void	restartio(void);
diff --git a/src/cmd/acid/builtin.c b/src/cmd/acid/builtin.c
index 1b09a4ef..ddc326a4 100644
--- a/src/cmd/acid/builtin.c
+++ b/src/cmd/acid/builtin.c
@@ -866,7 +866,7 @@ cvtatoi(Node *r, Node *args)
 
 	r->op = OCONST;
 	r->type = TINT;
-	r->store.u.ival = strtoul(res.store.u.string->string, 0, 0);
+	r->store.u.ival = strtoull(res.store.u.string->string, 0, 0);
 	r->store.fmt = 'D';
 }
 
@@ -875,7 +875,7 @@ cvtitoa(Node *r, Node *args)
 {
 	Node res;
 	Node *av[Maxarg];
-	int ival;
+	s64int ival;
 	char buf[128], *fmt;
 
 	if(args == 0)
@@ -1030,7 +1030,7 @@ flatten(Node **av, Node *n)
 static struct
 {
 	char *name;
-	ulong val;
+	u64int val;
 } sregs[Maxarg/2];
 static int nsregs;
 
diff --git a/src/cmd/acid/dbg.y b/src/cmd/acid/dbg.y
index 3d1886c7..ca3368fa 100644
--- a/src/cmd/acid/dbg.y
+++ b/src/cmd/acid/dbg.y
@@ -11,7 +11,7 @@
 {
 	Node	*node;
 	Lsym	*sym;
-	ulong	ival;
+	u64int	ival;
 	float	fval;
 	String	*string;
 }
diff --git a/src/cmd/acid/dot.c b/src/cmd/acid/dot.c
index 07b8c194..fd446492 100644
--- a/src/cmd/acid/dot.c
+++ b/src/cmd/acid/dot.c
@@ -28,7 +28,7 @@ odot(Node *n, Node *r)
 	char *s;
 	Type *t;
 	Node res;
-	ulong addr;
+	u64int addr;
 
 	s = n->sym->name;
 	if(s == 0)
diff --git a/src/cmd/acid/exec.c b/src/cmd/acid/exec.c
index b173ef3b..3864cd0a 100644
--- a/src/cmd/acid/exec.c
+++ b/src/cmd/acid/exec.c
@@ -203,7 +203,7 @@ convflt(Node *r, char *flt)
 }
 
 void
-indir(Map *m, ulong addr, char fmt, Node *r)
+indir(Map *m, u64int addr, char fmt, Node *r)
 {
 	int i;
 	u32int ival;
diff --git a/src/cmd/acid/expr.c b/src/cmd/acid/expr.c
index 5d81ac58..9d657b19 100644
--- a/src/cmd/acid/expr.c
+++ b/src/cmd/acid/expr.c
@@ -1114,9 +1114,8 @@ acidregsrw(Regs *r, char *name, u64int *u, int isr)
 		}
 		addr = v->store.u.ival;
 		/* XXX should use format to determine size */
-		if(get4(cormap, addr, &u32) < 0)
+		if(geta(cormap, addr, u) < 0)
 			return -1;
-		*u = u32;
 		return 0;
 	}
 }
diff --git a/src/cmd/acid/lex.c b/src/cmd/acid/lex.c
index 548b4262..19581eab 100644
--- a/src/cmd/acid/lex.c
+++ b/src/cmd/acid/lex.c
@@ -588,9 +588,9 @@ numsym(char first)
 		}
 
 		if(isbin)
-			yylval.ival = strtoul(symbol+2, 0, 2);
+			yylval.ival = strtoull(symbol+2, 0, 2);
 		else
-			yylval.ival = strtoul(symbol, 0, 0);
+			yylval.ival = strtoll(symbol, 0, 0);
 		return Tconst;
 	}
 
diff --git a/src/cmd/acid/main.c b/src/cmd/acid/main.c
index b63bfe2b..59ae90b1 100644
--- a/src/cmd/acid/main.c
+++ b/src/cmd/acid/main.c
@@ -365,7 +365,7 @@ al(int t)
 }
 
 Node*
-con(int v)
+con(s64int v)
 {
 	Node *n;
 
diff --git a/src/cmd/acid/util.c b/src/cmd/acid/util.c
index 7772bfdb..29db6d8b 100644
--- a/src/cmd/acid/util.c
+++ b/src/cmd/acid/util.c
@@ -73,7 +73,7 @@ addvarsym(Fhdr *fp)
 	Symbol s;
 	Lsym *l;
 	String *file;
-	ulong v;
+	u64int v;
 	char buf[65536];	/* Some of those C++ names are really big */
 	List *list, **tail, *tl;