summaryrefslogtreecommitdiff
path: root/linux-user/xtensa
diff options
context:
space:
mode:
authorLaurent Vivier <laurent@vivier.eu>2018-04-11 21:23:47 +0200
committerLaurent Vivier <laurent@vivier.eu>2018-05-03 18:29:15 +0200
commit465e237bf7cb6a9d8f9f137508125a14efcce1d6 (patch)
tree1eaf5f3576d7f080b2a664466582975ae81ae986 /linux-user/xtensa
parente8fa72957419c11984608062c7dcb204a6003a06 (diff)
downloadqemu-465e237bf7cb6a9d8f9f137508125a14efcce1d6.tar.gz
linux-user: introduce target_sigsp() and target_save_altstack()
Signed-off-by: Laurent Vivier <laurent@vivier.eu> Reviewed-by: Richard Henderson <richard.henderson@linaro.org> Message-Id: <20180411192347.30228-1-laurent@vivier.eu>
Diffstat (limited to 'linux-user/xtensa')
-rw-r--r--linux-user/xtensa/signal.c15
1 files changed, 4 insertions, 11 deletions
diff --git a/linux-user/xtensa/signal.c b/linux-user/xtensa/signal.c
index 1e98910c1b..3e483efc61 100644
--- a/linux-user/xtensa/signal.c
+++ b/linux-user/xtensa/signal.c
@@ -55,12 +55,10 @@ static abi_ulong get_sigframe(struct target_sigaction *sa,
CPUXtensaState *env,
unsigned long framesize)
{
- abi_ulong sp = env->regs[1];
+ abi_ulong sp;
+
+ sp = target_sigsp(get_sp_from_cpustate(env), sa);
- /* This is the X/Open sanctioned signal stack switching. */
- if ((sa->sa_flags & TARGET_SA_ONSTACK) != 0 && !sas_ss_flags(sp)) {
- sp = target_sigaltstack_used.ss_sp + target_sigaltstack_used.ss_size;
- }
return (sp - framesize) & -16;
}
@@ -152,12 +150,7 @@ void setup_rt_frame(int sig, struct target_sigaction *ka,
__put_user(0, &frame->uc.tuc_flags);
__put_user(0, &frame->uc.tuc_link);
- __put_user(target_sigaltstack_used.ss_sp,
- &frame->uc.tuc_stack.ss_sp);
- __put_user(sas_ss_flags(env->regs[1]),
- &frame->uc.tuc_stack.ss_flags);
- __put_user(target_sigaltstack_used.ss_size,
- &frame->uc.tuc_stack.ss_size);
+ target_save_altstack(&frame->uc.tuc_stack, env);
if (!setup_sigcontext(frame, env)) {
unlock_user_struct(frame, frame_addr, 0);
goto give_sigsegv;