diff options
| author | Richard Henderson <rth@twiddle.net> | 2012-08-27 09:57:18 -0700 |
|---|---|---|
| committer | Richard Henderson <rth@twiddle.net> | 2013-01-05 12:18:43 -0800 |
| commit | 3d596f491250d66fffabbc60d0621ea72859e96c (patch) | |
| tree | 28b1d79ec67f73c89409d6f3987306867b221a37 /target-s390x/mem_helper.c | |
| parent | 204504e2fa0ec0f11c806ad335edf6bd1f499e34 (diff) | |
| download | qemu-3d596f491250d66fffabbc60d0621ea72859e96c.zip | |
target-s390: Convert CSP
Signed-off-by: Richard Henderson <rth@twiddle.net>
Diffstat (limited to 'target-s390x/mem_helper.c')
| -rw-r--r-- | target-s390x/mem_helper.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/target-s390x/mem_helper.c b/target-s390x/mem_helper.c index 8987bbb9b1..0e9bbd4035 100644 --- a/target-s390x/mem_helper.c +++ b/target-s390x/mem_helper.c @@ -984,16 +984,16 @@ uint32_t HELPER(rrbe)(CPUS390XState *env, uint64_t r2) } /* compare and swap and purge */ -uint32_t HELPER(csp)(CPUS390XState *env, uint32_t r1, uint32_t r2) +uint32_t HELPER(csp)(CPUS390XState *env, uint32_t r1, uint64_t r2) { uint32_t cc; uint32_t o1 = env->regs[r1]; - uint64_t a2 = get_address_31fix(env, r2) & ~3ULL; + uint64_t a2 = r2 & ~3ULL; uint32_t o2 = cpu_ldl_data(env, a2); if (o1 == o2) { cpu_stl_data(env, a2, env->regs[(r1 + 1) & 15]); - if (env->regs[r2] & 0x3) { + if (r2 & 0x3) { /* flush TLB / ALB */ tlb_flush(env, 1); } |