d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

syscalls: struct ucontext4 -> struct freebsd4_ucontext

Browse Source 
This aligns with struct freebsd4_ucontext32 in freebsd32.

Reviewed by:	kib
This commit is contained in:
Brooks Davis 2021-11-22 22:36:54 +00:00
parent e58e9a8cbd
commit 717e7fb27a
6 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sys/i386/i386/exec_machdep.c
View File

@ -653,9 +653,9 @@ osigreturn(struct thread *td, struct osigreturn_args *uap)
int
freebsd4_sigreturn(struct thread *td, struct freebsd4_sigreturn_args *uap)
{
struct ucontext4 uc;
struct freebsd4_ucontext uc;
struct trapframe *regs;
struct ucontext4 *ucp;
struct freebsd4_ucontext *ucp;
int cs, eflags, error;
ksiginfo_t ksi;

4
sys/i386/i386/genassym.c
View File

@ -171,8 +171,8 @@ ASSYM(SC_GS, offsetof(struct osigcontext, sc_gs));
ASSYM(SC_TRAPNO, offsetof(struct osigcontext, sc_trapno));
#endif
#ifdef COMPAT_FREEBSD4
ASSYM(UC4_EFLAGS, offsetof(struct ucontext4, uc_mcontext.mc_eflags));
ASSYM(UC4_GS, offsetof(struct ucontext4, uc_mcontext.mc_gs));
ASSYM(UC4_EFLAGS, offsetof(struct freebsd4_ucontext, uc_mcontext.mc_eflags));
ASSYM(UC4_GS, offsetof(struct freebsd4_ucontext, uc_mcontext.mc_gs));
#endif
ASSYM(UC_EFLAGS, offsetof(ucontext_t, uc_mcontext.mc_eflags));
ASSYM(UC_GS, offsetof(ucontext_t, uc_mcontext.mc_gs));

2
sys/i386/include/sigframe.h
View File

@ -85,7 +85,7 @@ struct sigframe4 {
__siginfohandler_t *sf_action;
__sighandler_t *sf_handler;
} sf_ahu;
struct ucontext4 sf_uc; /* = *sf_ucontext */
struct freebsd4_ucontext sf_uc; /* = *sf_ucontext */
siginfo_t sf_si; /* = *sf_siginfo (SA_SIGINFO case) */
};
#endif

2
sys/kern/syscalls.master
View File

@ -1777,7 +1777,7 @@
}
344 AUE_SIGRETURN COMPAT4|CAPENABLED {
int sigreturn(
_In_ const struct ucontext4 *sigcntxp
_In_ const struct freebsd4_ucontext *sigcntxp
);
}
345 AUE_SIGWAIT STD|CAPENABLED {

6
sys/sys/ucontext.h
View File

@ -41,15 +41,15 @@
#if defined(_KERNEL) && defined(COMPAT_FREEBSD4)
#if defined(__i386__)
struct ucontext4 {
struct freebsd4_ucontext {
sigset_t uc_sigmask;
struct mcontext4 uc_mcontext;
struct ucontext4 *uc_link;
struct freebsd4_ucontext *uc_link;
stack_t uc_stack;
int __spare__[8];
};
#else /* __i386__ */
#define ucontext4 ucontext
#define freebsd4_ucontext ucontext
#endif /* __i386__ */
#endif /* _KERNEL */

2
tools/tools/shlib-compat/makesyscalls-fake.sh
View File

@ -82,7 +82,7 @@ s/\$//g
printf "struct msqid_ds_old;\n"
printf "struct shmid_ds_old;\n"
# TODO
printf "struct ucontext4;\n"
printf "struct freebsd4_ucontext;\n"
printf "struct sctp_sndrcvinfo;\n"
printf "\n"
}