From 11643c3a18cd07ebf86d0c5bf1db348b7f3586cd Mon Sep 17 00:00:00 2001
From: David du Colombier <0intro@gmail.com>
Date: Mon, 7 Sep 1992 00:00:00 +0000
Subject: [PATCH] Plan 9 from Bell Labs 1992-09-07

---
 port/devproc.c | 11 +++++++----
 port/stil.c    | 19 ++++++++++++++++---
 power/l.s      |  6 ++++++
 3 files changed, 29 insertions(+), 7 deletions(-)

diff --git a/port/devproc.c b/port/devproc.c
index 74245cd27f6340ff2a8fd2d7a1761f641ab6bf1e..1eae4646cf905fce81cbdc3b336c303bfbcec379 100644
--- a/port/devproc.c
+++ b/port/devproc.c
@@ -233,7 +233,7 @@ procclose(Chan * c)
 long
 procread(Chan *c, void *va, long n, ulong offset)
 {
-	char *a = va, *b;
+	char *a = va, *b, *sps;
 	char statbuf[NSEG*32];
 	Proc *p;
 	Page *pg;
@@ -341,9 +341,12 @@ procread(Chan *c, void *va, long n, ulong offset)
 		if(offset+n > STATSIZE)
 			n = STATSIZE - offset;
 
-		j = sprint(statbuf, "%-27s %-27s %-11s ",
-			p->text, p->user, p->psstate ? p->psstate : statename[p->state]);
-		for(i=0; i<6; i++){
+		sps = p->psstate;
+		if(sps == 0)
+			sps = statename[p->state];
+		j = sprint(statbuf, "%-27s %-27s %-11s ", p->text, p->user, sps);
+
+		for(i = 0; i < 6; i++) {
 			l = p->time[i];
 			if(i == TReal)
 				l = MACHP(0)->ticks - l;
diff --git a/port/stil.c b/port/stil.c
index d5f2e65b1a5e2027024ede45577dfa81f2edf6b8..e0a638d3a42e120d39dff1c2f7478f650cbf24d1 100644
--- a/port/stil.c
+++ b/port/stil.c
@@ -18,11 +18,23 @@ static	Rendez	ilackr;
 
 char	*ilstate[] = 
 { 
-	"Closed", "Syncer", "Syncee", "Established", "Listening", "Closing" 
+	"Closed",
+	"Syncer",
+	"Syncee",
+	"Established",
+	"Listening",
+	"Closing" 
 };
+
 char	*iltype[] = 
 {	
-	"sync", "data", "dataquerey", "ack", "querey", "state", "close" 
+	"sync",
+	"data",
+	"dataquerey",
+	"ack",
+	"querey",
+	"state",
+	"close" 
 };
 static char *etime = "connection timed out";
 
@@ -579,8 +591,8 @@ ilpullup(Ipconv *s)
 {
 	Ilcb *ic;
 	Ilhdr *oh;
-	ulong oid, dlen;
 	Block *bp;
+	ulong oid, dlen;
 
 	if(s->readq == 0)
 		return;
@@ -793,6 +805,7 @@ notsyncer(void *ic)
 	i = ic;
 	return i->state != Ilsyncer;
 }
+
 void
 ilstart(Ipconv *ipc, int type, int window)
 {
diff --git a/power/l.s b/power/l.s
index b4c07d873ffaa164f3682fbfdc80ea8371e4bda5..530f7b6e448f3c17dea15ed77d93436494f46e01 100644
--- a/power/l.s
+++ b/power/l.s
@@ -271,6 +271,12 @@ TEXT	vector80(SB), $-4
 
 TEXT	vector0(SB), $-4
 
+	MOVW	$((MACHADDR+368) & 0xffff0000), R26	/* get m->tlbfault BUG */	
+	OR	$((MACHADDR+368) & 0xffff), R26
+	MOVW	(R26), R27
+	ADD	$1, R27
+	MOVW	R27, (R26)
+
 	MOVW	$utlbmiss(SB), R26
 	MOVW	M(TLBVIRT), R27
 	JMP	(R26)