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>`
This commit is contained in:
parent
1164a930d8
commit
a9b5952e50
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=52022
@ -58,6 +58,7 @@ typedef union
|
||||
|
||||
typedef struct
|
||||
{
|
||||
int onstack;
|
||||
reg86_t gs;
|
||||
reg86_t fs;
|
||||
reg86_t es;
|
||||
|
@ -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;
|
||||
|
@ -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);
|
||||
|
Loading…
Reference in New Issue
Block a user