From 1833a120294b741542301e93fc066db66704c90b Mon Sep 17 00:00:00 2001 From: David du Colombier <0intro@gmail.com> Date: Tue, 8 Mar 1994 00:00:00 +0000 Subject: [PATCH] Plan 9 from Bell Labs 1994-03-08 --- carrera/fns.h | 11 +++++++---- carrera/l.s | 13 +++---------- carrera/main.c | 2 ++ carrera/trap.c | 10 ++++------ 4 files changed, 16 insertions(+), 20 deletions(-) diff --git a/carrera/fns.h b/carrera/fns.h index f2e75484974cc9bea5faff1e43cd74c50530f0c5..932766a6fcaa435ee0d135a7d0f0d164e149cae3 100644 --- a/carrera/fns.h +++ b/carrera/fns.h @@ -118,11 +118,14 @@ void enetaddr(uchar*); #define KADDR1(a) ((void*)((ulong)(a)|KSEG1)) #define PADDR(a) ((ulong)(a)&~KSEGM) -#define hnputl(p, v) ((*(ulong*)p) = v) -#define hnputs(p, v) ((*(ushort*)p) = v) -#define nhgetl(p) ((*(ulong*)p)) -#define nhgets(p) ((*(ushrt*)p)) +void hnputl(void*, ulong v); +void hnputs(void*, ushort v); +ulong nhgetl(void*); +ushort nhgets(void*); void ifwrite(void*, Block*); void* ifinit(int); void fiberint(int); +ulong ifaddr(void*); +void audiosbintr(void); +void audiodmaintr(void); diff --git a/carrera/l.s b/carrera/l.s index de6bb18ccf4e869f1eee37db1147dcd7505682a1..fac2577c1ade365955f292892166afaa3171511d 100644 --- a/carrera/l.s +++ b/carrera/l.s @@ -842,20 +842,13 @@ uvputuna: RET TEXT uvld(SB), $-4 /* uvld(address, dst) */ - MOVV 0(R1), R5 MOVW 4(FP), R2 - MOVW R5, 4(R2) - DSRA (16,5,5) - DSRA (16,5,5) - MOVW R5, 0(R2) + MOVV 0(R1), R5 + MOVV R5, 0(R2) RET TEXT uvst(SB), $-4 /* uvst(address, src) */ MOVW 4(FP), R2 - MOVW 0(R2), R5 - DSLL (16,5,5) - DSLL (16,5,5) - MOVW 4(R2), R2 - OR R2, R5 + MOVV 0(R2), R5 MOVV R5, 0(R1) RET diff --git a/carrera/main.c b/carrera/main.c index e532b37b2ca5931009716a99a47da23294ba5395..f4198ac296ce4b1c7be1d2df5265ccebb7384b3d 100644 --- a/carrera/main.c +++ b/carrera/main.c @@ -499,6 +499,8 @@ rdbginit(void) uchar *vec; ulong jba; + return; /* Not installed now */ + /* Only interested in the PC */ Mipsjmpbuf.pc = 0x8001C020; diff --git a/carrera/trap.c b/carrera/trap.c index 81c4547d3f0a1df809b471686d0e9d29db2925f8..89ecc5bb26f5a75774a4f2574a8cde7badcf29ba 100644 --- a/carrera/trap.c +++ b/carrera/trap.c @@ -341,6 +341,7 @@ intr(Ureg *ur) if(vec == Int1vec) EISAOUTB(Int1ctl, EOI); } + switch(devint) { default: iprint("i386ACK #%lux\n", devint); @@ -429,19 +430,16 @@ dumpregs(Ureg *ur) { int i; ulong *l; + if(up) print("registers for %s %d\n", up->text, up->pid); else print("registers for kernel\n"); - l = &ur->status; for(i=0; i