diff options
author | Richard Henderson | 2017-05-19 18:41:29 +0200 |
---|---|---|
committer | Richard Henderson | 2017-06-06 23:34:31 +0200 |
commit | 349d078a269cdfcc26e2e84fa99127080eff0d12 (patch) | |
tree | 0e8c8c48b5734b5e2dbcc7cc41c390b54649355e /target/s390x/mem_helper.c | |
parent | target/s390x: Move helper_ex to end of file (diff) | |
download | qemu-349d078a269cdfcc26e2e84fa99127080eff0d12.tar.gz qemu-349d078a269cdfcc26e2e84fa99127080eff0d12.tar.xz qemu-349d078a269cdfcc26e2e84fa99127080eff0d12.zip |
target/s390x: Use unwind data for helper_nc
Reviewed-by: Aurelien Jarno <aurelien@aurel32.net>
Signed-off-by: Richard Henderson <rth@twiddle.net>
Diffstat (limited to 'target/s390x/mem_helper.c')
-rw-r--r-- | target/s390x/mem_helper.c | 31 |
1 files changed, 18 insertions, 13 deletions
diff --git a/target/s390x/mem_helper.c b/target/s390x/mem_helper.c index 90b62fab16..7d6133b7cf 100644 --- a/target/s390x/mem_helper.c +++ b/target/s390x/mem_helper.c @@ -119,23 +119,28 @@ static void fast_memmove(CPUS390XState *env, uint64_t dest, uint64_t src, } /* and on array */ -uint32_t HELPER(nc)(CPUS390XState *env, uint32_t l, uint64_t dest, - uint64_t src) +static uint32_t do_helper_nc(CPUS390XState *env, uint32_t l, uint64_t dest, + uint64_t src, uintptr_t ra) { - int i; - unsigned char x; - uint32_t cc = 0; + uint32_t i; + uint8_t c = 0; 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, src + i, ra); + x &= cpu_ldub_data_ra(env, dest + i, ra); + c |= x; + cpu_stb_data_ra(env, dest + i, x, ra); } - return cc; + return c != 0; +} + +uint32_t HELPER(nc)(CPUS390XState *env, uint32_t l, uint64_t dest, + uint64_t src) +{ + return do_helper_nc(env, l, dest, src, GETPC()); } /* xor on array */ @@ -1213,8 +1218,8 @@ uint32_t HELPER(ex)(CPUS390XState *env, uint32_t cc, uint64_t v1, get_address(env, 0, b2, d2)); break; case 0x400: - cc = helper_nc(env, l, get_address(env, 0, b1, d1), - get_address(env, 0, b2, d2)); + cc = do_helper_nc(env, l, get_address(env, 0, b1, d1), + get_address(env, 0, b2, d2), 0); break; case 0x500: cc = helper_clc(env, l, get_address(env, 0, b1, d1), |