yuzu/unicorn
1
0
Fork 0
mirror of https://github.com/yuzu-emu/unicorn.git synced 2024-12-23 10:35:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

exec: simplify phys_page_find() params

Browse source 
It really only plays with the dispatchers, so the parameter list does
not need that complexity. This helps for readability at least.

Backports commit 003a0cf2cd1828a1141a874428571267b117f765 from qemu
This commit is contained in:
Peter Xu 2018-03-03 14:28:19 -05:00 committed by Lioncash
parent ce25609ed3
commit fb8d3e2f6a
No known key found for this signature in database
GPG key ID: 4E3C3CC1031BA9C7
1 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
qemu/exec.c
View file

@ -304,10 +304,11 @@ static inline bool section_covers_addr(const MemoryRegionSection *section,
int128_getlo(section->size), addr); int128_getlo(section->size), addr);
} }
static MemoryRegionSection *phys_page_find(PhysPageEntry lp, hwaddr addr, static MemoryRegionSection *phys_page_find(AddressSpaceDispatch *d, hwaddr addr)
Node *nodes, MemoryRegionSection *sections)
{ {
PhysPageEntry *p; PhysPageEntry lp = d->phys_map, *p;
Node *nodes = d->map.nodes;
MemoryRegionSection *sections = d->map.sections;
hwaddr index = addr >> TARGET_PAGE_BITS; hwaddr index = addr >> TARGET_PAGE_BITS;
int i; int i;
@ -344,8 +345,7 @@ static MemoryRegionSection *address_space_lookup_region(AddressSpaceDispatch *d,
section_covers_addr(section, addr)) { section_covers_addr(section, addr)) {
update = false; update = false;
} else { } else {
section = phys_page_find(d->phys_map, addr, d->map.nodes, section = phys_page_find(d, addr);
d->map.sections);
update = true; update = true;
} }
if (resolve_subpage && section->mr->subpage) { if (resolve_subpage && section->mr->subpage) {
@ -1027,8 +1027,7 @@ static void register_subpage(struct uc_struct* uc,
subpage_t *subpage; subpage_t *subpage;
hwaddr base = section->offset_within_address_space hwaddr base = section->offset_within_address_space
& TARGET_PAGE_MASK; & TARGET_PAGE_MASK;
MemoryRegionSection *existing = phys_page_find(d->phys_map, base, MemoryRegionSection *existing = phys_page_find(d, base);
d->map.nodes, d->map.sections);
hwaddr start, end; hwaddr start, end;
MemoryRegionSection subsection = MemoryRegionSection_make(NULL, NULL, 0, int128_make64(TARGET_PAGE_SIZE), base, false); MemoryRegionSection subsection = MemoryRegionSection_make(NULL, NULL, 0, int128_make64(TARGET_PAGE_SIZE), base, false);