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

memory: Remove AddressSpace pointer from AddressSpaceDispatch

Browse source 
AS in ASD is only used to pass AS from mem_begin() to register_subpage()
to store it in MemoryRegionSection, we can do this directly now.

This should cause no behavioural change.

Backports commit c7752523787dc148f5ee976162e80ab594c386a1 from qemu
This commit is contained in:
Alexey Kardashevskiy 2018-03-11 20:45:06 -04:00 committed by Lioncash
parent 1591f208c0
commit 06b53d8e40
No known key found for this signature in database
GPG key ID: 4E3C3CC1031BA9C7
1 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
qemu/exec.c
View file

@ -139,7 +139,6 @@ struct AddressSpaceDispatch {
*/ */
PhysPageEntry phys_map; PhysPageEntry phys_map;
PhysPageMap map; PhysPageMap map;
AddressSpace *as;
}; };
#define SUBPAGE_IDX(addr) ((addr) & ~TARGET_PAGE_MASK) #define SUBPAGE_IDX(addr) ((addr) & ~TARGET_PAGE_MASK)
@ -1051,10 +1050,11 @@ static void phys_sections_free(PhysPageMap *map)
g_free(map->nodes); g_free(map->nodes);
} }
static void register_subpage(struct uc_struct* uc, static void register_subpage(AddressSpace *as,
AddressSpaceDispatch *d, AddressSpaceDispatch *d,
MemoryRegionSection *section) MemoryRegionSection *section)
{ {
struct uc_struct *uc = as->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;
@ -1065,8 +1065,8 @@ static void register_subpage(struct uc_struct* uc,
assert(existing->mr->subpage || existing->mr == &uc->io_mem_unassigned); assert(existing->mr->subpage || existing->mr == &uc->io_mem_unassigned);
if (!(existing->mr->subpage)) { if (!(existing->mr->subpage)) {
subpage = subpage_init(d->as, base); subpage = subpage_init(as, base);
subsection.address_space = d->as; subsection.address_space = as;
subsection.mr = &subpage->iomem; subsection.mr = &subpage->iomem;
phys_page_set(uc, d, base >> TARGET_PAGE_BITS, 1, phys_page_set(uc, d, base >> TARGET_PAGE_BITS, 1,
phys_section_add(&d->map, &subsection)); phys_section_add(&d->map, &subsection));
@ -1105,7 +1105,7 @@ void mem_add(AddressSpace *as, 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(as->uc, d, &now); register_subpage(as, d, &now);
} else { } else {
now.size = int128_zero(); now.size = int128_zero();
} }
@ -1115,10 +1115,10 @@ void mem_add(AddressSpace *as, 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(as->uc, d, &now); register_subpage(as, d, &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(as->uc, d, &now); register_subpage(as, d, &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(as->uc, d, &now); register_multipage(as->uc, d, &now);
@ -1869,7 +1869,6 @@ AddressSpaceDispatch *mem_begin(AddressSpace *as)
// assert(n == PHYS_SECTION_WATCH); // assert(n == PHYS_SECTION_WATCH);
d->phys_map = ppe; d->phys_map = ppe;
d->as = as;
return d; return d;
} }