yuzu/unicorn
1
0
Fork 0
mirror of https://github.com/yuzu-emu/unicorn.git synced 2025-05-04 22:22:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

memory: Extract memory region freeing code to a common function

Browse source 
Makes deallocation behavior consistent and also fixes a memory leak
where the name of the region would be neglected to be freed.
This commit is contained in:
Lioncash 2019-04-19 18:44:24 -04:00
parent 7de690e87c
commit 8ebb8f9fec
No known key found for this signature in database
GPG key ID: 4E3C3CC1031BA9C7
1 changed files with 15 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
qemu/memory.c
View file

@ -76,6 +76,19 @@ MemoryRegion *memory_map_ptr(struct uc_struct *uc, hwaddr begin, size_t size, ui
static void memory_region_update_container_subregions(MemoryRegion *subregion); static void memory_region_update_container_subregions(MemoryRegion *subregion);
static void unicorn_free_memory_region(MemoryRegion *mr) {
mr->destructor(mr);
mr->ram_block = NULL;
g_free((char *)mr->name);
mr->name = NULL;
Object *obj = OBJECT(mr);
obj->ref = 1;
obj->free = g_free;
object_property_del_child(mr->uc, qdev_get_machine(mr->uc), obj, &error_abort);
}
void memory_unmap(struct uc_struct *uc, MemoryRegion *mr) void memory_unmap(struct uc_struct *uc, MemoryRegion *mr)
{ {
// Make sure all pages associated with the MemoryRegion are flushed // Make sure all pages associated with the MemoryRegion are flushed
@ -92,16 +105,7 @@ void memory_unmap(struct uc_struct *uc, MemoryRegion *mr)
uc->mapped_block_count--; uc->mapped_block_count--;
//shift remainder of array down over deleted pointer //shift remainder of array down over deleted pointer
memmove(&uc->mapped_blocks[i], &uc->mapped_blocks[i + 1], sizeof(MemoryRegion*) * (uc->mapped_block_count - i)); memmove(&uc->mapped_blocks[i], &uc->mapped_blocks[i + 1], sizeof(MemoryRegion*) * (uc->mapped_block_count - i));
mr->destructor(mr); unicorn_free_memory_region(mr);
mr->ram_block = NULL;
Object *obj = OBJECT(mr);
obj->ref = 1;
obj->free = g_free;
g_free((char *)mr->name);
mr->name = NULL;
object_property_del_child(mr->uc, qdev_get_machine(mr->uc), obj, &error_abort);
break; break;
} }
} }
@ -112,14 +116,7 @@ int memory_free(struct uc_struct *uc)
for (size_t i = 0; i < uc->mapped_block_count; i++) { for (size_t i = 0; i < uc->mapped_block_count; i++) {
MemoryRegion *mr = uc->mapped_blocks[i]; MemoryRegion *mr = uc->mapped_blocks[i];
mr->enabled = false; mr->enabled = false;
memory_region_del_subregion(get_system_memory(uc), mr); unicorn_free_memory_region(mr);
mr->destructor(mr);
mr->ram_block = NULL;
Object *obj = OBJECT(mr);
obj->ref = 1;
obj->free = g_free;
object_property_del_child(mr->uc, qdev_get_machine(mr->uc), obj, &error_abort);
} }
return 0; return 0;