From: Laurent Vivier <laurent@vivier.eu>
To: Richard Henderson <richard.henderson@linaro.org>, qemu-devel@nongnu.org
Cc: alex.bennee@linaro.org
Subject: Re: [PATCH v2 06/12] linux-user/sparc: Use WREG_SP constant in sparc/signal.c
Date: Tue, 5 Nov 2019 10:50:13 +0100 [thread overview]
Message-ID: <eb2f67f4-f7eb-d46e-02f1-fd0c424fc0d9@vivier.eu> (raw)
In-Reply-To: <20191025113921.9412-7-richard.henderson@linaro.org>
Le 25/10/2019 à 13:39, Richard Henderson a écrit :
> 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>
> ---
> 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 a967e2db73..0db4c5f84f 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;
>
Applied to my linux-user branch.
Thanks,
Laurent
next prev parent reply other threads:[~2019-11-05 9:51 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-25 11:39 [PATCH v2 00/12] linux-user sparc fixes Richard Henderson
2019-10-25 11:39 ` [PATCH v2 01/12] scripts/qemu-binfmt-conf: Update for sparc64 Richard Henderson
2019-11-05 9:43 ` Laurent Vivier
2019-10-25 11:39 ` [PATCH v2 02/12] tests/tcg/multiarch/linux-test: Fix error check for shmat Richard Henderson
2019-10-25 12:59 ` Philippe Mathieu-Daudé
2019-10-25 13:00 ` Philippe Mathieu-Daudé
2019-11-05 9:45 ` Laurent Vivier
2019-10-25 11:39 ` [PATCH v2 03/12] target/sparc: Define an enumeration for accessing env->regwptr Richard Henderson
2019-11-05 9:45 ` Laurent Vivier
2019-10-25 11:39 ` [PATCH v2 04/12] linux-user/sparc: Use WREG constants in sparc/target_cpu.h Richard Henderson
2019-10-25 12:09 ` Laurent Vivier
2019-11-05 9:49 ` Laurent Vivier
2019-10-25 11:39 ` [PATCH v2 05/12] linux-user/sparc: Begin using WREG constants in sparc/signal.c Richard Henderson
2019-10-25 12:16 ` Laurent Vivier
2019-11-05 9:49 ` Laurent Vivier
2019-10-25 11:39 ` [PATCH v2 06/12] linux-user/sparc: Use WREG_SP constant " Richard Henderson
2019-10-25 12:19 ` Laurent Vivier
2019-11-05 9:50 ` Laurent Vivier [this message]
2019-10-25 11:39 ` [PATCH v2 07/12] linux-user/sparc: Fix WREG usage in setup_frame Richard Henderson
2019-11-05 9:50 ` Laurent Vivier
2019-10-25 11:39 ` [PATCH v2 08/12] linux-user/sparc64: Fix target_signal_frame Richard Henderson
2019-10-25 12:47 ` Laurent Vivier
2019-10-25 13:38 ` Richard Henderson
2019-10-25 13:43 ` Laurent Vivier
2019-10-25 11:39 ` [PATCH v2 09/12] linux-user: Rename cpu_clone_regs to cpu_clone_regs_child Richard Henderson
2019-10-25 13:03 ` Philippe Mathieu-Daudé
2019-11-05 9:52 ` Laurent Vivier
2019-10-25 11:39 ` [PATCH v2 10/12] linux-user: Introduce cpu_clone_regs_parent Richard Henderson
2019-10-25 13:04 ` Philippe Mathieu-Daudé
2019-11-05 9:52 ` Laurent Vivier
2019-10-25 11:39 ` [PATCH v2 11/12] linux-user/sparc: Fix cpu_clone_regs_* Richard Henderson
2019-11-05 9:54 ` Laurent Vivier
2019-10-25 11:39 ` [PATCH v2 12/12] linux-user/alpha: Set r20 secondary return value Richard Henderson
2019-10-25 12:56 ` Laurent Vivier
2019-11-05 9:53 ` Laurent Vivier
2019-10-25 12:50 ` [PATCH v2 00/12] linux-user sparc fixes Laurent Vivier
2019-10-26 7:02 ` no-reply
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=eb2f67f4-f7eb-d46e-02f1-fd0c424fc0d9@vivier.eu \
--to=laurent@vivier.eu \
--cc=alex.bennee@linaro.org \
--cc=qemu-devel@nongnu.org \
--cc=richard.henderson@linaro.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).