summary refs log tree commit diff stats
path: root/linux-user/m68k/signal.c
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/m68k/signal.c
parente8fa72957419c11984608062c7dcb204a6003a06 (diff)
downloadfocaccia-qemu-465e237bf7cb6a9d8f9f137508125a14efcce1d6.tar.gz
focaccia-qemu-465e237bf7cb6a9d8f9f137508125a14efcce1d6.zip
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/m68k/signal.c')
-rw-r--r--linux-user/m68k/signal.c15
1 files changed, 3 insertions, 12 deletions
diff --git a/linux-user/m68k/signal.c b/linux-user/m68k/signal.c
index fc72468a81..5dd8bb5f99 100644
--- a/linux-user/m68k/signal.c
+++ b/linux-user/m68k/signal.c
@@ -117,14 +117,10 @@ static inline abi_ulong
 get_sigframe(struct target_sigaction *ka, CPUM68KState *regs,
              size_t frame_size)
 {
-    unsigned long sp;
+    abi_ulong sp;
 
-    sp = regs->aregs[7];
+    sp = target_sigsp(get_sp_from_cpustate(regs), ka);
 
-    /* This is the X/Open sanctioned signal stack switching.  */
-    if ((ka->sa_flags & TARGET_SA_ONSTACK) && (sas_ss_flags (sp) == 0)) {
-        sp = target_sigaltstack_used.ss_sp + target_sigaltstack_used.ss_size;
-    }
 
     return ((sp - frame_size) & -8UL);
 }
@@ -318,12 +314,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->aregs[7]),
-            &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);
     err |= target_rt_setup_ucontext(&frame->uc, env);
 
     if (err)