From 825b8871028064d9c13861db41a9c797107d4851 Mon Sep 17 00:00:00 2001
From: David du Colombier <0intro@gmail.com>
Date: Wed, 25 May 1994 00:00:00 +0000
Subject: [PATCH] Plan 9 from Bell Labs 1994-05-25

---
 carrera/screen.c |  8 ++++----
 pc/clock.c       | 16 +++++-----------
 pc/fault386.c    |  7 ++-----
 pc/main.c        |  2 +-
 port/taslock.c   |  2 +-
 5 files changed, 13 insertions(+), 22 deletions(-)

diff --git a/carrera/screen.c b/carrera/screen.c
index 7dd2b5238b36c296c052fdc7e06e3c437fca477c..857c386897a04c112168ff83d8e0b03e8f412a06 100644
--- a/carrera/screen.c
+++ b/carrera/screen.c
@@ -40,10 +40,10 @@ Lock	screenlock;
 
 Bitmap	gscreen =
 {
-	{ 0, 0, 1600, 1240 },
-	{ 0, 0, 1600, 1240 },
+	{ 0, 0, 1597, 1234 },
+	{ 0, 0, 1597, 1234 },
 	3,
-	Screenvirt+0x00017924,
+	Screenvirt+0x000178D0,
 	0,
 	512,
 	0
@@ -454,7 +454,7 @@ cursoron(int dolock)
 	if(dolock)
 		lock(&cursor);
 
-	p.x += 380;		/* adjusted by experiment */
+	p.x += 296;		/* adjusted by experiment */
 	p.y += 11;		/* adjusted by experiment */
 	d->cr1 = 03;
 	d->cr0 = 01;
diff --git a/pc/clock.c b/pc/clock.c
index 027e59c773f7332b2622eeb284c40aee3cdece3e..b979d45bb4f77457fec39de45aea5c81adaecd24 100644
--- a/pc/clock.c
+++ b/pc/clock.c
@@ -49,7 +49,6 @@ clock(Ureg *ur, void *arg)
 	Proc *p;
 	int nrun = 0;
 	int islow = 0;
-	extern int hwcursor;
 
 	USED(arg);
 
@@ -92,18 +91,13 @@ clock(Ureg *ur, void *arg)
 	/*
 	 *  anything from here down can be running spllo()
 	 */
-
-	/* last because it could spllo() */
-	if(hwcursor)
-		mouseclock();
-	else {
-		if(!islow){
-			islow = 1;
-			spllo();
-		}
-		mouseclock();
+	if(!islow){
+		islow = 1;
+		spllo();
 	}
 
+	mouseclock();
+
 	if(islow)
 		splhi();
 }
diff --git a/pc/fault386.c b/pc/fault386.c
index 7580082537bd3f8d2e82bcc656484521b6eaa139..1bb9beb52fcf7e7a242a80daa8f78bf68a82f89b 100644
--- a/pc/fault386.c
+++ b/pc/fault386.c
@@ -18,17 +18,13 @@ fault386(Ureg *ur, void *arg)
 
 	USED(arg);
 
-	if(up == 0){
-		dumpregs(ur);
-		for(;;);
-	}
-
 	insyscall = up->insyscall;
 	up->insyscall = 1;
 	addr = getcr2();
 	read = !(ur->ecode & 2);
 	user = (ur->cs&0xffff) == UESEL;
 	spllo();
+/*print("F%d:A#%lux:U%d:R%d|", up->pid, addr, user, read);/**/
 	n = fault(addr, read);
 	if(n < 0){
 		if(user){
@@ -37,6 +33,7 @@ fault386(Ureg *ur, void *arg)
 			postnote(up, 1, buf, NDebug);
 			return;
 		}
+print("fault: 0x%lux", addr);
 		dumpregs(ur);
 		panic("fault: 0x%lux", addr);
 	}
diff --git a/pc/main.c b/pc/main.c
index dddc11e8cc313ae6b2ec2005349ef64cf5837cc9..7139b0e49545096d749c12cda7d6b7730da692ba 100644
--- a/pc/main.c
+++ b/pc/main.c
@@ -67,7 +67,7 @@ main(void)
 
 /*
  *  This tries to capture architecture dependencies since things
- *  like power management/resetting/mouse are outside the hardware
+ *  like power management/reseting/mouse are outside the hardware
  *  model.
  */
 void
diff --git a/port/taslock.c b/port/taslock.c
index 75be573ba403bbec1cb383e115e9d7f242f7b8c8..0e1bd45d6d83eb749e8f3f975e403f603323e2ef 100644
--- a/port/taslock.c
+++ b/port/taslock.c
@@ -29,7 +29,7 @@ ilock(Lock *l)
 		l->sr = x;
 		return;
 	}
- print("ilock loop %lux\n", getcallerpc(0));
+
 	for(;;){
 		while(l->key)
 			;