From: David Hildenbrand <david@redhat.com>
To: Richard Henderson <richard.henderson@linaro.org>, qemu-devel@nongnu.org
Cc: qemu-s390x@nongnu.org
Subject: Re: [PATCH 1/2] target/s390x: Split out helper_per_store_real
Date: Thu, 12 Dec 2019 11:29:39 +0100 [thread overview]
Message-ID: <eed8bb1c-1da0-9bb8-6711-bc5cc55ce4f6@redhat.com> (raw)
In-Reply-To: <20191211203614.15611-2-richard.henderson@linaro.org>
On 11.12.19 21:36, Richard Henderson wrote:
> Split the PER handling for store-to-real-address into its
> own helper function, conditionally called when PER is
> enabled, just as we do for per_branch and per_ifetch.
>
> Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
> ---
> target/s390x/helper.h | 1 +
> target/s390x/mem_helper.c | 16 ----------------
> target/s390x/misc_helper.c | 10 ++++++++++
> target/s390x/translate.c | 8 ++++++++
> 4 files changed, 19 insertions(+), 16 deletions(-)
>
> diff --git a/target/s390x/helper.h b/target/s390x/helper.h
> index 56e8149866..f5b4bb6a31 100644
> --- a/target/s390x/helper.h
> +++ b/target/s390x/helper.h
> @@ -331,6 +331,7 @@ DEF_HELPER_FLAGS_3(sturg, TCG_CALL_NO_WG, void, env, i64, i64)
> DEF_HELPER_1(per_check_exception, void, env)
> DEF_HELPER_FLAGS_3(per_branch, TCG_CALL_NO_RWG, void, env, i64, i64)
> DEF_HELPER_FLAGS_2(per_ifetch, TCG_CALL_NO_RWG, void, env, i64)
> +DEF_HELPER_FLAGS_1(per_store_real, TCG_CALL_NO_RWG, void, env)
> DEF_HELPER_FLAGS_1(stfl, TCG_CALL_NO_RWG, void, env)
>
> DEF_HELPER_2(xsch, void, env, i64)
> diff --git a/target/s390x/mem_helper.c b/target/s390x/mem_helper.c
> index 2325767f17..b1b3f406c9 100644
> --- a/target/s390x/mem_helper.c
> +++ b/target/s390x/mem_helper.c
> @@ -2344,27 +2344,11 @@ uint64_t HELPER(lurag)(CPUS390XState *env, uint64_t addr)
> void HELPER(stura)(CPUS390XState *env, uint64_t addr, uint64_t v1)
> {
> cpu_stl_real_ra(env, wrap_address(env, addr), (uint32_t)v1, GETPC());
> -
> - if ((env->psw.mask & PSW_MASK_PER) &&
> - (env->cregs[9] & PER_CR9_EVENT_STORE) &&
> - (env->cregs[9] & PER_CR9_EVENT_STORE_REAL)) {
> - /* PSW is saved just before calling the helper. */
> - env->per_address = env->psw.addr;
> - env->per_perc_atmid = PER_CODE_EVENT_STORE_REAL | get_per_atmid(env);
> - }
> }
>
> void HELPER(sturg)(CPUS390XState *env, uint64_t addr, uint64_t v1)
> {
> cpu_stq_real_ra(env, wrap_address(env, addr), v1, GETPC());
> -
> - if ((env->psw.mask & PSW_MASK_PER) &&
> - (env->cregs[9] & PER_CR9_EVENT_STORE) &&
> - (env->cregs[9] & PER_CR9_EVENT_STORE_REAL)) {
> - /* PSW is saved just before calling the helper. */
> - env->per_address = env->psw.addr;
> - env->per_perc_atmid = PER_CODE_EVENT_STORE_REAL | get_per_atmid(env);
> - }
> }
>
> /* load real address */
> diff --git a/target/s390x/misc_helper.c b/target/s390x/misc_helper.c
> index bfb457fb63..58dbc023eb 100644
> --- a/target/s390x/misc_helper.c
> +++ b/target/s390x/misc_helper.c
> @@ -620,6 +620,16 @@ void HELPER(per_ifetch)(CPUS390XState *env, uint64_t addr)
> }
> }
> }
> +
> +void HELPER(per_store_real)(CPUS390XState *env)
> +{
> + if ((env->cregs[9] & PER_CR9_EVENT_STORE) &&
> + (env->cregs[9] & PER_CR9_EVENT_STORE_REAL)) {
> + /* PSW is saved just before calling the helper. */
> + env->per_address = env->psw.addr;
> + env->per_perc_atmid = PER_CODE_EVENT_STORE_REAL | get_per_atmid(env);
> + }
> +}
> #endif
>
> static uint8_t stfl_bytes[2048];
> diff --git a/target/s390x/translate.c b/target/s390x/translate.c
> index 151dfa91fb..ef751fefa4 100644
> --- a/target/s390x/translate.c
> +++ b/target/s390x/translate.c
> @@ -4507,12 +4507,20 @@ static DisasJumpType op_stnosm(DisasContext *s, DisasOps *o)
> static DisasJumpType op_stura(DisasContext *s, DisasOps *o)
> {
> gen_helper_stura(cpu_env, o->in2, o->in1);
> + if (s->base.tb->flags & FLAG_MASK_PER) {
> + update_psw_addr(s);
> + gen_helper_per_store_real(cpu_env);
> + }
> return DISAS_NEXT;
> }
>
> static DisasJumpType op_sturg(DisasContext *s, DisasOps *o)
> {
> gen_helper_sturg(cpu_env, o->in2, o->in1);
> + if (s->base.tb->flags & FLAG_MASK_PER) {
> + update_psw_addr(s);
> + gen_helper_per_store_real(cpu_env);
> + }
> return DISAS_NEXT;
> }
> #endif
>
Reviewed-by: David Hildenbrand <david@redhat.com>
--
Thanks,
David / dhildenb
next prev parent reply other threads:[~2019-12-12 10:30 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-12-11 20:36 [PATCH 0/2] target/s390x: Implement LOAD/STORE TO REAL ADDRESS inline Richard Henderson
2019-12-11 20:36 ` [PATCH 1/2] target/s390x: Split out helper_per_store_real Richard Henderson
2019-12-12 10:29 ` David Hildenbrand [this message]
2019-12-11 20:36 ` [PATCH 2/2] target/s390x: Implement LOAD/STORE TO REAL ADDRESS inline Richard Henderson
2019-12-12 10:35 ` David Hildenbrand
2019-12-16 17:04 ` [PATCH 0/2] " Cornelia Huck
2019-12-16 20:23 ` Richard Henderson
2019-12-17 10:01 ` Cornelia Huck
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=eed8bb1c-1da0-9bb8-6711-bc5cc55ce4f6@redhat.com \
--to=david@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=qemu-s390x@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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.