diff options
| author | marcel <marcel@FreeBSD.org> | 1999-10-08 09:02:39 +0000 |
|---|---|---|
| committer | marcel <marcel@FreeBSD.org> | 1999-10-08 09:02:39 +0000 |
| commit | 421cd96595cf7ac5c3aef495760e1f353eeaf9c8 (patch) | |
| tree | 0c7dbe476e048080c89c28d1054364f66293327c /usr.bin/doscmd | |
| parent | c3c39363afef9b3371b6126136c8b20a938969aa (diff) | |
| download | FreeBSD-src-421cd96595cf7ac5c3aef495760e1f353eeaf9c8.zip FreeBSD-src-421cd96595cf7ac5c3aef495760e1f353eeaf9c8.tar.gz | |
Fix the breakage of doscmd that was caused by the rebirth
of sigcontext and the change in mcontext_t.
Partial fix submitted by:
Philipp Mergenthaler <un1i@rz.uni-karlsruhe.de>`
Diffstat (limited to 'usr.bin/doscmd')
| -rw-r--r-- | usr.bin/doscmd/register.h | 1 | ||||
| -rw-r--r-- | usr.bin/doscmd/signal.c | 2 | ||||
| -rw-r--r-- | usr.bin/doscmd/trap.c | 4 |
3 files changed, 4 insertions, 3 deletions
diff --git a/usr.bin/doscmd/register.h b/usr.bin/doscmd/register.h index 346807e..6e0752c 100644 --- a/usr.bin/doscmd/register.h +++ b/usr.bin/doscmd/register.h @@ -58,6 +58,7 @@ typedef union typedef struct { + int onstack; reg86_t gs; reg86_t fs; reg86_t es; diff --git a/usr.bin/doscmd/signal.c b/usr.bin/doscmd/signal.c index 297bf37..ec4a078 100644 --- a/usr.bin/doscmd/signal.c +++ b/usr.bin/doscmd/signal.c @@ -66,7 +66,7 @@ sanity_check(struct sigframe *sf) static void generichandler(struct sigframe sf) { - if (sf.sf_uc.uc_mcontext.mc_tf.tf_eflags & PSL_VM) { + if (sf.sf_uc.uc_mcontext.mc_eflags & PSL_VM) { saved_sigframe = &sf; saved_regcontext = (regcontext_t *)&(sf.sf_uc.uc_mcontext); saved_valid = 1; diff --git a/usr.bin/doscmd/trap.c b/usr.bin/doscmd/trap.c index 1c743b3..f0bfc85 100644 --- a/usr.bin/doscmd/trap.c +++ b/usr.bin/doscmd/trap.c @@ -296,8 +296,8 @@ sigbus(struct sigframe *sf) if ((int)sf->sf_siginfo != 0) { fatal("SIGBUS code %d, trapno: %d, err: %d\n", - (int)sf->sf_siginfo, sf->sf_uc.uc_mcontext.mc_tf.tf_trapno, - sf->sf_uc.uc_mcontext.mc_tf.tf_err); + (int)sf->sf_siginfo, sf->sf_uc.uc_mcontext.mc_trapno, + sf->sf_uc.uc_mcontext.mc_err); } addr = (u_char *)MAKEPTR(R_CS, R_IP); |
