Signed-off-by: Richard Henderson <r...@twiddle.net> --- target/s390x/mem_helper.c | 18 +++++++++--------- target/s390x/translate.c | 1 - 2 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/target/s390x/mem_helper.c b/target/s390x/mem_helper.c index e0a6fad..e75c2de0 100644 --- a/target/s390x/mem_helper.c +++ b/target/s390x/mem_helper.c @@ -168,20 +168,20 @@ uint32_t HELPER(xc)(CPUS390XState *env, uint32_t l, uint64_t dest, uint32_t HELPER(oc)(CPUS390XState *env, uint32_t l, uint64_t dest, uint64_t src) { - int i; - unsigned char x; - uint32_t cc = 0; + uintptr_t ra = GETPC(); + uint8_t cc = 0; + uint32_t i; HELPER_LOG("%s l %d dest %" PRIx64 " src %" PRIx64 "\n", __func__, l, dest, src); + for (i = 0; i <= l; i++) { - x = cpu_ldub_data(env, dest + i) | cpu_ldub_data(env, src + i); - if (x) { - cc = 1; - } - cpu_stb_data(env, dest + i, x); + uint8_t x = cpu_ldub_data_ra(env, dest + i, ra); + x |= cpu_ldub_data_ra(env, src + i, ra); + cc |= x; + cpu_stb_data_ra(env, dest + i, x, ra); } - return cc; + return cc != 0; } /* memmove */ diff --git a/target/s390x/translate.c b/target/s390x/translate.c index a770407..6a51d56 100644 --- a/target/s390x/translate.c +++ b/target/s390x/translate.c @@ -3082,7 +3082,6 @@ static ExitStatus op_negf128(DisasContext *s, DisasOps *o) static ExitStatus op_oc(DisasContext *s, DisasOps *o) { TCGv_i32 l = tcg_const_i32(get_field(s->fields, l1)); - potential_page_fault(s); gen_helper_oc(cc_op, cpu_env, l, o->addr1, o->in2); tcg_temp_free_i32(l); set_cc_static(s); -- 2.9.4