diff options
| author | marcel <marcel@FreeBSD.org> | 1999-09-29 20:09:19 +0000 |
|---|---|---|
| committer | marcel <marcel@FreeBSD.org> | 1999-09-29 20:09:19 +0000 |
| commit | d4e70391772e9b3fa25d96b93d50278ea1c125ef (patch) | |
| tree | 8397c40eb0fbcd1e79470ce8389a29cbebc02ca6 /usr.bin/doscmd/trace.c | |
| parent | 073b941095e3deeaae66ec3452643c4db25deb08 (diff) | |
| download | FreeBSD-src-d4e70391772e9b3fa25d96b93d50278ea1c125ef.zip FreeBSD-src-d4e70391772e9b3fa25d96b93d50278ea1c125ef.tar.gz | |
Unbreak doscmd after the sigset_t change:
doscmd heavily depends on struct sigcontext which luckily is mostly passed
between functions as usion regcontext_t. By redefining union regcontext_t in
terms of mcontext_t almost all bases are covered.
It also seems to me that doscmd was in a transitional state. The redundant
definitions made it difficult to get a clear overview and could easily cause
oversight. To make sure my changes were ok, I went as far as to complete the
transition. It was not exactly necessary, but I expect to have to come back
here some more ("whistle" if I'm wrong :-).
Diffstat (limited to 'usr.bin/doscmd/trace.c')
| -rw-r--r-- | usr.bin/doscmd/trace.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/usr.bin/doscmd/trace.c b/usr.bin/doscmd/trace.c index 9be758f..0e76b19 100644 --- a/usr.bin/doscmd/trace.c +++ b/usr.bin/doscmd/trace.c @@ -99,7 +99,7 @@ tracetrap(regcontext_t *REGS) if ((R_EFLAGS & PSL_VM) == 0) return; - addr = (u_char *)N_GETPTR(R_CS, R_IP); + addr = (u_char *)MAKEPTR(R_CS, R_IP); n = i386dis(R_CS, R_IP, addr, buf, 0); printtrace(REGS, buf); @@ -129,9 +129,9 @@ tracetrap(regcontext_t *REGS) saddr = (u_short *)MAKEPTR(R_SS, R_SP + 4); #if 0 printf("IRET: %04x %04x %04x\n", - ((u_short *)N_GETPTR(R_SS, R_SP))[0], - ((u_short *)N_GETPTR(R_SS, R_SP))[1], - ((u_short *)N_GETPTR(R_SS, R_SP))[2]); + ((u_short *)MAKEPTR(R_SS, R_SP))[0], + ((u_short *)MAKEPTR(R_SS, R_SP))[1], + ((u_short *)MAKEPTR(R_SS, R_SP))[2]); #endif break; case OPSIZ: @@ -194,7 +194,7 @@ printtrace(regcontext_t *REGS, char *buf) { static int first = 1; - u_char *addr = (u_char *)N_GETPTR(R_CS, R_IP); + u_char *addr = (u_char *)MAKEPTR(R_CS, R_IP); char *bigfmt = "%04x:%04x " #if BIG_DEBUG "%02x %02x %02x %02x %02x %02x " |
