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

Merge pull request #613 from lunixbochs/master

Browse source 
convert more allocs to glib
This commit is contained in:
Nguyen Anh Quynh 2016-08-11 23:18:58 +08:00 committed by GitHub
parent 6b353fd7a8 cc57ba951f
commit cd86da383b
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
uc.c
View file

@ -675,7 +675,7 @@ static uc_err mem_map(uc_engine *uc, uint64_t address, size_t size, uint32_t per
return UC_ERR_NOMEM; return UC_ERR_NOMEM;
if ((uc->mapped_block_count & (MEM_BLOCK_INCR - 1)) == 0) { //time to grow if ((uc->mapped_block_count & (MEM_BLOCK_INCR - 1)) == 0) { //time to grow
regions = (MemoryRegion**)realloc(uc->mapped_blocks, regions = (MemoryRegion**)g_realloc(uc->mapped_blocks,
sizeof(MemoryRegion*) * (uc->mapped_block_count + MEM_BLOCK_INCR)); sizeof(MemoryRegion*) * (uc->mapped_block_count + MEM_BLOCK_INCR));
if (regions == NULL) { if (regions == NULL) {
return UC_ERR_NOMEM; return UC_ERR_NOMEM;
@ -758,7 +758,7 @@ uc_err uc_mem_map_ptr(uc_engine *uc, uint64_t address, size_t size, uint32_t per
// Generally used in prepartion for splitting a MemoryRegion. // Generally used in prepartion for splitting a MemoryRegion.
static uint8_t *copy_region(struct uc_struct *uc, MemoryRegion *mr) static uint8_t *copy_region(struct uc_struct *uc, MemoryRegion *mr)
{ {
uint8_t *block = (uint8_t *)malloc(int128_get64(mr->size)); uint8_t *block = (uint8_t *)g_malloc0(int128_get64(mr->size));
if (block != NULL) { if (block != NULL) {
uc_err err = uc_mem_read(uc, mr->addr, block, int128_get64(mr->size)); uc_err err = uc_mem_read(uc, mr->addr, block, int128_get64(mr->size));
if (err != UC_ERR_OK) { if (err != UC_ERR_OK) {
@ -1125,7 +1125,7 @@ uint32_t uc_mem_regions(uc_engine *uc, uc_mem_region **regions, uint32_t *count)
*count = uc->mapped_block_count; *count = uc->mapped_block_count;
if (*count) { if (*count) {
r = malloc(*count * sizeof(uc_mem_region)); r = g_malloc0(*count * sizeof(uc_mem_region));
if (r == NULL) { if (r == NULL) {
// out of memory // out of memory
return UC_ERR_NOMEM; return UC_ERR_NOMEM;