mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

linux-user/alpha: Share code for TARGET_NR_sigaction

Browse Source 
There's no longer a difference between the alpha code and
the generic code.

There is a type difference in target_old_sigaction.sa_flags,
which can be resolved with a very much smaller ifdef, which
allows us to finish sharing the target_sigaction definition.

Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Message-Id: <20210422230227.314751-7-richard.henderson@linaro.org>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
This commit is contained in:
Richard Henderson 2021-04-22 16:02:26 -07:00 committed by Laurent Vivier
parent 0f6f99032e
commit 02d0de101c
2 changed files with 7 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
linux-user/syscall.c
View File

@ -8980,28 +8980,7 @@ static abi_long do_syscall1(void *cpu_env, int num, abi_long arg1,
#ifdef TARGET_NR_sigaction #ifdef TARGET_NR_sigaction
case TARGET_NR_sigaction: case TARGET_NR_sigaction:
{ {
#if defined(TARGET_ALPHA) #if defined(TARGET_MIPS)
struct target_sigaction act, oact, *pact = 0;
struct target_old_sigaction *old_act;
if (arg2) {
if (!lock_user_struct(VERIFY_READ, old_act, arg2, 1))
return -TARGET_EFAULT;
act._sa_handler = old_act->_sa_handler;
target_siginitset(&act.sa_mask, old_act->sa_mask);
act.sa_flags = old_act->sa_flags;
unlock_user_struct(old_act, arg2, 0);
pact = &act;
}
ret = get_errno(do_sigaction(arg1, pact, &oact, 0));
if (!is_error(ret) && arg3) {
if (!lock_user_struct(VERIFY_WRITE, old_act, arg3, 0))
return -TARGET_EFAULT;
old_act->_sa_handler = oact._sa_handler;
old_act->sa_mask = oact.sa_mask.sig[0];
old_act->sa_flags = oact.sa_flags;
unlock_user_struct(old_act, arg3, 1);
}
#elif defined(TARGET_MIPS)
struct target_sigaction act, oact, *pact, *old_act; struct target_sigaction act, oact, *pact, *old_act;
if (arg2) { if (arg2) {

21
linux-user/syscall_defs.h
View File

@ -501,21 +501,12 @@ int do_sigaction(int sig, const struct target_sigaction *act,
#endif #endif
#if defined(TARGET_ALPHA) #if defined(TARGET_ALPHA)
struct target_old_sigaction { typedef int32_t target_old_sa_flags;
abi_ulong _sa_handler; #else
abi_ulong sa_mask; typedef abi_ulong target_old_sa_flags;
int32_t sa_flags; #endif
};
/* This is the struct used inside the kernel. The ka_restorer #if defined(TARGET_MIPS)
field comes from the 5th argument to sys_rt_sigaction. */
struct target_sigaction {
abi_ulong _sa_handler;
abi_ulong sa_flags;
target_sigset_t sa_mask;
abi_ulong ka_restorer;
};
#elif defined(TARGET_MIPS)
struct target_sigaction { struct target_sigaction {
uint32_t sa_flags; uint32_t sa_flags;
#if defined(TARGET_ABI_MIPSN32) #if defined(TARGET_ABI_MIPSN32)
@ -533,7 +524,7 @@ struct target_sigaction {
struct target_old_sigaction { struct target_old_sigaction {
abi_ulong _sa_handler; abi_ulong _sa_handler;
abi_ulong sa_mask; abi_ulong sa_mask;
abi_ulong sa_flags; target_old_sa_flags sa_flags;
#ifdef TARGET_ARCH_HAS_SA_RESTORER #ifdef TARGET_ARCH_HAS_SA_RESTORER
abi_ulong sa_restorer; abi_ulong sa_restorer;
#endif #endif