Commit efdb03e9 authored by John Baldwin's avatar John Baldwin
Browse files

Rename struct sigframe4 to struct freebsd4_sigframe.

Reviewed by:	brooks, imp, kib
Sponsored by:	The University of Cambridge, Google Inc.
Differential Revision:	https://reviews.freebsd.org/D33881
parent 71ec998a
...@@ -256,7 +256,7 @@ osendsig(sig_t catcher, ksiginfo_t *ksi, sigset_t *mask) ...@@ -256,7 +256,7 @@ osendsig(sig_t catcher, ksiginfo_t *ksi, sigset_t *mask)
static void static void
freebsd4_sendsig(sig_t catcher, ksiginfo_t *ksi, sigset_t *mask) freebsd4_sendsig(sig_t catcher, ksiginfo_t *ksi, sigset_t *mask)
{ {
struct sigframe4 sf, *sfp; struct freebsd4_sigframe sf, *sfp;
struct proc *p; struct proc *p;
struct thread *td; struct thread *td;
struct sigacts *psp; struct sigacts *psp;
...@@ -291,13 +291,13 @@ freebsd4_sendsig(sig_t catcher, ksiginfo_t *ksi, sigset_t *mask) ...@@ -291,13 +291,13 @@ freebsd4_sendsig(sig_t catcher, ksiginfo_t *ksi, sigset_t *mask)
/* Allocate space for the signal handler context. */ /* Allocate space for the signal handler context. */
if ((td->td_pflags & TDP_ALTSTACK) != 0 && !oonstack && if ((td->td_pflags & TDP_ALTSTACK) != 0 && !oonstack &&
SIGISMEMBER(psp->ps_sigonstack, sig)) { SIGISMEMBER(psp->ps_sigonstack, sig)) {
sfp = (struct sigframe4 *)((uintptr_t)td->td_sigstk.ss_sp + sfp = (struct freebsd4_sigframe *)((uintptr_t)td->td_sigstk.ss_sp +
td->td_sigstk.ss_size - sizeof(struct sigframe4)); td->td_sigstk.ss_size - sizeof(struct freebsd4_sigframe));
#if defined(COMPAT_43) #if defined(COMPAT_43)
td->td_sigstk.ss_flags |= SS_ONSTACK; td->td_sigstk.ss_flags |= SS_ONSTACK;
#endif #endif
} else } else
sfp = (struct sigframe4 *)regs->tf_esp - 1; sfp = (struct freebsd4_sigframe *)regs->tf_esp - 1;
/* Build the argument list for the signal handler. */ /* Build the argument list for the signal handler. */
sf.sf_signum = sig; sf.sf_signum = sig;
......
...@@ -162,7 +162,7 @@ ASSYM(SIGF_SC, offsetof(struct osigframe, sf_siginfo.si_sc)); ...@@ -162,7 +162,7 @@ ASSYM(SIGF_SC, offsetof(struct osigframe, sf_siginfo.si_sc));
#endif #endif
ASSYM(SIGF_UC, offsetof(struct sigframe, sf_uc)); ASSYM(SIGF_UC, offsetof(struct sigframe, sf_uc));
#ifdef COMPAT_FREEBSD4 #ifdef COMPAT_FREEBSD4
ASSYM(SIGF_UC4, offsetof(struct sigframe4, sf_uc)); ASSYM(SIGF_UC4, offsetof(struct freebsd4_sigframe, sf_uc));
#endif #endif
#ifdef COMPAT_43 #ifdef COMPAT_43
ASSYM(SC_PS, offsetof(struct osigcontext, sc_ps)); ASSYM(SC_PS, offsetof(struct osigcontext, sc_ps));
......
...@@ -75,7 +75,7 @@ struct osigframe { ...@@ -75,7 +75,7 @@ struct osigframe {
#endif #endif
#ifdef COMPAT_FREEBSD4 #ifdef COMPAT_FREEBSD4
/* FreeBSD 4.x */ /* FreeBSD 4.x */
struct sigframe4 { struct freebsd4_sigframe {
register_t sf_signum; register_t sf_signum;
register_t sf_siginfo; /* code or pointer to sf_si */ register_t sf_siginfo; /* code or pointer to sf_si */
register_t sf_ucontext; /* points to sf_uc */ register_t sf_ucontext; /* points to sf_uc */
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment