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

memory: use mr->ram_addr in "is this RAM?" assertions

Browse source 
mr->terminates alone doesn't guarantee that we are looking at a RAM region.
mr->ram_addr also has to be checked, in order to distinguish RAM and I/O
regions.

So, do the following:

1) add a new define RAM_ADDR_INVALID, and test it in the assertions
instead of mr->terminates

2) IOMMU regions were not setting mr->ram_addr to a bogus value, initialize
it in the instance_init function so that the new assertions would fire
for IOMMU regions as well.

Backports commit ec05ec26f940564b1e07bf88857035ec27e21dd8 from qemu
This commit is contained in:
Paolo Bonzini 2018-02-13 11:30:26 -05:00 committed by Lioncash
parent fc7b95d06a
commit 88d1506e6a
No known key found for this signature in database
GPG key ID: 4E3C3CC1031BA9C7
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
qemu/memory.c
View file

@ -29,6 +29,7 @@
//#define DEBUG_UNASSIGNED
#define RAM_ADDR_INVALID (~(ram_addr_t)0)
// Unicorn engine
MemoryRegion *memory_map(struct uc_struct *uc, hwaddr begin, size_t size, uint32_t perms)
@ -949,6 +950,7 @@ static void memory_region_initfn(struct uc_struct *uc, Object *obj, void *opaque
ObjectProperty *op;
mr->ops = &unassigned_mem_ops;
mr->ram_addr = RAM_ADDR_INVALID;
mr->enabled = true;
mr->romd_mode = true;
mr->destructor = memory_region_destructor_none;
@ -1143,7 +1145,6 @@ void memory_region_init_io(struct uc_struct *uc, MemoryRegion *mr,
mr->ops = ops;
mr->opaque = opaque;
mr->terminates = true;
mr->ram_addr = ~(ram_addr_t)0;
}
void memory_region_init_ram(struct uc_struct *uc, MemoryRegion *mr,
@ -1328,7 +1329,7 @@ int memory_region_get_fd(MemoryRegion *mr)
return memory_region_get_fd(mr->alias);
}
assert(mr->terminates);
assert(mr->ram_addr != RAM_ADDR_INVALID);
return qemu_get_ram_fd(mr->uc, mr->ram_addr & TARGET_PAGE_MASK);
}
@ -1347,6 +1348,7 @@ void *memory_region_get_ram_ptr(MemoryRegion *mr)
bool memory_region_test_and_clear_dirty(MemoryRegion *mr, hwaddr addr,
hwaddr size, unsigned client)
{
assert(mr->ram_addr != RAM_ADDR_INVALID);
return cpu_physical_memory_test_and_clear_dirty(mr->uc, mr->ram_addr + addr,
size, client);
}