yuzu/unicorn
1
0
Fork 0
mirror of https://github.com/yuzu-emu/unicorn.git synced 2025-07-10 15:37:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

memory: Do not allocate FlatView in address_space_init

Browse source 
This creates a new AS object without any FlatView as
memory_region_transaction_commit() may want to reuse the empty FV.

Backports commit 67ace39b253ed5ae465275bc870f7e495547658b from qemu
This commit is contained in:
Alexey Kardashevskiy 2018-03-11 22:07:32 -04:00 committed by Lioncash
parent f2c72dc278
commit 34709f52ee
No known key found for this signature in database
GPG key ID: 4E3C3CC1031BA9C7
1 changed files with 24 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
qemu/memory.c
View file

@ -836,22 +836,38 @@ static void flatviews_reset(struct uc_struct *uc)
static void address_space_set_flatview(AddressSpace *as) static void address_space_set_flatview(AddressSpace *as)
{ {
FlatView *old_view = address_space_get_flatview(as); FlatView *old_view = address_space_to_flatview(as);
MemoryRegion *physmr = memory_region_get_flatview_root(as->root); MemoryRegion *physmr = memory_region_get_flatview_root(as->root);
FlatView *new_view = g_hash_table_lookup(as->uc->flat_views, physmr); FlatView *new_view = g_hash_table_lookup(as->uc->flat_views, physmr);
assert(new_view); assert(new_view);
if (old_view == new_view) {
return;
}
if (old_view) {
flatview_ref(old_view);
}
flatview_ref(new_view); flatview_ref(new_view);
if (!QTAILQ_EMPTY(&as->listeners)) { if (!QTAILQ_EMPTY(&as->listeners)) {
address_space_update_topology_pass(as, old_view, new_view, false); FlatView tmpview = {0};
address_space_update_topology_pass(as, old_view, new_view, true); FlatView *old_view2 = old_view;
if (!old_view2) {
old_view2 = &tmpview;
}
address_space_update_topology_pass(as, old_view2, new_view, false);
address_space_update_topology_pass(as, old_view2, new_view, true);
} }
/* Writes are protected by the BQL. */ /* Writes are protected by the BQL. */
atomic_set(&as->current_map, new_view); atomic_set(&as->current_map, new_view);
flatview_unref(old_view); if (old_view) {
flatview_unref(old_view);
}
/* Note that all the old MemoryRegions are still alive up to this /* Note that all the old MemoryRegions are still alive up to this
* point. This relieves most MemoryListeners from the need to * point. This relieves most MemoryListeners from the need to
@ -859,7 +875,9 @@ static void address_space_set_flatview(AddressSpace *as)
* outside the iothread mutex, in which case precise reference * outside the iothread mutex, in which case precise reference
* counting is necessary. * counting is necessary.
*/ */
flatview_unref(old_view); if (old_view) {
flatview_unref(old_view);
}
} }
void memory_region_transaction_begin(struct uc_struct *uc) void memory_region_transaction_begin(struct uc_struct *uc)
@ -1870,7 +1888,7 @@ void address_space_init(struct uc_struct *uc, AddressSpace *as, MemoryRegion *ro
as->uc = uc; as->uc = uc;
as->root = root; as->root = root;
as->malloced = false; as->malloced = false;
as->current_map = flatview_new(root); as->current_map = NULL;
QTAILQ_INIT(&as->listeners); QTAILQ_INIT(&as->listeners);
QTAILQ_INSERT_TAIL(&uc->address_spaces, as, address_spaces_link); QTAILQ_INSERT_TAIL(&uc->address_spaces, as, address_spaces_link);
as->name = g_strdup(name ? name : "anonymous"); as->name = g_strdup(name ? name : "anonymous");