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

memory: Cleanup after switching to FlatView

Browse source 
We store AddressSpaceDispatch* in FlatView anyway so there is no need
to carry it from mem_add() to register_subpage/register_multipage.

This should cause no behavioural change.

Backports commit 9950322a593ff900a860fb52938159461798a831 from qemu
This commit is contained in:
Alexey Kardashevskiy 2018-03-11 21:26:46 -04:00 committed by Lioncash
parent aa2b76b4e8
commit 489abbbd8b
No known key found for this signature in database
GPG key ID: 4E3C3CC1031BA9C7
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
qemu/exec.c
View file

@ -1050,16 +1050,16 @@ static void phys_sections_free(PhysPageMap *map)
g_free(map->nodes); g_free(map->nodes);
} }
static void register_subpage(FlatView *fv, AddressSpaceDispatch *d, static void register_subpage(FlatView *fv, MemoryRegionSection *section)
MemoryRegionSection *section)
{ {
struct uc_struct *uc = d->uc; AddressSpaceDispatch *d = flatview_to_dispatch(fv);
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, base); MemoryRegionSection *existing = phys_page_find(d, base);
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);
struct uc_struct *uc = d->uc;
assert(existing->mr->subpage || existing->mr == &uc->io_mem_unassigned); assert(existing->mr->subpage || existing->mr == &uc->io_mem_unassigned);
@ -1080,9 +1080,10 @@ static void register_subpage(FlatView *fv, AddressSpaceDispatch *d,
} }
static void register_multipage(AddressSpaceDispatch *d, static void register_multipage(FlatView *fv,
MemoryRegionSection *section) MemoryRegionSection *section)
{ {
AddressSpaceDispatch *d = flatview_to_dispatch(fv);
hwaddr start_addr = section->offset_within_address_space; hwaddr start_addr = section->offset_within_address_space;
uint16_t section_index = phys_section_add(&d->map, section); uint16_t section_index = phys_section_add(&d->map, section);
uint64_t num_pages = int128_get64(int128_rshift(section->size, uint64_t num_pages = int128_get64(int128_rshift(section->size,
@ -1094,7 +1095,6 @@ static void register_multipage(AddressSpaceDispatch *d,
void mem_add(FlatView *fv, MemoryRegionSection *section) void mem_add(FlatView *fv, MemoryRegionSection *section)
{ {
AddressSpaceDispatch *d = flatview_to_dispatch(fv);
MemoryRegionSection now = *section, remain = *section; MemoryRegionSection now = *section, remain = *section;
Int128 page_size = int128_make64(TARGET_PAGE_SIZE); Int128 page_size = int128_make64(TARGET_PAGE_SIZE);
@ -1103,7 +1103,7 @@ void mem_add(FlatView *fv, MemoryRegionSection *section)
- now.offset_within_address_space; - now.offset_within_address_space;
now.size = int128_min(int128_make64(left), now.size); now.size = int128_min(int128_make64(left), now.size);
register_subpage(fv, d, &now); register_subpage(fv, &now);
} else { } else {
now.size = int128_zero(); now.size = int128_zero();
} }
@ -1113,13 +1113,13 @@ void mem_add(FlatView *fv, MemoryRegionSection *section)
remain.offset_within_region += int128_get64(now.size); remain.offset_within_region += int128_get64(now.size);
now = remain; now = remain;
if (int128_lt(remain.size, page_size)) { if (int128_lt(remain.size, page_size)) {
register_subpage(fv, d, &now); register_subpage(fv, &now);
} else if (remain.offset_within_address_space & ~TARGET_PAGE_MASK) { } else if (remain.offset_within_address_space & ~TARGET_PAGE_MASK) {
now.size = page_size; now.size = page_size;
register_subpage(fv, d, &now); register_subpage(fv, &now);
} else { } else {
now.size = int128_and(now.size, int128_neg(page_size)); now.size = int128_and(now.size, int128_neg(page_size));
register_multipage(d, &now); register_multipage(fv, &now);
} }
} }
} }