diff options
| author | Richard Henderson <rth@twiddle.net> | 2017-05-22 18:34:42 -0700 |
|---|---|---|
| committer | Richard Henderson <rth@twiddle.net> | 2017-06-06 14:34:32 -0700 |
| commit | 31a18b4575c1b882f2cd2fa2ef5dba7a5c12a497 (patch) | |
| tree | f585ec83d2fb488b6d4dc29b3fe355eb83073e5b /target/s390x/mem_helper.c | |
| parent | a72da8b7f555d640d79e41b131c1cd3169811861 (diff) | |
| download | qemu-31a18b4575c1b882f2cd2fa2ef5dba7a5c12a497.zip qemu-31a18b4575c1b882f2cd2fa2ef5dba7a5c12a497.tar.gz qemu-31a18b4575c1b882f2cd2fa2ef5dba7a5c12a497.tar.bz2 | |
target/s390x: Use atomic operations for COMPARE SWAP PURGE
Also provide the cross-cpu tlb flushing required by the PoO.
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 | 32 |
1 files changed, 8 insertions, 24 deletions
diff --git a/target/s390x/mem_helper.c b/target/s390x/mem_helper.c index fa03129..4b96c27 100644 --- a/target/s390x/mem_helper.c +++ b/target/s390x/mem_helper.c @@ -1056,30 +1056,6 @@ uint32_t HELPER(rrbe)(CPUS390XState *env, uint64_t r2) return re >> 1; } -/* compare and swap and purge */ -uint32_t HELPER(csp)(CPUS390XState *env, uint32_t r1, uint64_t r2) -{ - S390CPU *cpu = s390_env_get_cpu(env); - uint32_t cc; - uint32_t o1 = env->regs[r1]; - 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 (r2 & 0x3) { - /* flush TLB / ALB */ - tlb_flush(CPU(cpu)); - } - cc = 0; - } else { - env->regs[r1] = (env->regs[r1] & 0xffffffff00000000ULL) | o2; - cc = 1; - } - - return cc; -} - uint32_t HELPER(mvcs)(CPUS390XState *env, uint64_t l, uint64_t a1, uint64_t a2) { uintptr_t ra = GETPC(); @@ -1161,6 +1137,14 @@ void HELPER(ptlb)(CPUS390XState *env) tlb_flush(CPU(cpu)); } +/* flush global tlb */ +void HELPER(purge)(CPUS390XState *env) +{ + S390CPU *cpu = s390_env_get_cpu(env); + + tlb_flush_all_cpus_synced(CPU(cpu)); +} + /* load using real address */ uint64_t HELPER(lura)(CPUS390XState *env, uint64_t addr) { |