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

exec: Add missing atomic reads

Browse source
This commit is contained in:
Lioncash 2018-02-18 19:26:35 -05:00
parent 5192f806aa
commit aa0ce52b97
No known key found for this signature in database
GPG key ID: 4E3C3CC1031BA9C7
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
qemu/exec.c
View file

@ -1630,7 +1630,8 @@ MemoryRegion *iotlb_to_region(CPUState *cpu, hwaddr index, MemTxAttrs attrs)
{ {
int asidx = cpu_asidx_from_attrs(cpu, attrs); int asidx = cpu_asidx_from_attrs(cpu, attrs);
CPUAddressSpace *cpuas = &cpu->cpu_ases[asidx]; CPUAddressSpace *cpuas = &cpu->cpu_ases[asidx];
AddressSpaceDispatch *d = cpuas->memory_dispatch; // Unicorn: uses atomic_read instead of atomic_rcu_read
AddressSpaceDispatch *d = atomic_read(&cpuas->memory_dispatch);
MemoryRegionSection *sections = d->map.sections; MemoryRegionSection *sections = d->map.sections;
return sections[index & ~TARGET_PAGE_MASK].mr; return sections[index & ~TARGET_PAGE_MASK].mr;
@ -1693,7 +1694,8 @@ static void tcg_commit(MemoryListener *listener)
* We reload the dispatch pointer now because cpu_reloading_memory_map() * We reload the dispatch pointer now because cpu_reloading_memory_map()
* may have split the RCU critical section. * may have split the RCU critical section.
*/ */
d = cpuas->as->dispatch; // Unicorn: uses atomic_read instead of atomic_rcu_read
d = atomic_read(&cpuas->as->dispatch);
cpuas->memory_dispatch = d; cpuas->memory_dispatch = d;
tlb_flush(cpuas->cpu, 1); tlb_flush(cpuas->cpu, 1);
} }