From 5365c86e4f35b2631b24f88a436e35fc30286c8a Mon Sep 17 00:00:00 2001
From: David du Colombier <0intro@gmail.com>
Date: Tue, 7 Jun 1994 00:00:00 +0000
Subject: [PATCH] Plan 9 from Bell Labs 1994-06-07

---
 pc/dat.h  | 1 +
 pc/l.s    | 8 ++++----
 pc/main.c | 4 ++++
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/pc/dat.h b/pc/dat.h
index 112913d43fb64a3a49df2999ea10d83e71f6d7f2..333aa14ba17ef3214998ff6b1cdd542a0dc4f3ba 100644
--- a/pc/dat.h
+++ b/pc/dat.h
@@ -195,3 +195,4 @@ extern int	cpuflag;		/* true if this is a CPU */
 
 extern Mach	*m;
 extern Proc	*up;
+extern char	filaddr[];
diff --git a/pc/l.s b/pc/l.s
index ca942b83c0d6cc7ef53ad43181ee326bbcbe7edf..0617d9b163c37d571276b176db790e609ee5191f 100644
--- a/pc/l.s
+++ b/pc/l.s
@@ -750,22 +750,22 @@ TEXT	fwblock(SB),$0
 	MOVL	$128,CX
 	CLD; REP; OUTSL
 
-	MOVL	p+0(FP),DX
+	MOVL	a+4(FP),DX
 	MOVL	$128,CX
 	MOVL	csum+8(FP), AX
 wcsum:
 	XORL	0(DX), AX
 	ADDL	$4,DX
-	LOOP	rcsum	
+	LOOP	wcsum	
 	RET
 
 TEXT	frblock(SB),$0
 	MOVL	p+0(FP),DX
-	MOVL	a+4(FP),SI
+	MOVL	a+4(FP),DI
 	MOVL	$128,CX
 	CLD; REP; INSL
 
-	MOVL	p+0(FP),DX
+	MOVL	a+4(FP),DX
 	MOVL	$128,CX
 	MOVL	csum+8(FP), AX
 rcsum:
diff --git a/pc/main.c b/pc/main.c
index 7139b0e49545096d749c12cda7d6b7730da692ba..9f3474ffa52de25a5fb1b589889299638e1299d5 100644
--- a/pc/main.c
+++ b/pc/main.c
@@ -27,6 +27,7 @@ PCArch *knownarch[] =
 #define	MAXCONF		32
 
 char bootdisk[NAMELEN];
+char filaddr[NAMELEN];
 char *confname[MAXCONF];
 char *confval[MAXCONF];
 int nconf;
@@ -316,6 +317,9 @@ confinit(void)
 			if(i < defmaxmsg && i >=128)
 				defmaxmsg = i;
 		}
+		/* HACK: where should this come from? */
+		if(strcmp(confname[nconf], "filaddr") == 0)
+			strcpy(filaddr, confval[nconf]);
 		nconf++;
 	}
 	/*