5 files changed, 13 insertions(+), 22 deletions(-)

M carrera/screen.c
M pc/clock.c
M pc/fault386.c
M pc/main.c
M port/taslock.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;

@@ 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();
 }

@@ 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);
 	}

@@ 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

@@ 29,7 29,7 @@ ilock(Lock *l)
 		l->sr = x;
 		return;
 	}
- print("ilock loop %lux\n", getcallerpc(0));
+
 	for(;;){
 		while(l->key)
 			;