falso
/
qemu-irix
mirror of https://github.com/n64decomp/qemu-irix.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

memory: Remove AddressSpace pointer from AddressSpaceDispatch 

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.

Signed-off-by: Alexey Kardashevskiy <aik@ozlabs.ru>
Message-Id: <20170921085110.25598-6-aik@ozlabs.ru>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
(cherry picked from commit c775252378)
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
This commit is contained in:
Alexey Kardashevskiy 2017-09-21 18:50:57 +10:00 committed by Michael Roth
parent 4d2f8abb22
commit d0136db812
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
exec.c
View File

@ -194,7 +194,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)
@ -1304,7 +1303,8 @@ static void phys_sections_free(PhysPageMap *map)
g_free(map->nodes); g_free(map->nodes);
} }
static void register_subpage(AddressSpaceDispatch *d, MemoryRegionSection *section) static void register_subpage(AddressSpace *as, AddressSpaceDispatch *d,
MemoryRegionSection *section)
{ {
subpage_t *subpage; subpage_t *subpage;
hwaddr base = section->offset_within_address_space hwaddr base = section->offset_within_address_space
@ -1319,8 +1319,8 @@ static void register_subpage(AddressSpaceDispatch *d, MemoryRegionSection *secti
assert(existing->mr->subpage || existing->mr == &io_mem_unassigned); assert(existing->mr->subpage || existing->mr == &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(d, base >> TARGET_PAGE_BITS, 1, phys_page_set(d, base >> TARGET_PAGE_BITS, 1,
phys_section_add(&d->map, &subsection)); phys_section_add(&d->map, &subsection));
@ -1357,7 +1357,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(d, &now); register_subpage(as, d, &now);
} else { } else {
now.size = int128_zero(); now.size = int128_zero();
} }
@ -1367,10 +1367,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(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(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(d, &now); register_multipage(d, &now);
@ -2686,7 +2686,6 @@ AddressSpaceDispatch *mem_begin(AddressSpace *as)
assert(n == PHYS_SECTION_WATCH); assert(n == PHYS_SECTION_WATCH);
d->phys_map = (PhysPageEntry) { .ptr = PHYS_MAP_NODE_NIL, .skip = 1 }; d->phys_map = (PhysPageEntry) { .ptr = PHYS_MAP_NODE_NIL, .skip = 1 };
d->as = as;
return d; return d;
} }