a_dinosaur/ZSNES
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rewind buffer size no longer wastes MB of RAM. Fix for DOS

Browse Source
This commit is contained in:
n-a-c-h
2005-02-01 22:03:19 +00:00
parent 70140e1090
commit d5c1848408
1 changed files with 20 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
zsnes/src/cpu/zstate.c
View File

@@ -301,33 +301,46 @@ extern unsigned int CBackupPos, PBackupPos, RewindPos, RewindOldPos;
void BackupCVFrame() void BackupCVFrame()
{ {
unsigned char *RewindBufferPos = StateBackup + (CBackupPos << 19) + 1024; unsigned char *RewindBufferPos = StateBackup + CBackupPos*rewind_state_size;
//printf("Backing up rewind in slot #%u\n", CBackupPos);
copy_state_data(RewindBufferPos, memcpyinc, false); copy_state_data(RewindBufferPos, memcpyinc, false);
} }
void RestoreCVFrame() void RestoreCVFrame()
{ {
unsigned char *RewindBufferPos = StateBackup + (PBackupPos << 19) + 1024; unsigned char *RewindBufferPos = StateBackup + PBackupPos*rewind_state_size;
//printf("Restoring rewind in slot #%u\n", PBackupPos);
copy_state_data(RewindBufferPos, memcpyrinc, true); copy_state_data(RewindBufferPos, memcpyrinc, true);
} }
void SetupRewindBuffer() void SetupRewindBuffer()
{ {
extern void outofmemory(); extern void outofmemory();
if (!StateBackup) if (StateBackup){ free(StateBackup); }
{ StateBackup = 0;
StateBackup = (unsigned char *)malloc(4096*128*16); StateBackup = (unsigned char *)malloc(rewind_state_size*16);
}
if (!StateBackup) { outofmemory(); } if (!StateBackup) { outofmemory(); }
} }
static size_t state_size;
static void state_size_tally(unsigned char **dest, void *src, size_t len)
{
state_size += len;
}
void InitRewindVars() void InitRewindVars()
{ {
#ifndef __MSDOS__ //When all the code is ported to C, we can make this work with DOS too
unsigned char almost_useless_array[1]; //An array is needed for copy_state_data to give the correct size
state_size = 0;
copy_state_data(almost_useless_array, state_size_tally, false);
rewind_state_size = state_size;
SetupRewindBuffer(); SetupRewindBuffer();
RewindPos = 0; RewindPos = 0;
RewindOldPos = 0; RewindOldPos = 0;
//RewindEarliestPos = 0; //RewindEarliestPos = 0;
RewindTimer = 60*4; RewindTimer = 60*4;
#endif
} }
//This is used to preserve system load state between loads //This is used to preserve system load state between loads
@@ -642,18 +655,8 @@ static void write_save_state_data(unsigned char **dest, void *data, size_t len)
static const char zst_header_old[] = "ZSNES Save State File V0.6\x1a\x3c"; static const char zst_header_old[] = "ZSNES Save State File V0.6\x1a\x3c";
static const char zst_header_cur[] = "ZSNES Save State File V143\x1a\x3c"; static const char zst_header_cur[] = "ZSNES Save State File V143\x1a\x3c";
static size_t state_size;
static void state_size_tally(unsigned char **dest, void *src, size_t len)
{
state_size += len;
}
void calculate_state_sizes() void calculate_state_sizes()
{ {
state_size = 0;
copy_state_data(StateBackup, state_size_tally, false);
rewind_state_size = state_size;
state_size = 0; state_size = 0;
zst_version = 143; zst_version = 143;
copy_state_data(0, state_size_tally, false); copy_state_data(0, state_size_tally, false);
@@ -663,13 +666,6 @@ void calculate_state_sizes()
zst_version = 60; zst_version = 60;
copy_state_data(0, state_size_tally, true); copy_state_data(0, state_size_tally, true);
old_zst_size = state_size + sizeof(zst_header_old)-1; old_zst_size = state_size + sizeof(zst_header_old)-1;
/*
printf("Rewind size: %u; ZST v1.43 size: %u; ZST v0.60 size: %u\n"
"ZST sizes with thumbnails. v1.43 size: %u; v0.60 size: %u\n",
rewind_state_size, cur_zst_size, old_zst_size,
cur_zst_size + 64*56*sizeof(unsigned short), old_zst_size + 64*56*sizeof(unsigned short));
*/
} }
void PrepareOffset() void PrepareOffset()