yuzu/unicorn
1
0
Fork 0
mirror of https://github.com/yuzu-emu/unicorn.git synced 2025-01-11 09:55:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

target/arm/helper-a64: Perform comparison pass with qemu

Browse source 
Ensure code and formatting is up to date
This commit is contained in:
Lioncash 2018-03-15 22:54:39 -04:00
parent 28abd51f84
commit f657ab5b46
No known key found for this signature in database
GPG key ID: 4E3C3CC1031BA9C7
1 changed files with 13 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
qemu/target/arm/helper-a64.c
View file

@ -571,17 +571,13 @@ uint64_t HELPER(crc32c_64)(uint64_t acc, uint64_t val, uint32_t bytes)
/* Returns 0 on success; 1 otherwise. */ /* Returns 0 on success; 1 otherwise. */
static uint64_t do_paired_cmpxchg64_le(CPUARMState *env, uint64_t addr, static uint64_t do_paired_cmpxchg64_le(CPUARMState *env, uint64_t addr,
uint64_t new_lo, uint64_t new_hi, uint64_t new_lo, uint64_t new_hi,
bool parallel) bool parallel, uintptr_t ra)
{ {
uintptr_t ra = GETPC();
Int128 oldv, cmpv, newv; Int128 oldv, cmpv, newv;
bool success; bool success;
/* high and low need to be switched here because this is not actually a cmpv = int128_make128(env->exclusive_val, env->exclusive_high);
* 128bit store but two doublewords stored consecutively newv = int128_make128(new_lo, new_hi);
*/
cmpv = int128_make128(env->exclusive_high, env->exclusive_val);
newv = int128_make128(new_hi, new_lo);
if (parallel) { if (parallel) {
#ifndef CONFIG_ATOMIC128 #ifndef CONFIG_ATOMIC128
@ -634,25 +630,27 @@ static uint64_t do_paired_cmpxchg64_le(CPUARMState *env, uint64_t addr,
uint64_t HELPER(paired_cmpxchg64_le)(CPUARMState *env, uint64_t addr, uint64_t HELPER(paired_cmpxchg64_le)(CPUARMState *env, uint64_t addr,
uint64_t new_lo, uint64_t new_hi) uint64_t new_lo, uint64_t new_hi)
{ {
return do_paired_cmpxchg64_le(env, addr, new_lo, new_hi, false); return do_paired_cmpxchg64_le(env, addr, new_lo, new_hi, false, GETPC());
} }
uint64_t HELPER(paired_cmpxchg64_le_parallel)(CPUARMState *env, uint64_t addr, uint64_t HELPER(paired_cmpxchg64_le_parallel)(CPUARMState *env, uint64_t addr,
uint64_t new_lo, uint64_t new_hi) uint64_t new_lo, uint64_t new_hi)
{ {
return do_paired_cmpxchg64_le(env, addr, new_lo, new_hi, true); return do_paired_cmpxchg64_le(env, addr, new_lo, new_hi, true, GETPC());
} }
static uint64_t do_paired_cmpxchg64_be(CPUARMState *env, uint64_t addr, static uint64_t do_paired_cmpxchg64_be(CPUARMState *env, uint64_t addr,
uint64_t new_lo, uint64_t new_hi, uint64_t new_lo, uint64_t new_hi,
bool parallel) bool parallel, uintptr_t ra)
{ {
uintptr_t ra = GETPC();
Int128 oldv, cmpv, newv; Int128 oldv, cmpv, newv;
bool success; bool success;
cmpv = int128_make128(env->exclusive_val, env->exclusive_high); /* high and low need to be switched here because this is not actually a
newv = int128_make128(new_lo, new_hi); * 128bit store but two doublewords stored consecutively
*/
cmpv = int128_make128(env->exclusive_high, env->exclusive_val);
newv = int128_make128(new_hi, new_lo);
if (parallel) { if (parallel) {
#ifndef CONFIG_ATOMIC128 #ifndef CONFIG_ATOMIC128
@ -705,13 +703,13 @@ static uint64_t do_paired_cmpxchg64_be(CPUARMState *env, uint64_t addr,
uint64_t HELPER(paired_cmpxchg64_be)(CPUARMState *env, uint64_t addr, uint64_t HELPER(paired_cmpxchg64_be)(CPUARMState *env, uint64_t addr,
uint64_t new_lo, uint64_t new_hi) uint64_t new_lo, uint64_t new_hi)
{ {
return do_paired_cmpxchg64_be(env, addr, new_lo, new_hi, false); return do_paired_cmpxchg64_be(env, addr, new_lo, new_hi, false, GETPC());
} }
uint64_t HELPER(paired_cmpxchg64_be_parallel)(CPUARMState *env, uint64_t addr, uint64_t HELPER(paired_cmpxchg64_be_parallel)(CPUARMState *env, uint64_t addr,
uint64_t new_lo, uint64_t new_hi) uint64_t new_lo, uint64_t new_hi)
{ {
return do_paired_cmpxchg64_be(env, addr, new_lo, new_hi, true); return do_paired_cmpxchg64_be(env, addr, new_lo, new_hi, true, GETPC());
} }
/* /*