| Message ID | 20170523030312.6360-17-rth@twiddle.net |
|---|---|
| State | New |
| Headers | show |
On 23.05.2017 05:02, Richard Henderson wrote: > Signed-off-by: Richard Henderson <rth@twiddle.net> > --- > target/s390x/mem_helper.c | 7 ++++--- > target/s390x/translate.c | 1 - > 2 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/target/s390x/mem_helper.c b/target/s390x/mem_helper.c > index b764c48..7a59be0 100644 > --- a/target/s390x/mem_helper.c > +++ b/target/s390x/mem_helper.c > @@ -525,6 +525,7 @@ uint32_t HELPER(mvcl)(CPUS390XState *env, uint32_t r1, uint32_t r2) > uint32_t HELPER(mvcle)(CPUS390XState *env, uint32_t r1, uint64_t a2, > uint32_t r3) > { > + uintptr_t ra = GETPC(); > uint64_t destlen = env->regs[r1 + 1]; > uint64_t dest = env->regs[r1]; > uint64_t srclen = env->regs[r3 + 1]; > @@ -553,12 +554,12 @@ uint32_t HELPER(mvcle)(CPUS390XState *env, uint32_t r1, uint64_t a2, > } > > for (; destlen && srclen; src++, dest++, destlen--, srclen--) { > - v = cpu_ldub_data(env, src); > - cpu_stb_data(env, dest, v); > + v = cpu_ldub_data_ra(env, src, ra); > + cpu_stb_data_ra(env, dest, v, ra); > } > > for (; destlen; dest++, destlen--) { > - cpu_stb_data(env, dest, pad); > + cpu_stb_data_ra(env, dest, pad, ra); > } > > env->regs[r1 + 1] = destlen; > diff --git a/target/s390x/translate.c b/target/s390x/translate.c > index ad2e632..c00c15e 100644 > --- a/target/s390x/translate.c > +++ b/target/s390x/translate.c > @@ -2887,7 +2887,6 @@ static ExitStatus op_mvcle(DisasContext *s, DisasOps *o) > { > TCGv_i32 r1 = tcg_const_i32(get_field(s->fields, r1)); > TCGv_i32 r3 = tcg_const_i32(get_field(s->fields, r3)); > - potential_page_fault(s); > gen_helper_mvcle(cc_op, cpu_env, r1, o->in2, r3); > tcg_temp_free_i32(r1); > tcg_temp_free_i32(r3); Reviewed-by: Thomas Huth <thuth@redhat.com>
On 2017-05-22 20:02, Richard Henderson wrote: > Signed-off-by: Richard Henderson <rth@twiddle.net> > --- > target/s390x/mem_helper.c | 7 ++++--- > target/s390x/translate.c | 1 - > 2 files changed, 4 insertions(+), 4 deletions(-) Reviewed-by: Aurelien Jarno <aurelien@aurel32.net>
diff --git a/target/s390x/mem_helper.c b/target/s390x/mem_helper.c index b764c48..7a59be0 100644 --- a/target/s390x/mem_helper.c +++ b/target/s390x/mem_helper.c @@ -525,6 +525,7 @@ uint32_t HELPER(mvcl)(CPUS390XState *env, uint32_t r1, uint32_t r2) uint32_t HELPER(mvcle)(CPUS390XState *env, uint32_t r1, uint64_t a2, uint32_t r3) { + uintptr_t ra = GETPC(); uint64_t destlen = env->regs[r1 + 1]; uint64_t dest = env->regs[r1]; uint64_t srclen = env->regs[r3 + 1]; @@ -553,12 +554,12 @@ uint32_t HELPER(mvcle)(CPUS390XState *env, uint32_t r1, uint64_t a2, } for (; destlen && srclen; src++, dest++, destlen--, srclen--) { - v = cpu_ldub_data(env, src); - cpu_stb_data(env, dest, v); + v = cpu_ldub_data_ra(env, src, ra); + cpu_stb_data_ra(env, dest, v, ra); } for (; destlen; dest++, destlen--) { - cpu_stb_data(env, dest, pad); + cpu_stb_data_ra(env, dest, pad, ra); } env->regs[r1 + 1] = destlen; diff --git a/target/s390x/translate.c b/target/s390x/translate.c index ad2e632..c00c15e 100644 --- a/target/s390x/translate.c +++ b/target/s390x/translate.c @@ -2887,7 +2887,6 @@ static ExitStatus op_mvcle(DisasContext *s, DisasOps *o) { TCGv_i32 r1 = tcg_const_i32(get_field(s->fields, r1)); TCGv_i32 r3 = tcg_const_i32(get_field(s->fields, r3)); - potential_page_fault(s); gen_helper_mvcle(cc_op, cpu_env, r1, o->in2, r3); tcg_temp_free_i32(r1); tcg_temp_free_i32(r3);
Signed-off-by: Richard Henderson <rth@twiddle.net> --- target/s390x/mem_helper.c | 7 ++++--- target/s390x/translate.c | 1 - 2 files changed, 4 insertions(+), 4 deletions(-)