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 05/12] linux-user/sparc: Begin using WREG constants in sparc/signal.c
Date: Tue, 5 Nov 2019 10:49:38 +0100 [thread overview]
Message-ID: <c20b24b2-b834-6d01-bb12-49ac1a1ec45d@vivier.eu> (raw)
In-Reply-To: <20191025113921.9412-6-richard.henderson@linaro.org>
Le 25/10/2019 à 13:39, Richard Henderson a écrit :
> This is non-obvious because the UREG constants are in fact wrong.
>
> s/UREG_I/WREG_O/g
> s/UREG_O/WREG_I/g
> s/UREG_L/WREG_L/g
>
> These substitutions have identical integer values.
>
> Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
> ---
> linux-user/sparc/signal.c | 93 ++++++++++++++-------------------------
> 1 file changed, 32 insertions(+), 61 deletions(-)
>
> diff --git a/linux-user/sparc/signal.c b/linux-user/sparc/signal.c
> index ead169fbaa..a967e2db73 100644
> --- a/linux-user/sparc/signal.c
> +++ b/linux-user/sparc/signal.c
> @@ -104,19 +104,8 @@ struct target_rt_signal_frame {
> qemu_siginfo_fpu_t fpu_state;
> };
>
> -#define UREG_O0 16
> -#define UREG_O6 22
> -#define UREG_I0 0
> -#define UREG_I1 1
> -#define UREG_I2 2
> -#define UREG_I3 3
> -#define UREG_I4 4
> -#define UREG_I5 5
> -#define UREG_I6 6
> -#define UREG_I7 7
> -#define UREG_L0 8
> -#define UREG_FP UREG_I6
> -#define UREG_SP UREG_O6
> +#define UREG_FP WREG_O6
> +#define UREG_SP WREG_I6
>
> static inline abi_ulong get_sigframe(struct target_sigaction *sa,
> CPUSPARCState *env,
> @@ -159,30 +148,12 @@ setup___siginfo(__siginfo_t *si, CPUSPARCState *env, abi_ulong mask)
> __put_user(env->gregs[i], &si->si_regs.u_regs[i]);
> }
> for (i=0; i < 8; i++) {
> - __put_user(env->regwptr[UREG_I0 + i], &si->si_regs.u_regs[i+8]);
> + __put_user(env->regwptr[WREG_O0 + i], &si->si_regs.u_regs[i+8]);
> }
> __put_user(mask, &si->si_mask);
> return err;
> }
>
> -#if 0
> -static int
> -setup_sigcontext(struct target_sigcontext *sc, /*struct _fpstate *fpstate,*/
> - CPUSPARCState *env, unsigned long mask)
> -{
> - int err = 0;
> -
> - __put_user(mask, &sc->sigc_mask);
> - __put_user(env->regwptr[UREG_SP], &sc->sigc_sp);
> - __put_user(env->pc, &sc->sigc_pc);
> - __put_user(env->npc, &sc->sigc_npc);
> - __put_user(env->psr, &sc->sigc_psr);
> - __put_user(env->gregs[1], &sc->sigc_g1);
> - __put_user(env->regwptr[UREG_O0], &sc->sigc_o0);
> -
> - return err;
> -}
> -#endif
> #define NF_ALIGNEDSZ (((sizeof(struct target_signal_frame) + 7) & (~7)))
>
> void setup_frame(int sig, struct target_sigaction *ka,
> @@ -221,20 +192,20 @@ void setup_frame(int sig, struct target_sigaction *ka,
> }
>
> for (i = 0; i < 8; i++) {
> - __put_user(env->regwptr[i + UREG_L0], &sf->ss.locals[i]);
> + __put_user(env->regwptr[i + WREG_L0], &sf->ss.locals[i]);
> }
> for (i = 0; i < 8; i++) {
> - __put_user(env->regwptr[i + UREG_I0], &sf->ss.ins[i]);
> + __put_user(env->regwptr[i + WREG_O0], &sf->ss.ins[i]);
> }
> if (err)
> goto sigsegv;
>
> /* 3. signal handler back-trampoline and parameters */
> env->regwptr[UREG_FP] = sf_addr;
> - env->regwptr[UREG_I0] = sig;
> - env->regwptr[UREG_I1] = sf_addr +
> + env->regwptr[WREG_O0] = sig;
> + env->regwptr[WREG_O1] = sf_addr +
> offsetof(struct target_signal_frame, info);
> - env->regwptr[UREG_I2] = sf_addr +
> + env->regwptr[WREG_O2] = sf_addr +
> offsetof(struct target_signal_frame, info);
>
> /* 4. signal handler */
> @@ -242,11 +213,11 @@ void setup_frame(int sig, struct target_sigaction *ka,
> env->npc = (env->pc + 4);
> /* 5. return to kernel instructions */
> if (ka->ka_restorer) {
> - env->regwptr[UREG_I7] = ka->ka_restorer;
> + env->regwptr[WREG_O7] = ka->ka_restorer;
> } else {
> uint32_t val32;
>
> - env->regwptr[UREG_I7] = sf_addr +
> + env->regwptr[WREG_O7] = sf_addr +
> offsetof(struct target_signal_frame, insns) - 2 * 4;
>
> /* mov __NR_sigreturn, %g1 */
> @@ -316,7 +287,7 @@ long do_sigreturn(CPUSPARCState *env)
> __get_user(env->gregs[i], &sf->info.si_regs.u_regs[i]);
> }
> for (i=0; i < 8; i++) {
> - __get_user(env->regwptr[i + UREG_I0], &sf->info.si_regs.u_regs[i+8]);
> + __get_user(env->regwptr[i + WREG_O0], &sf->info.si_regs.u_regs[i+8]);
> }
>
> /* FIXME: implement FPU save/restore:
> @@ -433,7 +404,7 @@ void sparc64_set_context(CPUSPARCState *env)
> abi_ulong fp, i7, w_addr;
> unsigned int i;
>
> - ucp_addr = env->regwptr[UREG_I0];
> + ucp_addr = env->regwptr[WREG_O0];
> if (!lock_user_struct(VERIFY_READ, ucp, ucp_addr, 1)) {
> goto do_sigsegv;
> }
> @@ -443,7 +414,7 @@ void sparc64_set_context(CPUSPARCState *env)
> if ((pc | npc) & 3) {
> goto do_sigsegv;
> }
> - if (env->regwptr[UREG_I1]) {
> + if (env->regwptr[WREG_O1]) {
> target_sigset_t target_set;
> sigset_t set;
>
> @@ -474,19 +445,19 @@ void sparc64_set_context(CPUSPARCState *env)
> __get_user(env->gregs[5], (&(*grp)[SPARC_MC_G5]));
> __get_user(env->gregs[6], (&(*grp)[SPARC_MC_G6]));
> __get_user(env->gregs[7], (&(*grp)[SPARC_MC_G7]));
> - __get_user(env->regwptr[UREG_I0], (&(*grp)[SPARC_MC_O0]));
> - __get_user(env->regwptr[UREG_I1], (&(*grp)[SPARC_MC_O1]));
> - __get_user(env->regwptr[UREG_I2], (&(*grp)[SPARC_MC_O2]));
> - __get_user(env->regwptr[UREG_I3], (&(*grp)[SPARC_MC_O3]));
> - __get_user(env->regwptr[UREG_I4], (&(*grp)[SPARC_MC_O4]));
> - __get_user(env->regwptr[UREG_I5], (&(*grp)[SPARC_MC_O5]));
> - __get_user(env->regwptr[UREG_I6], (&(*grp)[SPARC_MC_O6]));
> - __get_user(env->regwptr[UREG_I7], (&(*grp)[SPARC_MC_O7]));
> + __get_user(env->regwptr[WREG_O0], (&(*grp)[SPARC_MC_O0]));
> + __get_user(env->regwptr[WREG_O1], (&(*grp)[SPARC_MC_O1]));
> + __get_user(env->regwptr[WREG_O2], (&(*grp)[SPARC_MC_O2]));
> + __get_user(env->regwptr[WREG_O3], (&(*grp)[SPARC_MC_O3]));
> + __get_user(env->regwptr[WREG_O4], (&(*grp)[SPARC_MC_O4]));
> + __get_user(env->regwptr[WREG_O5], (&(*grp)[SPARC_MC_O5]));
> + __get_user(env->regwptr[WREG_O6], (&(*grp)[SPARC_MC_O6]));
> + __get_user(env->regwptr[WREG_O7], (&(*grp)[SPARC_MC_O7]));
>
> __get_user(fp, &(ucp->tuc_mcontext.mc_fp));
> __get_user(i7, &(ucp->tuc_mcontext.mc_i7));
>
> - w_addr = TARGET_STACK_BIAS+env->regwptr[UREG_I6];
> + w_addr = TARGET_STACK_BIAS+env->regwptr[WREG_O6];
> if (put_user(fp, w_addr + offsetof(struct target_reg_window, ins[6]),
> abi_ulong) != 0) {
> goto do_sigsegv;
> @@ -534,7 +505,7 @@ void sparc64_get_context(CPUSPARCState *env)
> target_sigset_t target_set;
> sigset_t set;
>
> - ucp_addr = env->regwptr[UREG_I0];
> + ucp_addr = env->regwptr[WREG_O0];
> if (!lock_user_struct(VERIFY_WRITE, ucp, ucp_addr, 0)) {
> goto do_sigsegv;
> }
> @@ -580,16 +551,16 @@ void sparc64_get_context(CPUSPARCState *env)
> __put_user(env->gregs[5], &((*grp)[SPARC_MC_G5]));
> __put_user(env->gregs[6], &((*grp)[SPARC_MC_G6]));
> __put_user(env->gregs[7], &((*grp)[SPARC_MC_G7]));
> - __put_user(env->regwptr[UREG_I0], &((*grp)[SPARC_MC_O0]));
> - __put_user(env->regwptr[UREG_I1], &((*grp)[SPARC_MC_O1]));
> - __put_user(env->regwptr[UREG_I2], &((*grp)[SPARC_MC_O2]));
> - __put_user(env->regwptr[UREG_I3], &((*grp)[SPARC_MC_O3]));
> - __put_user(env->regwptr[UREG_I4], &((*grp)[SPARC_MC_O4]));
> - __put_user(env->regwptr[UREG_I5], &((*grp)[SPARC_MC_O5]));
> - __put_user(env->regwptr[UREG_I6], &((*grp)[SPARC_MC_O6]));
> - __put_user(env->regwptr[UREG_I7], &((*grp)[SPARC_MC_O7]));
> + __put_user(env->regwptr[WREG_O0], &((*grp)[SPARC_MC_O0]));
> + __put_user(env->regwptr[WREG_O1], &((*grp)[SPARC_MC_O1]));
> + __put_user(env->regwptr[WREG_O2], &((*grp)[SPARC_MC_O2]));
> + __put_user(env->regwptr[WREG_O3], &((*grp)[SPARC_MC_O3]));
> + __put_user(env->regwptr[WREG_O4], &((*grp)[SPARC_MC_O4]));
> + __put_user(env->regwptr[WREG_O5], &((*grp)[SPARC_MC_O5]));
> + __put_user(env->regwptr[WREG_O6], &((*grp)[SPARC_MC_O6]));
> + __put_user(env->regwptr[WREG_O7], &((*grp)[SPARC_MC_O7]));
>
> - w_addr = TARGET_STACK_BIAS+env->regwptr[UREG_I6];
> + w_addr = TARGET_STACK_BIAS+env->regwptr[WREG_O6];
> fp = i7 = 0;
> if (get_user(fp, w_addr + offsetof(struct target_reg_window, ins[6]),
> abi_ulong) != 0) {
>
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 [this message]
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
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=c20b24b2-b834-6d01-bb12-49ac1a1ec45d@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).