From: Richard Henderson <richard.henderson@linaro.org>
To: qemu-devel@nongnu.org
Subject: [PATCH v2 03/25] linux-user: Pass CPUArchState to do_sigaltstack
Date: Sun, 25 Apr 2021 19:53:12 -0700 [thread overview]
Message-ID: <20210426025334.1168495-4-richard.henderson@linaro.org> (raw)
In-Reply-To: <20210426025334.1168495-1-richard.henderson@linaro.org>
Now that we have exactly one call, it's easy to pass
in env instead of passing in the sp value.
Use target_save_altstack, which required env.
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
linux-user/qemu.h | 3 ++-
linux-user/signal.c | 11 ++++-------
linux-user/syscall.c | 3 +--
3 files changed, 7 insertions(+), 10 deletions(-)
diff --git a/linux-user/qemu.h b/linux-user/qemu.h
index 74e06e7121..3b0b6b75fe 100644
--- a/linux-user/qemu.h
+++ b/linux-user/qemu.h
@@ -432,7 +432,8 @@ int target_to_host_signal(int sig);
int host_to_target_signal(int sig);
long do_sigreturn(CPUArchState *env);
long do_rt_sigreturn(CPUArchState *env);
-abi_long do_sigaltstack(abi_ulong uss_addr, abi_ulong uoss_addr, abi_ulong sp);
+abi_long do_sigaltstack(abi_ulong uss_addr, abi_ulong uoss_addr,
+ CPUArchState *env);
int do_sigprocmask(int how, const sigset_t *set, sigset_t *oldset);
abi_long do_swapcontext(CPUArchState *env, abi_ulong uold_ctx,
abi_ulong unew_ctx, abi_long ctx_size);
diff --git a/linux-user/signal.c b/linux-user/signal.c
index 306f3edec5..83891f7c47 100644
--- a/linux-user/signal.c
+++ b/linux-user/signal.c
@@ -800,21 +800,18 @@ static void host_signal_handler(int host_signum, siginfo_t *info,
/* do_sigaltstack() returns target values and errnos. */
/* compare linux/kernel/signal.c:do_sigaltstack() */
-abi_long do_sigaltstack(abi_ulong uss_addr, abi_ulong uoss_addr, abi_ulong sp)
+abi_long do_sigaltstack(abi_ulong uss_addr, abi_ulong uoss_addr,
+ CPUArchState *env)
{
target_stack_t oss, *uoss = NULL;
abi_long ret = -TARGET_EFAULT;
if (uoss_addr) {
- TaskState *ts = (TaskState *)thread_cpu->opaque;
-
/* Verify writability now, but do not alter user memory yet. */
if (!lock_user_struct(VERIFY_WRITE, uoss, uoss_addr, 0)) {
goto out;
}
- __put_user(ts->sigaltstack_used.ss_sp, &oss.ss_sp);
- __put_user(ts->sigaltstack_used.ss_size, &oss.ss_size);
- __put_user(sas_ss_flags(sp), &oss.ss_flags);
+ target_save_altstack(&oss, env);
}
if (uss_addr) {
@@ -823,7 +820,7 @@ abi_long do_sigaltstack(abi_ulong uss_addr, abi_ulong uoss_addr, abi_ulong sp)
if (!lock_user_struct(VERIFY_READ, uss, uss_addr, 1)) {
goto out;
}
- ret = target_restore_altstack(uss, sp);
+ ret = target_restore_altstack(uss, get_sp_from_cpustate(env));
if (ret) {
goto out;
}
diff --git a/linux-user/syscall.c b/linux-user/syscall.c
index c7c3257f40..32a41c1387 100644
--- a/linux-user/syscall.c
+++ b/linux-user/syscall.c
@@ -11140,8 +11140,7 @@ static abi_long do_syscall1(void *cpu_env, int num, abi_long arg1,
return ret;
}
case TARGET_NR_sigaltstack:
- return do_sigaltstack(arg1, arg2,
- get_sp_from_cpustate((CPUArchState *)cpu_env));
+ return do_sigaltstack(arg1, arg2, cpu_env);
#ifdef CONFIG_SENDFILE
#ifdef TARGET_NR_sendfile
--
2.25.1
next prev parent reply other threads:[~2021-04-26 2:58 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-26 2:53 [PATCH v2 00/25] linux-user/sparc: Implement rt signals Richard Henderson
2021-04-26 2:53 ` [PATCH v2 01/25] linux-user: Split out target_restore_altstack Richard Henderson
2021-04-26 2:53 ` [PATCH v2 02/25] linux-user: Use target_restore_altstack in all sigreturn Richard Henderson
2021-04-26 2:53 ` Richard Henderson [this message]
2021-04-26 2:53 ` [PATCH v2 04/25] linux-user: Pass CPUArchState to target_restore_altstack Richard Henderson
2021-04-26 2:53 ` [PATCH v2 05/25] linux-user/sparc: Include TARGET_STACK_BIAS in get_sp_from_cpustate Richard Henderson
2021-04-26 2:53 ` [PATCH v2 06/25] linux-user/sparc: Clean up init_thread Richard Henderson
2021-04-26 2:53 ` [PATCH v2 07/25] linux-user/sparc: Merge sparc64 target_syscall.h Richard Henderson
2021-05-17 10:21 ` Laurent Vivier
2021-05-17 17:35 ` Richard Henderson
2021-04-26 2:53 ` [PATCH v2 08/25] linux-user/sparc: Merge sparc64 target_elf.h Richard Henderson
2021-04-26 2:53 ` [PATCH v2 09/25] linux-user/sparc: Merge sparc64 target_structs.h Richard Henderson
2021-04-26 2:53 ` [PATCH v2 10/25] linux-user/sparc: Merge sparc64 termbits.h Richard Henderson
2021-04-26 2:53 ` [PATCH v2 11/25] linux-user/sparc: Merge sparc64/ into sparc/ Richard Henderson
2021-04-26 2:53 ` [PATCH v2 12/25] linux-user/sparc: Remove target_sigcontext as unused Richard Henderson
2021-04-26 2:53 ` [PATCH v2 13/25] linux-user/sparc: Remove target_rt_signal_frame " Richard Henderson
2021-04-26 2:53 ` [PATCH v2 14/25] linux-user/sparc: Fix the stackframe structure Richard Henderson
2021-04-26 2:53 ` [PATCH v2 15/25] linux-user/sparc: Use target_pt_regs Richard Henderson
2021-04-26 2:53 ` [PATCH v2 16/25] linux-user/sparc: Split out save_reg_win Richard Henderson
2021-04-26 2:53 ` [PATCH v2 17/25] linux-user/sparc: Clean up get_sigframe Richard Henderson
2021-04-26 2:53 ` [PATCH v2 18/25] linux-user/sparc: Save and restore fpu in signal frame Richard Henderson
2021-04-26 2:53 ` [PATCH v2 19/25] linux-user/sparc: Add rwin_save to " Richard Henderson
2021-04-26 2:53 ` [PATCH v2 20/25] linux-user/sparc: Clean up setup_frame Richard Henderson
2021-04-26 2:53 ` [PATCH v2 21/25] linux-user/sparc: Minor corrections to do_sigreturn Richard Henderson
2021-04-26 2:53 ` [PATCH v2 22/25] linux-user/sparc: Add 64-bit support to fpu save/restore Richard Henderson
2021-04-26 2:53 ` [PATCH v2 23/25] linux-user/sparc: Implement sparc32 rt signals Richard Henderson
2021-04-26 2:53 ` [PATCH v2 24/25] linux-user/sparc: Implement sparc64 " Richard Henderson
2021-04-26 2:53 ` [PATCH v2 25/25] tests/tcg/sparc64: Re-enable linux-test Richard Henderson
2021-04-26 3:06 ` [PATCH v2 00/25] linux-user/sparc: Implement rt signals Richard Henderson
2021-04-26 11:41 ` Alex Bennée
2021-05-15 19:43 ` Laurent Vivier
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210426025334.1168495-4-richard.henderson@linaro.org \
--to=richard.henderson@linaro.org \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).