diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 1997-01-27 01:17:09 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 1997-01-27 01:17:09 +0000 |
| commit | ed9aafa5c443a5b95610d366671f3ffcf4607e30 (patch) | |
| tree | 8579491c529e60b0c7e1d28729d03cf4a97f854e /sys/arch | |
| parent | ce4c1d7065381d316fb28408364d1f97d6a2b39f (diff) | |
match svr4 siginfo changes
Diffstat (limited to 'sys/arch')
| -rw-r--r-- | sys/arch/i386/i386/svr4_machdep.c | 70 |
1 files changed, 35 insertions, 35 deletions
diff --git a/sys/arch/i386/i386/svr4_machdep.c b/sys/arch/i386/i386/svr4_machdep.c index 4bf2d9c5362..68b9cf259d7 100644 --- a/sys/arch/i386/i386/svr4_machdep.c +++ b/sys/arch/i386/i386/svr4_machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: svr4_machdep.c,v 1.7 1996/10/17 19:34:24 niklas Exp $ */ +/* $OpenBSD: svr4_machdep.c,v 1.8 1997/01/27 01:17:08 deraadt Exp $ */ /* $NetBSD: svr4_machdep.c,v 1.24 1996/05/03 19:42:26 christos Exp $ */ /* @@ -218,84 +218,84 @@ svr4_getsiginfo(si, sig, code, addr) u_long code; caddr_t addr; { - si->si_signo = bsd_to_svr4_sig[sig]; - si->si_errno = 0; - si->si_addr = addr; + si->svr4_si_signo = bsd_to_svr4_sig[sig]; + si->svr4_si_errno = 0; + si->svr4_si_addr = addr; switch (code) { case T_PRIVINFLT: - si->si_code = SVR4_ILL_PRVOPC; - si->si_trap = SVR4_T_PRIVINFLT; + si->svr4_si_code = SVR4_ILL_PRVOPC; + si->svr4_si_trap = SVR4_T_PRIVINFLT; break; case T_BPTFLT: - si->si_code = SVR4_TRAP_BRKPT; - si->si_trap = SVR4_T_BPTFLT; + si->svr4_si_code = SVR4_TRAP_BRKPT; + si->svr4_si_trap = SVR4_T_BPTFLT; break; case T_ARITHTRAP: - si->si_code = SVR4_FPE_INTOVF; - si->si_trap = SVR4_T_DIVIDE; + si->svr4_si_code = SVR4_FPE_INTOVF; + si->svr4_si_trap = SVR4_T_DIVIDE; break; case T_PROTFLT: - si->si_code = SVR4_SEGV_ACCERR; - si->si_trap = SVR4_T_PROTFLT; + si->svr4_si_code = SVR4_SEGV_ACCERR; + si->svr4_si_trap = SVR4_T_PROTFLT; break; case T_TRCTRAP: - si->si_code = SVR4_TRAP_TRACE; - si->si_trap = SVR4_T_TRCTRAP; + si->svr4_si_code = SVR4_TRAP_TRACE; + si->svr4_si_trap = SVR4_T_TRCTRAP; break; case T_PAGEFLT: - si->si_code = SVR4_SEGV_ACCERR; - si->si_trap = SVR4_T_PAGEFLT; + si->svr4_si_code = SVR4_SEGV_ACCERR; + si->svr4_si_trap = SVR4_T_PAGEFLT; break; case T_ALIGNFLT: - si->si_code = SVR4_BUS_ADRALN; - si->si_trap = SVR4_T_ALIGNFLT; + si->svr4_si_code = SVR4_BUS_ADRALN; + si->svr4_si_trap = SVR4_T_ALIGNFLT; break; case T_DIVIDE: - si->si_code = SVR4_FPE_FLTDIV; - si->si_trap = SVR4_T_DIVIDE; + si->svr4_si_code = SVR4_FPE_FLTDIV; + si->svr4_si_trap = SVR4_T_DIVIDE; break; case T_OFLOW: - si->si_code = SVR4_FPE_FLTOVF; - si->si_trap = SVR4_T_DIVIDE; + si->svr4_si_code = SVR4_FPE_FLTOVF; + si->svr4_si_trap = SVR4_T_DIVIDE; break; case T_BOUND: - si->si_code = SVR4_FPE_FLTSUB; - si->si_trap = SVR4_T_BOUND; + si->svr4_si_code = SVR4_FPE_FLTSUB; + si->svr4_si_trap = SVR4_T_BOUND; break; case T_DNA: - si->si_code = SVR4_FPE_FLTINV; - si->si_trap = SVR4_T_DNA; + si->svr4_si_code = SVR4_FPE_FLTINV; + si->svr4_si_trap = SVR4_T_DNA; break; case T_FPOPFLT: - si->si_code = SVR4_FPE_FLTINV; - si->si_trap = SVR4_T_FPOPFLT; + si->svr4_si_code = SVR4_FPE_FLTINV; + si->svr4_si_trap = SVR4_T_FPOPFLT; break; case T_SEGNPFLT: - si->si_code = SVR4_SEGV_MAPERR; - si->si_trap = SVR4_T_SEGNPFLT; + si->svr4_si_code = SVR4_SEGV_MAPERR; + si->svr4_si_trap = SVR4_T_SEGNPFLT; break; case T_STKFLT: - si->si_code = SVR4_ILL_BADSTK; - si->si_trap = SVR4_T_STKFLT; + si->svr4_si_code = SVR4_ILL_BADSTK; + si->svr4_si_trap = SVR4_T_STKFLT; break; default: - si->si_code = 0; - si->si_trap = 0; + si->svr4_si_code = 0; + si->svr4_si_trap = 0; #ifdef DIAGNOSTIC printf("sig %d code %ld\n", sig, code); panic("svr4_getsiginfo"); @@ -355,7 +355,7 @@ svr4_sendsig(catcher, sig, mask, code) svr4_getcontext(p, &frame.sf_uc, mask, oonstack); svr4_getsiginfo(&frame.sf_si, sig, code, (caddr_t) tf->tf_eip); - frame.sf_signum = frame.sf_si.si_signo; + frame.sf_signum = frame.sf_si.svr4_si_signo; frame.sf_sip = &fp->sf_si; frame.sf_ucp = &fp->sf_uc; frame.sf_handler = catcher; |