diff options
| author | Laurent Vivier <laurent@vivier.eu> | 2018-04-11 21:23:47 +0200 |
|---|---|---|
| committer | Laurent Vivier <laurent@vivier.eu> | 2018-05-03 18:29:15 +0200 |
| commit | 465e237bf7cb6a9d8f9f137508125a14efcce1d6 (patch) | |
| tree | 1eaf5f3576d7f080b2a664466582975ae81ae986 /linux-user/s390x | |
| parent | e8fa72957419c11984608062c7dcb204a6003a06 (diff) | |
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/s390x')
| -rw-r--r-- | linux-user/s390x/signal.c | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/linux-user/s390x/signal.c b/linux-user/s390x/signal.c index a204a85e4a..e35cbe6870 100644 --- a/linux-user/s390x/signal.c +++ b/linux-user/s390x/signal.c @@ -86,14 +86,11 @@ get_sigframe(struct target_sigaction *ka, CPUS390XState *env, size_t frame_size) abi_ulong sp; /* Default to using normal stack */ - sp = env->regs[15]; + sp = get_sp_from_cpustate(env); /* This is the X/Open sanctioned signal stack switching. */ if (ka->sa_flags & TARGET_SA_ONSTACK) { - if (!sas_ss_flags(sp)) { - sp = target_sigaltstack_used.ss_sp + - target_sigaltstack_used.ss_size; - } + sp = target_sigsp(sp, ka); } /* This is the legacy signal stack switching. */ @@ -205,10 +202,7 @@ void setup_rt_frame(int sig, struct target_sigaction *ka, /* Create the ucontext. */ __put_user(0, &frame->uc.tuc_flags); __put_user((abi_ulong)0, (abi_ulong *)&frame->uc.tuc_link); - __put_user(target_sigaltstack_used.ss_sp, &frame->uc.tuc_stack.ss_sp); - __put_user(sas_ss_flags(get_sp_from_cpustate(env)), - &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); save_sigregs(env, &frame->uc.tuc_mcontext); for (i = 0; i < TARGET_NSIG_WORDS; i++) { __put_user((abi_ulong)set->sig[i], |