20100427-1251

8 files changed, 20 insertions, 21 deletions

diff --git a/utils/acid/acid.h b/utils/acid/acid.h
index 68c8913d..cb88a554 100644
--- a/utils/acid/acid.h
+++ b/utils/acid/acid.h
@@ -240,7 +240,7 @@ int	remote_read(int, char*, int);
 int	remote_write(int, char*, int);
 int	remput(struct segment*, ulong, long, char*, int);
 void	restartio(void);
-vlong	rget(Map*, char*);
+uvlong	rget(Map*, char*);
 String	*runenode(Rune*);
 char*	runcmd(char*);
 int	scmp(String*, String*);
@@ -251,7 +251,7 @@ String*	stradd(String*, String*);
 String*	strnode(char*);
 String*	strnodlen(char*, int);
 char*	mysystem(void);
-void	trlist(Map*, ulong, ulong, Symbol*);
+void	trlist(Map*, uvlong, uvlong, Symbol*);
 void	unwind(void);
 void	userinit(void);
 void	varreg(void);
diff --git a/utils/acid/builtin.c b/utils/acid/builtin.c
index 2afc447b..56c4dceb 100644
--- a/utils/acid/builtin.c
+++ b/utils/acid/builtin.c
@@ -342,7 +342,7 @@ follow(Node *r, Node *args)
 {
 	int n, i;
 	Node res;
-	ulong f[10];
+	uvlong f[10];
 	List **tail, *l;
 
 	if(args == 0)
@@ -369,7 +369,7 @@ funcbound(Node *r, Node *args)
 {
 	int n;
 	Node res;
-	ulong bounds[2];
+	uvlong bounds[2];
 	List *l;
 
 	if(args == 0)
diff --git a/utils/acid/exec.c b/utils/acid/exec.c
index d110673b..f77eddc2 100644
--- a/utils/acid/exec.c
+++ b/utils/acid/exec.c
@@ -210,8 +210,8 @@ void
 indir(Map *m, ulong addr, char fmt, Node *r)
 {
 	int i;
-	long ival;
-	vlong vval;
+	ulong ival;
+	uvlong vval;
 	int ret;
 	uchar cval;
 	ushort sval;
diff --git a/utils/acid/expr.c b/utils/acid/expr.c
index da413742..4d3dcd94 100644
--- a/utils/acid/expr.c
+++ b/utils/acid/expr.c
@@ -153,7 +153,7 @@ oframe(Node *n, Node *res)
 {
 	char *p;
 	Node *lp;
-	long ival;
+	uvlong ival;
 	Frtype *f;
 
 	p = n->sym->name;
diff --git a/utils/acid/list.c b/utils/acid/list.c
index ced2f4d8..b85760ee 100644
--- a/utils/acid/list.c
+++ b/utils/acid/list.c
@@ -194,7 +194,7 @@ static List*
 listlocals(Map *map, Symbol *fn, ulong fp)
 {
 	int i;
-	long val;
+	uvlong val;
 	Symbol s;
 	List **tail, *l2;
 
@@ -208,7 +208,7 @@ listlocals(Map *map, Symbol *fn, ulong fp)
 		if(s.name[0] == '.')
 			continue;
 
-		if(get4(map, fp-s.value, &val) > 0) {
+		if(geta(map, fp-s.value, &val) > 0) {
 			*tail = listvar(s.name, val);
 			tail = &(*tail)->next;
 		}
@@ -221,7 +221,7 @@ listparams(Map *map, Symbol *fn, ulong fp)
 {
 	int i;
 	Symbol s;
-	long v;
+	uvlong v;
 	List **tail, *l2;
 
 	l2 = 0;
@@ -232,7 +232,7 @@ listparams(Map *map, Symbol *fn, ulong fp)
 		if (s.class != CPARAM)
 			continue;
 
-		if(get4(map, fp+s.value, &v) > 0) {
+		if(geta(map, fp+s.value, &v) > 0) {
 			*tail = listvar(s.name, v);
 			tail = &(*tail)->next;
 		}
@@ -241,7 +241,7 @@ listparams(Map *map, Symbol *fn, ulong fp)
 }
 
 void
-trlist(Map *map, ulong pc, ulong sp, Symbol *sym)
+trlist(Map *map, uvlong pc, uvlong sp, Symbol *sym)
 {
 	List *q, *l;
 
diff --git a/utils/acid/main.c b/utils/acid/main.c
index 5bd85f13..bf4ad240 100644
--- a/utils/acid/main.c
+++ b/utils/acid/main.c
@@ -196,8 +196,7 @@ main(int argc, char *argv[])
 
 		unwind();
 	}
-	Bputc(bout, '\n');
-	exits(0);
+	/* not reached */
 }
 
 static int
diff --git a/utils/acid/os-Plan9.c b/utils/acid/os-Plan9.c
index 1ac60404..8fcfa141 100644
--- a/utils/acid/os-Plan9.c
+++ b/utils/acid/os-Plan9.c
@@ -54,7 +54,7 @@ waitfor(int pid)
 		}
 		free(w);
 	}
-	return nil;
+	/* not reached */
 }
 
 char *
@@ -78,7 +78,7 @@ runcmd(char *cmd)
 	default:
 		return waitfor(pid);
 	}
-	return 0;
+	/* not reached */
 }
 
 void
diff --git a/utils/acid/util.c b/utils/acid/util.c
index 0de244fd..fc3d31e9 100644
--- a/utils/acid/util.c
+++ b/utils/acid/util.c
@@ -35,7 +35,7 @@ unique(char *buf, Sym *s)
 		}
 	}
 	if(renamed && !quiet)
-		print("\t%s=%s %c/%lux\n", s->name, buf, s->type, s->value);
+		print("\t%s=%s %c/%llux\n", s->name, buf, s->type, s->value);
 	if(l == 0)
 		l = enter(buf, Tid);
 	return l;	
@@ -193,12 +193,12 @@ loadvars(void)
 	}
 }
 
-vlong
+uvlong
 rget(Map *map, char *reg)
 {
 	Lsym *s;
-	long x;
-	vlong v;
+	ulong x;
+	uvlong v;
 	int ret;
 
 	s = look(reg);
@@ -206,7 +206,7 @@ rget(Map *map, char *reg)
 		fatal("rget: %s\n", reg);
 
 	if(s->v->vstore.fmt == 'Y')
-		ret = get8(map, (long)s->v->vstore.u0.sival, &v);
+		ret = get8(map, s->v->vstore.u0.sival, &v);
 	else {
 		ret = get4(map, (long)s->v->vstore.u0.sival, &x);
 		v = x;