From a9b5952e50395e89c56c0ab05fe7c15285e4dd84 Mon Sep 17 00:00:00 2001 From: Marcel Moolenaar Date: Fri, 8 Oct 1999 09:02:39 +0000 Subject: [PATCH] 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 ` --- usr.bin/doscmd/register.h | 1 + usr.bin/doscmd/signal.c | 2 +- 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 346807e4bfb6..6e0752c542dd 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 297bf37e4114..ec4a078d35c4 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 1c743b3327e1..f0bfc853b46c 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);