vitalif
/
mirror_qemu
mirror of https://github.com/proxmox/mirror_qemu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

linux-user/alpha: Define TARGET_ARCH_HAS_KA_RESTORER 

This means that we can share the TARGET_NR_rt_sigaction code,
and the target_rt_sigaction structure is unused.  Untangling
the ifdefs so that target_sigaction can be shared will wait
until the next patch.

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

1
linux-user/alpha/target_signal.h
View File

@ -92,6 +92,7 @@ typedef struct target_sigaltstack {
#define TARGET_GEN_SUBRNG7 -25 #define TARGET_GEN_SUBRNG7 -25
#define TARGET_ARCH_HAS_SETUP_FRAME #define TARGET_ARCH_HAS_SETUP_FRAME
#define TARGET_ARCH_HAS_KA_RESTORER
/* bit-flags */ /* bit-flags */
#define TARGET_SS_AUTODISARM (1U << 31) /* disable sas during sighandling */ #define TARGET_SS_AUTODISARM (1U << 31) /* disable sas during sighandling */

37
linux-user/syscall.c
View File

@ -9064,41 +9064,17 @@ static abi_long do_syscall1(void *cpu_env, int num, abi_long arg1,
#endif #endif
case TARGET_NR_rt_sigaction: case TARGET_NR_rt_sigaction:
{ {
#if defined(TARGET_ALPHA) /*
/* For Alpha and SPARC this is a 5 argument syscall, with * For Alpha and SPARC this is a 5 argument syscall, with
* a 'restorer' parameter which must be copied into the * a 'restorer' parameter which must be copied into the
* sa_restorer field of the sigaction struct. * sa_restorer field of the sigaction struct.
* For Alpha that 'restorer' is arg5; for SPARC it is arg4, * For Alpha that 'restorer' is arg5; for SPARC it is arg4,
* and arg5 is the sigsetsize. * and arg5 is the sigsetsize.
* Alpha also has a separate rt_sigaction struct that it uses
* here; SPARC uses the usual sigaction struct.
*/ */
struct target_rt_sigaction *rt_act; #if defined(TARGET_ALPHA)
struct target_sigaction act, oact, *pact = 0; target_ulong sigsetsize = arg4;
target_ulong restorer = arg5;
if (arg4 != sizeof(target_sigset_t)) { #elif defined(TARGET_SPARC)
return -TARGET_EINVAL;
}
if (arg2) {
if (!lock_user_struct(VERIFY_READ, rt_act, arg2, 1))
return -TARGET_EFAULT;
act._sa_handler = rt_act->_sa_handler;
act.sa_mask = rt_act->sa_mask;
act.sa_flags = rt_act->sa_flags;
unlock_user_struct(rt_act, arg2, 0);
pact = &act;
}
ret = get_errno(do_sigaction(arg1, pact, &oact, arg5));
if (!is_error(ret) && arg3) {
if (!lock_user_struct(VERIFY_WRITE, rt_act, arg3, 0))
return -TARGET_EFAULT;
rt_act->_sa_handler = oact._sa_handler;
rt_act->sa_mask = oact.sa_mask;
rt_act->sa_flags = oact.sa_flags;
unlock_user_struct(rt_act, arg3, 1);
}
#else
#ifdef TARGET_SPARC
target_ulong restorer = arg4; target_ulong restorer = arg4;
target_ulong sigsetsize = arg5; target_ulong sigsetsize = arg5;
#else #else
@ -9131,7 +9107,6 @@ static abi_long do_syscall1(void *cpu_env, int num, abi_long arg1,
unlock_user_struct(act, arg2, 0); unlock_user_struct(act, arg2, 0);
if (oact) if (oact)
unlock_user_struct(oact, arg3, 1); unlock_user_struct(oact, arg3, 1);
#endif
} }
return ret; return ret;
#ifdef TARGET_NR_sgetmask /* not on alpha */ #ifdef TARGET_NR_sgetmask /* not on alpha */

6
linux-user/syscall_defs.h
View File

@ -507,12 +507,6 @@ struct target_old_sigaction {
int32_t sa_flags; int32_t sa_flags;
}; };
struct target_rt_sigaction {
abi_ulong _sa_handler;
abi_ulong sa_flags;
target_sigset_t sa_mask;
};
/* This is the struct used inside the kernel. The ka_restorer /* This is the struct used inside the kernel. The ka_restorer
field comes from the 5th argument to sys_rt_sigaction. */ field comes from the 5th argument to sys_rt_sigaction. */
struct target_sigaction { struct target_sigaction {