From 3df7ddf9047a5157164e42aff82b0efc4afba8c8 Mon Sep 17 00:00:00 2001
From: David du Colombier <0intro@gmail.com>
Date: Fri, 13 Jan 1995 00:00:00 +0000
Subject: [PATCH] Plan 9 from Bell Labs 1995-01-13

---
 carrera/dat.h  |  2 --
 carrera/l.s    | 35 ++++++++++++++++++++++++-----------
 carrera/trap.c |  4 ----
 port/auth.c    |  2 +-
 port/netif.h   |  4 ----
 5 files changed, 25 insertions(+), 22 deletions(-)

diff --git a/carrera/dat.h b/carrera/dat.h
index fbfa8e6a669052eceabe1ee905daf450289471cd..f42b3dee1419f5700342cad066464e72954b1818 100644
--- a/carrera/dat.h
+++ b/carrera/dat.h
@@ -80,8 +80,6 @@ struct PMMU
 struct Notsave
 {
 	ulong	svstatus;
-	long	svr1;
-	long	svhr1;
 };
 
 #include "../port/portdat.h"
diff --git a/carrera/l.s b/carrera/l.s
index e8639ef850cb2be28724760ce0651b3a85aa4774..e2f301839f5f7002773a9bac34489fbc4b7143f0 100644
--- a/carrera/l.s
+++ b/carrera/l.s
@@ -810,16 +810,22 @@ TEXT	fwblock(SB), $-4	/* fwblock(void*port, void *block, csum) */
 	SLLV	$32, R6
 	SRLV	$32, R6		/* zero extend */
 
-	MOVW	$32, R4
+	MOVW	$16, R4
 fwloop:
 	MOVV	0(R2), R5
 	MOVV	R5, 0(R1)
 	XOR	R5, R6
-	MOVV	8(R2), R5
-	MOVV	R5, 0(R1)
-	XOR	R5, R6
-
-	ADD	$16, R2
+	MOVV	8(R2), R7
+	MOVV	R7, 0(R1)
+	XOR	R7, R6
+	MOVV	16(R2), R8
+	MOVV	R8, 0(R1)
+	XOR	R8, R6
+	MOVV	24(R2), R9
+	MOVV	R9, 0(R1)
+	XOR	R9, R6
+
+	ADD	$32, R2
 	SUB	$1, R4
 	BNE	R4, fwloop
 
@@ -834,15 +840,22 @@ TEXT	frblock(SB), $-4	/* frblock(void*port, void *block, csum) */
 	SLLV	$32, R6
 	SRLV	$32, R6		/* zero extend */
 
-	MOVW	$32, R4
+	MOVW	$16, R4
 frloop:
 	MOVV	0(R1), R5
 	MOVV	R5, 0(R2)
 	XOR	R5, R6
-	MOVV	0(R1), R5
-	MOVV	R5, 8(R2)
-	XOR	R5, R6
-	ADD	$16, R2
+	MOVV	0(R1), R7
+	MOVV	R7, 8(R2)
+	XOR	R7, R6
+	MOVV	0(R1), R8
+	MOVV	R8, 16(R2)
+	XOR	R8, R6
+	MOVV	0(R1), R9
+	MOVV	R9, 24(R2)
+	XOR	R9, R6
+
+	ADD	$32, R2
 	SUB	$1, R4
 	BNE	R4, frloop
 
diff --git a/carrera/trap.c b/carrera/trap.c
index 839ff2ed9df9722cda66d48a77153758371be8b4..3f26113a63eaefcebc62248f3e650b5118c85937 100644
--- a/carrera/trap.c
+++ b/carrera/trap.c
@@ -544,8 +544,6 @@ notify(Ureg *ur)
 	memmove((char*)sp, up->note[0].msg, ERRLEN);
 	sp -= 3*BY2WD;
 	*(ulong*)(sp+2*BY2WD) = sp+3*BY2WD;	/* arg 2 is string */
-	up->svr1 = ur->r1;			/* save away r1 */
-	up->svhr1 = ur->hr1;			/* save away r1 */
 	ur->r1 = (long)up->ureg;		/* arg 1 is ureg* */
 	ur->hr1 = 0;
 	if(ur->r1 < 0)
@@ -588,8 +586,6 @@ noted(Ureg **urp, ulong arg0)
 	}
 
 	memmove(*urp, up->ureg, sizeof(Ureg));
-	(*urp)->r1 = up->svr1;
-	(*urp)->hr1 = up->svhr1;
 	switch(arg0) {
 	case NCONT:
 		if(!okaddr(nur->pc, 1, 0) || !okaddr(nur->usp, BY2WD, 0)){
diff --git a/port/auth.c b/port/auth.c
index 93896256cb3379907e7c57e70a980f446001d42d..ef2276a433bb49522cd556441b375b4b68bb0c40 100644
--- a/port/auth.c
+++ b/port/auth.c
@@ -542,7 +542,7 @@ keyread(char *a, int n, long offset)
 {
 	if(n<DESKEYLEN || offset != 0)
 		error(Ebadarg);
-	if(!iseve())
+	if(!cpuserver || !iseve())
 		error(Eperm);
 	memmove(a, evekey, DESKEYLEN);
 	return DESKEYLEN;
diff --git a/port/netif.h b/port/netif.h
index bd6acd794107014c3e2d8bcea089a492e38ed26e..77e9e22b45a2874a21550164a945d55e389569ce 100644
--- a/port/netif.h
+++ b/port/netif.h
@@ -104,7 +104,3 @@ struct Etherpkt
 };
 
 extern uchar etherbcast[6];
-
-/*
- *  FDDI specific
- */