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

Fix snapshot bugs.

This commit is contained in:
BearOso 2023-03-27 17:10:19 -05:00
parent 97dd443e63
commit d5400f77bb
3 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
memmap.cpp
View File

@ -930,7 +930,7 @@ bool8 CMemory::Init (void)
ROMStorage.resize(MAX_ROM_SIZE + 0x200 + 0x8000); ROMStorage.resize(MAX_ROM_SIZE + 0x200 + 0x8000);
std::fill(ROMStorage.begin(), ROMStorage.end(), 0); std::fill(ROMStorage.begin(), ROMStorage.end(), 0);
SRAMStorage.resize(0x80000); SRAMStorage.resize(SRAM_SIZE);
std::fill(SRAMStorage.begin(), SRAMStorage.end(), 0); std::fill(SRAMStorage.begin(), SRAMStorage.end(), 0);
SRAM = &SRAMStorage[0]; SRAM = &SRAMStorage[0];
memset(RAM, 0, sizeof(RAM)); memset(RAM, 0, sizeof(RAM));

1
memmap.h
View File

@ -61,6 +61,7 @@ struct CMemory
uint8 *ROM; uint8 *ROM;
std::vector<uint8_t> SRAMStorage; std::vector<uint8_t> SRAMStorage;
uint8 *SRAM; uint8 *SRAM;
const size_t SRAM_SIZE = 0x80000;
uint8 VRAM[0x10000]; uint8 VRAM[0x10000];
uint8 *FillRAM; uint8 *FillRAM;
uint8 *BWRAM; uint8 *BWRAM;

16
snapshot.cpp
View File

@ -1193,7 +1193,7 @@ void S9xFreezeToStream (STREAM stream)
FreezeBlock (stream, "RAM", Memory.RAM, sizeof(Memory.RAM)); FreezeBlock (stream, "RAM", Memory.RAM, sizeof(Memory.RAM));
FreezeBlock (stream, "SRA", Memory.SRAM, sizeof(Memory.SRAM)); FreezeBlock (stream, "SRA", Memory.SRAM, Memory.SRAM_SIZE);
FreezeBlock (stream, "FIL", Memory.FillRAM, 0x8000); FreezeBlock (stream, "FIL", Memory.FillRAM, 0x8000);
@ -1399,9 +1399,9 @@ int S9xUnfreezeFromStream (STREAM stream)
break; break;
if (fast) if (fast)
result = UnfreezeBlock(stream, "SRA", Memory.SRAM, sizeof(Memory.SRAM)); result = UnfreezeBlock(stream, "SRA", Memory.SRAM, Memory.SRAM_SIZE);
else else
result = UnfreezeBlockCopy (stream, "SRA", &local_sram, sizeof(Memory.SRAM)); result = UnfreezeBlockCopy (stream, "SRA", &local_sram, Memory.SRAM_SIZE);
if (result != SUCCESS) if (result != SUCCESS)
break; break;
@ -1571,7 +1571,7 @@ int S9xUnfreezeFromStream (STREAM stream)
memcpy(Memory.RAM, local_ram, 0x20000); memcpy(Memory.RAM, local_ram, 0x20000);
if (local_sram) if (local_sram)
memcpy(Memory.SRAM, local_sram, 0x80000); memcpy(Memory.SRAM, local_sram, Memory.SRAM_SIZE);
if (local_fillram) if (local_fillram)
memcpy(Memory.FillRAM, local_fillram, 0x8000); memcpy(Memory.FillRAM, local_fillram, 0x8000);
@ -1585,7 +1585,7 @@ int S9xUnfreezeFromStream (STREAM stream)
{ {
printf("Adjusting old APU snapshot (snapshot version %d, current is %d)\n", version, SNAPSHOT_VERSION); printf("Adjusting old APU snapshot (snapshot version %d, current is %d)\n", version, SNAPSHOT_VERSION);
const size_t spc_block_size = 65700; const size_t spc_block_size = 65700;
const size_t old_dsp_block_size = 513; const size_t old_dsp_block_size = 514;
const size_t added_bytes_v12 = 128; const size_t added_bytes_v12 = 128;
const size_t bytes_afterward = 16; const size_t bytes_afterward = 16;
// Shift end to make room for extra 128 bytes // Shift end to make room for extra 128 bytes
@ -1593,7 +1593,11 @@ int S9xUnfreezeFromStream (STREAM stream)
local_apu_sound + spc_block_size + old_dsp_block_size, local_apu_sound + spc_block_size + old_dsp_block_size,
bytes_afterward); bytes_afterward);
// Copy saved internal registers to external registers // Copy saved internal registers to external registers
memmove(local_apu_sound + spc_block_size + old_dsp_block_size, local_apu_sound + spc_block_size, added_bytes_v12); const size_t new_dsp_registers_position = spc_block_size + 513;
memmove(local_apu_sound + spc_block_size + new_dsp_registers_position,
local_apu_sound + spc_block_size,
added_bytes_v12);
S9xAPULoadState(local_apu_sound); S9xAPULoadState(local_apu_sound);
} }
else if (version >= 12) else if (version >= 12)