vx32

commit 9306250db9512d4c1848330548396be1576e1a9c
parent 82fbd24951444ca2692411654eccf04780426418
Author: rminnich@nox.hsd1.ca.comcast.net <none@none>
Date:   Tue, 20 Apr 2010 08:14:11 -0700

Remove unnecessary set of procctl in newproc()
A bit more cleanup.

Diffstat:
src/9vx/a/proc.c
 | 
1
-
src/9vx/trap.c
 | 
12
+++++-------

2 files changed, 5 insertions(+), 8 deletions(-)
diff --git a/src/9vx/a/proc.c b/src/9vx/a/proc.c
@@ -615,7 +615,6 @@ newproc(void)
 	p->pdbg = 0;
 	p->fpstate = FPinit;
 	p->kp = 0;
-	p->procctl = 0;
 	if(up && up->procctl == Proc_tracesyscall)
 		p->procctl = Proc_tracesyscall;
 	else
diff --git a/src/9vx/trap.c b/src/9vx/trap.c
@@ -185,7 +185,7 @@ fmtrwdata(Fmt *f, ulong s, int n, char *suffix)
 	int i;
 
 	if (! s) {
-		fmtprint(f, "0%s", suffix);
+		fmtprint(f, "0x0", suffix);
 		return;
 	}
 	src = uvalidaddr(s, 1, 0);
@@ -196,7 +196,7 @@ fmtrwdata(Fmt *f, ulong s, int n, char *suffix)
 		else
 			t[i] = '.';
 
-	fmtprint(f, "%08ux/%s%s", s, t, suffix);
+	fmtprint(f, "%08ux/\"%s\"%s", s, t, suffix);
 	free(t);
 }
 
@@ -207,7 +207,7 @@ fmtuserstring(Fmt *f, ulong s, char *suffix)
 	int n;
 
 	if (! s){
-		fmtprint(f, "0/\"\"");
+		fmtprint(f, "0/\"\"%s", suffix);
 		return;
 	}
 	src = uvalidaddr(s, 1, 0);
@@ -227,7 +227,7 @@ syscallprint(Ureg *ureg)
 	int syscallno;
 	vlong offset;
 	Fmt fmt;
-	int len, i;
+	int len;
   	char *argv;
 	sp = (uint32*)(up->pmmu.uzero + ureg->usp);
 	syscallno = ureg->ax;
@@ -399,7 +399,6 @@ syscallprint(Ureg *ureg)
 		fmtuserstring(&fmt, sp[5], "");
 		break;
 	case AWAIT:
-		fmtprint(&fmt, "%#ux", sp[1]);
 		break;
 	case _READ: 
 	case PREAD:
@@ -419,7 +418,6 @@ syscallprint(Ureg *ureg)
 		fmtprint(&fmt, "%d %#llx", sp[3], offset);
 		break;
 	}
-done:
 	up->syscalltrace = fmtstrflush(&fmt);
 }
 
@@ -495,7 +493,7 @@ retprint(Ureg *ureg, int syscallno, uvlong start, uvlong stop)
 			fmtuserstring(&fmt, up->s.args[0], " ");
 			fmtprint(&fmt, "%d", up->s.args[1]);
 		} else {
-			fmtprint(&fmt, "\"\" %d", up->s.args[1]);
+			fmtprint(&fmt, "%#ux/\"\" %d", up->s.args[0], up->s.args[1]);
 		}
 		break;
 	case _ERRSTR: