diff --git a/core/linux/posix_vmem.cpp b/core/linux/posix_vmem.cpp index 6916e3df2..5c8b258dc 100644 --- a/core/linux/posix_vmem.cpp +++ b/core/linux/posix_vmem.cpp @@ -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); } diff --git a/core/serialize.cpp b/core/serialize.cpp index cbd9827e1..0886f3042 100644 --- a/core/serialize.cpp +++ b/core/serialize.cpp @@ -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) ;