folkert/simh-testsetgenerator
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

SCP: future-proof save/restore logic

Browse source 
Distinguish explicitly between save_vercur, the version that is
	used by sim_save(), and save_ver40, the latest defined version
	that is supported by sim_rest().

	The intent is to ensure that a change to save_vercur does not
	cause an unedited sim_rest() to think it knows how to read that
	new format if a human forgets to add the appropriate logic. This
	also removes some possible ambiguity in sim_rest() about what
	elements are present in what format versions.

	Finally, added a comment reminding authors to update save_vercur
	in conjunction with any changes to sim_save().
This commit is contained in:
Scott Bailey 2015-03-31 16:45:17 -04:00 • committed by Mark Pizzolato
parent d84883a4ce
commit 38eaee77d9
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
scp.c
View file

@ -534,6 +534,7 @@ const char *sim_savename = sim_name; /* Simulator Name used in SAVE/RESTORE
/* Tables and strings */
const char save_vercur[] = "V4.0";
const char save_ver40[] = "V4.0";
const char save_ver35[] = "V3.5";
const char save_ver32[] = "V3.2";
const char save_ver30[] = "V3.0";
@ -5409,6 +5410,8 @@ REG *rptr;
#define WRITE_I(xx) sim_fwrite (&(xx), sizeof (xx), 1, sfile)
/* Don't make changes below without also changing save_vercur above */
fprintf (sfile, "%s\n%s\n%s\n%s\n%s\n%.0f\n",
save_vercur, /* [V2.5] save format */
sim_savename, /* sim name */
@ -5553,7 +5556,7 @@ t_bool force_restore = sim_switches & SWMASK ('F');
fstat (fileno (rfile), &rstat);
READ_S (buf); /* [V2.5+] read version */
v40 = v35 = v32 = FALSE;
if (strcmp (buf, save_vercur) == 0) /* version 4.0? */
if (strcmp (buf, save_ver40) == 0) /* version 4.0? */
v40 = v35 = v32 = TRUE;
if (strcmp (buf, save_ver35) == 0) /* version 3.5? */
v35 = v32 = TRUE;