From e3ce592ab93ac01bc17df9cb9c6637233e602810 Mon Sep 17 00:00:00 2001 From: David du Colombier <0intro@gmail.com> Date: Sat, 1 Feb 1992 00:00:00 +0000 Subject: [PATCH] Plan 9 from Bell Labs 1992-02-01 --- gnot/fault68020.c | 3 ++- gnot/trap.c | 2 +- port/devmux.c | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/gnot/fault68020.c b/gnot/fault68020.c index f717eedbd7aa310165514c1553ebb79b63a3bb06..a07712c67ada0f8b5958665b202b6a04d176e0e1 100644 --- a/gnot/fault68020.c +++ b/gnot/fault68020.c @@ -55,7 +55,6 @@ fault68020(Ureg *ur, FFrame *f) } insyscall = u->p->insyscall; u->p->insyscall = 1; - u->dbgreg = ur; addr = 0; /* set */ if(f->ssw & DF) addr = f->addr; @@ -80,6 +79,8 @@ fault68020(Ureg *ur, FFrame *f) badvaddr = addr; addr &= ~(BY2PG-1); user = !(ur->sr&SUPER); + if(user) + u->dbgreg = ur; if(f->ssw & DF) read = (f->ssw&READ) && !(f->ssw&RM); diff --git a/gnot/trap.c b/gnot/trap.c index 40bc63c28c40cd9d220648d6a9a99a4a21d2bbb2..72cddfce5355988ff545208762ca57c5e79030bc 100644 --- a/gnot/trap.c +++ b/gnot/trap.c @@ -322,7 +322,7 @@ syscall(Ureg *aur) error(Ebadarg); } if(sp & (BY2WD-1)){ - pprint("odd sp in sys call pc %lux sp %lux\n", + pprint("odd sp in sys call pc %lux sp %lux\n", ((Ureg*)UREGADDR)->pc, ((Ureg*)UREGADDR)->sp); msg = "sys: odd stack"; goto Bad; diff --git a/port/devmux.c b/port/devmux.c index 01b3a2937f0a0f80363eb3437495163a418a0c1f..45cce58faeb8afce7ad8c292733616fa958b7641 100644 --- a/port/devmux.c +++ b/port/devmux.c @@ -135,7 +135,7 @@ muxattach(char *spec) { Chan *c; - c = devattach('m', spec); + c = devattach('s', spec); c->qid.path = CHDIR|Qdir; return c; }