OpenE2K
/
qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

linux-user/arm: Drop "_v2" from symbols in signal.c 

Since we no longer support "v1", there's no need to distinguish "v2".

Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20210929130553.121567-5-richard.henderson@linaro.org>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
This commit is contained in:
Richard Henderson 2021-09-29 09:05:31 -04:00 committed by Laurent Vivier
parent eef9790007
commit b807a1087e
1 changed files with 65 additions and 90 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

155
linux-user/arm/signal.c
View File

@ -46,7 +46,7 @@ struct target_sigcontext {
abi_ulong fault_address; abi_ulong fault_address;
}; };
struct target_ucontext_v2 { struct target_ucontext {
abi_ulong tuc_flags; abi_ulong tuc_flags;
abi_ulong tuc_link; abi_ulong tuc_link;
target_stack_t tuc_stack; target_stack_t tuc_stack;
@ -90,16 +90,16 @@ struct target_iwmmxt_sigframe {
#define TARGET_VFP_MAGIC 0x56465001 #define TARGET_VFP_MAGIC 0x56465001
#define TARGET_IWMMXT_MAGIC 0x12ef842a #define TARGET_IWMMXT_MAGIC 0x12ef842a
struct sigframe_v2 struct sigframe
{ {
struct target_ucontext_v2 uc; struct target_ucontext uc;
abi_ulong retcode[4]; abi_ulong retcode[4];
}; };
struct rt_sigframe_v2 struct rt_sigframe
{ {
struct target_siginfo info; struct target_siginfo info;
struct target_ucontext_v2 uc; struct target_ucontext uc;
abi_ulong retcode[4]; abi_ulong retcode[4];
}; };
@ -270,7 +270,7 @@ setup_return(CPUARMState *env, struct target_sigaction *ka,
return 0; return 0;
} }
static abi_ulong *setup_sigframe_v2_vfp(abi_ulong *regspace, CPUARMState *env) static abi_ulong *setup_sigframe_vfp(abi_ulong *regspace, CPUARMState *env)
{ {
int i; int i;
struct target_vfp_sigframe *vfpframe; struct target_vfp_sigframe *vfpframe;
@ -287,8 +287,7 @@ static abi_ulong *setup_sigframe_v2_vfp(abi_ulong *regspace, CPUARMState *env)
return (abi_ulong*)(vfpframe+1); return (abi_ulong*)(vfpframe+1);
} }
static abi_ulong *setup_sigframe_v2_iwmmxt(abi_ulong *regspace, static abi_ulong *setup_sigframe_iwmmxt(abi_ulong *regspace, CPUARMState *env)
CPUARMState *env)
{ {
int i; int i;
struct target_iwmmxt_sigframe *iwmmxtframe; struct target_iwmmxt_sigframe *iwmmxtframe;
@ -307,15 +306,15 @@ static abi_ulong *setup_sigframe_v2_iwmmxt(abi_ulong *regspace,
return (abi_ulong*)(iwmmxtframe+1); return (abi_ulong*)(iwmmxtframe+1);
} }
static void setup_sigframe_v2(struct target_ucontext_v2 *uc, static void setup_sigframe(struct target_ucontext *uc,
target_sigset_t *set, CPUARMState *env) target_sigset_t *set, CPUARMState *env)
{ {
struct target_sigaltstack stack; struct target_sigaltstack stack;
int i; int i;
abi_ulong *regspace; abi_ulong *regspace;
/* Clear all the bits of the ucontext we don't use. */ /* Clear all the bits of the ucontext we don't use. */
memset(uc, 0, offsetof(struct target_ucontext_v2, tuc_mcontext)); memset(uc, 0, offsetof(struct target_ucontext, tuc_mcontext));
memset(&stack, 0, sizeof(stack)); memset(&stack, 0, sizeof(stack));
target_save_altstack(&stack, env); target_save_altstack(&stack, env);
@ -325,10 +324,10 @@ static void setup_sigframe_v2(struct target_ucontext_v2 *uc,
/* Save coprocessor signal frame. */ /* Save coprocessor signal frame. */
regspace = uc->tuc_regspace; regspace = uc->tuc_regspace;
if (cpu_isar_feature(aa32_vfp_simd, env_archcpu(env))) { if (cpu_isar_feature(aa32_vfp_simd, env_archcpu(env))) {
regspace = setup_sigframe_v2_vfp(regspace, env); regspace = setup_sigframe_vfp(regspace, env);
} }
if (arm_feature(env, ARM_FEATURE_IWMMXT)) { if (arm_feature(env, ARM_FEATURE_IWMMXT)) {
regspace = setup_sigframe_v2_iwmmxt(regspace, env); regspace = setup_sigframe_iwmmxt(regspace, env);
} }
/* Write terminating magic word */ /* Write terminating magic word */
@ -339,10 +338,10 @@ static void setup_sigframe_v2(struct target_ucontext_v2 *uc,
} }
} }
static void setup_frame_v2(int usig, struct target_sigaction *ka, void setup_frame(int usig, struct target_sigaction *ka,
target_sigset_t *set, CPUARMState *regs) target_sigset_t *set, CPUARMState *regs)
{ {
struct sigframe_v2 *frame; struct sigframe *frame;
abi_ulong frame_addr = get_sigframe(ka, regs, sizeof(*frame)); abi_ulong frame_addr = get_sigframe(ka, regs, sizeof(*frame));
trace_user_setup_frame(regs, frame_addr); trace_user_setup_frame(regs, frame_addr);
@ -350,10 +349,10 @@ static void setup_frame_v2(int usig, struct target_sigaction *ka,
goto sigsegv; goto sigsegv;
} }
setup_sigframe_v2(&frame->uc, set, regs); setup_sigframe(&frame->uc, set, regs);
if (setup_return(regs, ka, frame->retcode, frame_addr, usig, if (setup_return(regs, ka, frame->retcode, frame_addr, usig,
frame_addr + offsetof(struct sigframe_v2, retcode))) { frame_addr + offsetof(struct sigframe, retcode))) {
goto sigsegv; goto sigsegv;
} }
@ -364,51 +363,38 @@ sigsegv:
force_sigsegv(usig); force_sigsegv(usig);
} }
void setup_frame(int usig, struct target_sigaction *ka,
target_sigset_t *set, CPUARMState *regs)
{
setup_frame_v2(usig, ka, set, regs);
}
static void setup_rt_frame_v2(int usig, struct target_sigaction *ka,
target_siginfo_t *info,
target_sigset_t *set, CPUARMState *env)
{
struct rt_sigframe_v2 *frame;
abi_ulong frame_addr = get_sigframe(ka, env, sizeof(*frame));
abi_ulong info_addr, uc_addr;
trace_user_setup_rt_frame(env, frame_addr);
if (!lock_user_struct(VERIFY_WRITE, frame, frame_addr, 0)) {
goto sigsegv;
}
info_addr = frame_addr + offsetof(struct rt_sigframe_v2, info);
uc_addr = frame_addr + offsetof(struct rt_sigframe_v2, uc);
tswap_siginfo(&frame->info, info);
setup_sigframe_v2(&frame->uc, set, env);
if (setup_return(env, ka, frame->retcode, frame_addr, usig,
frame_addr + offsetof(struct rt_sigframe_v2, retcode))) {
goto sigsegv;
}
env->regs[1] = info_addr;
env->regs[2] = uc_addr;
unlock_user_struct(frame, frame_addr, 1);
return;
sigsegv:
unlock_user_struct(frame, frame_addr, 1);
force_sigsegv(usig);
}
void setup_rt_frame(int usig, struct target_sigaction *ka, void setup_rt_frame(int usig, struct target_sigaction *ka,
target_siginfo_t *info, target_siginfo_t *info,
target_sigset_t *set, CPUARMState *env) target_sigset_t *set, CPUARMState *env)
{ {
setup_rt_frame_v2(usig, ka, info, set, env); struct rt_sigframe *frame;
abi_ulong frame_addr = get_sigframe(ka, env, sizeof(*frame));
abi_ulong info_addr, uc_addr;
trace_user_setup_rt_frame(env, frame_addr);
if (!lock_user_struct(VERIFY_WRITE, frame, frame_addr, 0)) {
goto sigsegv;
}
info_addr = frame_addr + offsetof(struct rt_sigframe, info);
uc_addr = frame_addr + offsetof(struct rt_sigframe, uc);
tswap_siginfo(&frame->info, info);
setup_sigframe(&frame->uc, set, env);
if (setup_return(env, ka, frame->retcode, frame_addr, usig,
frame_addr + offsetof(struct rt_sigframe, retcode))) {
goto sigsegv;
}
env->regs[1] = info_addr;
env->regs[2] = uc_addr;
unlock_user_struct(frame, frame_addr, 1);
return;
sigsegv:
unlock_user_struct(frame, frame_addr, 1);
force_sigsegv(usig);
} }
static int static int
@ -441,7 +427,7 @@ restore_sigcontext(CPUARMState *env, struct target_sigcontext *sc)
return err; return err;
} }
static abi_ulong *restore_sigframe_v2_vfp(CPUARMState *env, abi_ulong *regspace) static abi_ulong *restore_sigframe_vfp(CPUARMState *env, abi_ulong *regspace)
{ {
int i; int i;
abi_ulong magic, sz; abi_ulong magic, sz;
@ -471,8 +457,8 @@ static abi_ulong *restore_sigframe_v2_vfp(CPUARMState *env, abi_ulong *regspace)
return (abi_ulong*)(vfpframe + 1); return (abi_ulong*)(vfpframe + 1);
} }
static abi_ulong *restore_sigframe_v2_iwmmxt(CPUARMState *env, static abi_ulong *restore_sigframe_iwmmxt(CPUARMState *env,
abi_ulong *regspace) abi_ulong *regspace)
{ {
int i; int i;
abi_ulong magic, sz; abi_ulong magic, sz;
@ -496,9 +482,9 @@ static abi_ulong *restore_sigframe_v2_iwmmxt(CPUARMState *env,
return (abi_ulong*)(iwmmxtframe + 1); return (abi_ulong*)(iwmmxtframe + 1);
} }
static int do_sigframe_return_v2(CPUARMState *env, static int do_sigframe_return(CPUARMState *env,
target_ulong context_addr, target_ulong context_addr,
struct target_ucontext_v2 *uc) struct target_ucontext *uc)
{ {
sigset_t host_set; sigset_t host_set;
abi_ulong *regspace; abi_ulong *regspace;
@ -506,19 +492,20 @@ static int do_sigframe_return_v2(CPUARMState *env,
target_to_host_sigset(&host_set, &uc->tuc_sigmask); target_to_host_sigset(&host_set, &uc->tuc_sigmask);
set_sigmask(&host_set); set_sigmask(&host_set);
if (restore_sigcontext(env, &uc->tuc_mcontext)) if (restore_sigcontext(env, &uc->tuc_mcontext)) {
return 1; return 1;
}
/* Restore coprocessor signal frame */ /* Restore coprocessor signal frame */
regspace = uc->tuc_regspace; regspace = uc->tuc_regspace;
if (cpu_isar_feature(aa32_vfp_simd, env_archcpu(env))) { if (cpu_isar_feature(aa32_vfp_simd, env_archcpu(env))) {
regspace = restore_sigframe_v2_vfp(env, regspace); regspace = restore_sigframe_vfp(env, regspace);
if (!regspace) { if (!regspace) {
return 1; return 1;
} }
} }
if (arm_feature(env, ARM_FEATURE_IWMMXT)) { if (arm_feature(env, ARM_FEATURE_IWMMXT)) {
regspace = restore_sigframe_v2_iwmmxt(env, regspace); regspace = restore_sigframe_iwmmxt(env, regspace);
if (!regspace) { if (!regspace) {
return 1; return 1;
} }
@ -535,10 +522,10 @@ static int do_sigframe_return_v2(CPUARMState *env,
return 0; return 0;
} }
static long do_sigreturn_v2(CPUARMState *env) long do_sigreturn(CPUARMState *env)
{ {
abi_ulong frame_addr; abi_ulong frame_addr;
struct sigframe_v2 *frame = NULL; struct sigframe *frame = NULL;
/* /*
* Since we stacked the signal on a 64-bit boundary, * Since we stacked the signal on a 64-bit boundary,
@ -555,10 +542,9 @@ static long do_sigreturn_v2(CPUARMState *env)
goto badframe; goto badframe;
} }
if (do_sigframe_return_v2(env, if (do_sigframe_return(env,
frame_addr frame_addr + offsetof(struct sigframe, uc),
+ offsetof(struct sigframe_v2, uc), &frame->uc)) {
&frame->uc)) {
goto badframe; goto badframe;
} }
@ -571,15 +557,10 @@ badframe:
return -TARGET_QEMU_ESIGRETURN; return -TARGET_QEMU_ESIGRETURN;
} }
long do_sigreturn(CPUARMState *env) long do_rt_sigreturn(CPUARMState *env)
{
return do_sigreturn_v2(env);
}
static long do_rt_sigreturn_v2(CPUARMState *env)
{ {
abi_ulong frame_addr; abi_ulong frame_addr;
struct rt_sigframe_v2 *frame = NULL; struct rt_sigframe *frame = NULL;
/* /*
* Since we stacked the signal on a 64-bit boundary, * Since we stacked the signal on a 64-bit boundary,
@ -596,10 +577,9 @@ static long do_rt_sigreturn_v2(CPUARMState *env)
goto badframe; goto badframe;
} }
if (do_sigframe_return_v2(env, if (do_sigframe_return(env,
frame_addr frame_addr + offsetof(struct rt_sigframe, uc),
+ offsetof(struct rt_sigframe_v2, uc), &frame->uc)) {
&frame->uc)) {
goto badframe; goto badframe;
} }
@ -611,8 +591,3 @@ badframe:
force_sig(TARGET_SIGSEGV); force_sig(TARGET_SIGSEGV);
return -TARGET_QEMU_ESIGRETURN; return -TARGET_QEMU_ESIGRETURN;
} }
long do_rt_sigreturn(CPUARMState *env)
{
return do_rt_sigreturn_v2(env);
}