From: Laurent Vivier <laurent@vivier.eu>
To: qemu-devel@nongnu.org
Cc: "Richard Henderson" <richard.henderson@linaro.org>,
"Riku Voipio" <riku.voipio@iki.fi>,
"Mark Cave-Ayland" <mark.cave-ayland@ilande.co.uk>,
"Laurent Vivier" <laurent@vivier.eu>,
"Alex Bennée" <alex.bennee@linaro.org>,
"Artyom Tarasenko" <atar4qemu@gmail.com>
Subject: [PULL v2 07/13] linux-user/sparc: Use WREG_SP constant in sparc/signal.c
Date: Wed, 6 Nov 2019 14:04:50 +0100 [thread overview]
Message-ID: <20191106130456.6176-8-laurent@vivier.eu> (raw)
In-Reply-To: <20191106130456.6176-1-laurent@vivier.eu>
From: Richard Henderson <richard.henderson@linaro.org>
s/UREG_FP/WREG_SP/g
This is non-obvious because the UREG_FP constant is fact wrong.
However, the previous search-and-replace patch made it clear that
UREG_FP expands to WREG_O6, and we can see from the enumeration in
target/sparc/cpu.h that WREG_O6 is in fact WREG_SP, the stack pointer.
The UREG_SP define is unused; remove it.
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Laurent Vivier <laurent@vivier.eu>
Message-Id: <20191106113318.10226-7-richard.henderson@linaro.org>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
---
linux-user/sparc/signal.c | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/linux-user/sparc/signal.c b/linux-user/sparc/signal.c
index aac37da239c1..e05693f20432 100644
--- a/linux-user/sparc/signal.c
+++ b/linux-user/sparc/signal.c
@@ -104,9 +104,6 @@ struct target_rt_signal_frame {
qemu_siginfo_fpu_t fpu_state;
};
-#define UREG_FP WREG_O6
-#define UREG_SP WREG_I6
-
static inline abi_ulong get_sigframe(struct target_sigaction *sa,
CPUSPARCState *env,
unsigned long framesize)
@@ -201,7 +198,7 @@ void setup_frame(int sig, struct target_sigaction *ka,
goto sigsegv;
/* 3. signal handler back-trampoline and parameters */
- env->regwptr[UREG_FP] = sf_addr;
+ env->regwptr[WREG_SP] = sf_addr;
env->regwptr[WREG_O0] = sig;
env->regwptr[WREG_O1] = sf_addr +
offsetof(struct target_signal_frame, info);
@@ -255,7 +252,7 @@ long do_sigreturn(CPUSPARCState *env)
sigset_t host_set;
int i;
- sf_addr = env->regwptr[UREG_FP];
+ sf_addr = env->regwptr[WREG_SP];
trace_user_do_sigreturn(env, sf_addr);
if (!lock_user_struct(VERIFY_READ, sf, sf_addr, 1)) {
goto segv_and_exit;
--
2.21.0
next prev parent reply other threads:[~2019-11-06 13:13 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-06 13:04 [PULL v2 00/13] Linux user for 4.2 patches Laurent Vivier
2019-11-06 13:04 ` [PULL v2 01/13] linux-user: Support for NETLINK socket options Laurent Vivier
2019-11-12 10:11 ` Peter Maydell
2019-11-12 10:30 ` Laurent Vivier
2019-11-06 13:04 ` [PULL v2 02/13] scripts/qemu-binfmt-conf: Update for sparc64 Laurent Vivier
2019-11-06 13:04 ` [PULL v2 03/13] tests/tcg/multiarch/linux-test: Fix error check for shmat Laurent Vivier
2019-11-06 13:04 ` [PULL v2 04/13] target/sparc: Define an enumeration for accessing env->regwptr Laurent Vivier
2019-11-06 13:04 ` [PULL v2 05/13] linux-user/sparc: Use WREG constants in sparc/target_cpu.h Laurent Vivier
2019-11-06 13:04 ` [PULL v2 06/13] linux-user/sparc: Begin using WREG constants in sparc/signal.c Laurent Vivier
2019-11-06 13:04 ` Laurent Vivier [this message]
2019-11-06 13:04 ` [PULL v2 08/13] linux-user/sparc: Fix WREG usage in setup_frame Laurent Vivier
2019-11-06 13:04 ` [PULL v2 09/13] linux-user/sparc64: Fix target_signal_frame Laurent Vivier
2019-11-06 13:04 ` [PULL v2 10/13] linux-user: Rename cpu_clone_regs to cpu_clone_regs_child Laurent Vivier
2019-11-06 13:04 ` [PULL v2 11/13] linux-user: Introduce cpu_clone_regs_parent Laurent Vivier
2019-11-06 13:04 ` [PULL v2 12/13] linux-user/sparc: Fix cpu_clone_regs_* Laurent Vivier
2019-11-06 13:04 ` [PULL v2 13/13] linux-user/alpha: Set r20 secondary return value Laurent Vivier
2019-11-06 19:10 ` [PULL v2 00/13] Linux user for 4.2 patches no-reply
2019-11-06 22:04 ` Peter Maydell
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=20191106130456.6176-8-laurent@vivier.eu \
--to=laurent@vivier.eu \
--cc=alex.bennee@linaro.org \
--cc=atar4qemu@gmail.com \
--cc=mark.cave-ayland@ilande.co.uk \
--cc=qemu-devel@nongnu.org \
--cc=richard.henderson@linaro.org \
--cc=riku.voipio@iki.fi \
/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).