ShuriZma
/
flycast
mirror of https://github.com/flyinghead/flycast.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

linux: vmem conflict with malloc. Ignore savestate with future version

This commit is contained in:
Flyinghead 2021-03-07 17:05:34 +01:00
parent 31e0b3ab51
commit 478b9a9f68
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/linux/posix_vmem.cpp
View File

@ -235,7 +235,7 @@ void vmem_platform_create_mappings(const vmem_mapping *vmem_maps, unsigned numma
for (unsigned j = 0; j < num_mirrors; j++) {
u64 offset = vmem_maps[i].start_address + j * vmem_maps[i].memsize;
verify(mem_region_unmap_file(&virt_ram_base[offset], vmem_maps[i].memsize));
// verify(mem_region_unmap_file(&virt_ram_base[offset], vmem_maps[i].memsize));
verify(mem_region_map_file((void*)(uintptr_t)vmem_fd, &virt_ram_base[offset],
vmem_maps[i].memsize, vmem_maps[i].memoffset, vmem_maps[i].allow_writes) != NULL);
}

7
core/serialize.cpp
View File

@ -764,10 +764,13 @@ bool dc_unserialize(void **data, unsigned int *total_size)
WARN_LOG(SAVESTATE, "Save State version not supported: %d", version);
return false;
}
else
if (version > VCUR_FLYCAST)
{
DEBUG_LOG(SAVESTATE, "Loading state version %d", version);
WARN_LOG(SAVESTATE, "Save State version too recent: %d", version);
return false;
}
DEBUG_LOG(SAVESTATE, "Loading state version %d", version);
REICAST_US(aica_interr) ;
REICAST_US(aica_reg_L) ;
REICAST_US(e68k_out) ;