| Message ID | 20191211203614.15611-2-richard.henderson@linaro.org |
|---|---|
| State | Superseded |
| Headers | show |
| Series | target/s390x: Implement LOAD/STORE TO REAL ADDRESS inline | expand |
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
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
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(-) -- 2.20.1