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/tty.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/tty.c')
| -rw-r--r-- | usr.bin/doscmd/tty.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/usr.bin/doscmd/tty.c b/usr.bin/doscmd/tty.c index d18f157..a76239e 100644 --- a/usr.bin/doscmd/tty.c +++ b/usr.bin/doscmd/tty.c @@ -409,7 +409,7 @@ video_update(REGISTERS) XGCValues v; if (kbd_read) - kbd_event(kbd_fd, sc); + kbd_event(kbd_fd, REGS); if (--icnt == 0) { @@ -734,7 +734,7 @@ debug_event(int fd, REGISTERS) ap += c; } } else if (!strcasecmp(av[0], "regs")) { - dump_regs(sc); + dump_regs(REGS); } else if (!strcasecmp(av[0], "force")) { char *p = av[1]; @@ -962,7 +962,7 @@ printf("FORCED REDRAW\n"); case 0x14: /* T */ tmode ^= 1; if (!tmode) - resettrace(&saved_sigframe->sf_siginfo.si_sc); + resettrace(&saved_sigframe->sf_uc.uc_mcontext); return(0xffff); case 0x53: /* DEL */ quit(0); @@ -1456,7 +1456,7 @@ video_event(XEvent *ev) tmode ^= 1; if (!tmode) resettrace(&saved_sigframe-> - sf_siginfo.si_sc); + sf_uc.uc_mcontext); break; } if (ks == 'R' || ks == 'r') { @@ -1743,8 +1743,8 @@ tty_read(REGISTERS, int flag) * all the way to the user, but... */ if (ivec[0x23] && (ivec[0x23] >> 16) != 0xF000) { - fake_int(sc, 0x23); - SET16(sc->sc_eip, GET16(sc->sc_eip) - 2); + fake_int(REGS, 0x23); + R_EIP = R_EIP - 2; return(-2); } } @@ -1785,8 +1785,8 @@ tty_peek(REGISTERS, int flag) * all the way to the user, but... */ if (ivec[0x23] && (ivec[0x23] >> 16) != 0xF000) { - fake_int(sc, 0x23); - SET16(sc->sc_eip, GET16(sc->sc_eip) - 2); + fake_int(REGS, 0x23); + R_EIP = R_EIP - 2; return(-2); } } |
