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

The robustness update to the Serializer caused a problem when multiple variables with the same string name are saved\loaded in text form. The old system would just read\write them in order; the new one would silently discard all but the last occurrence. The Serializer now throws an exception in these circumstances. To fix individual cores, duplicate usage of variables needs to be enclosed in separate sections. Fixed an occurrence of this in the NES APU, where the two Pulse channels were being confused; fixes sound bugs on loadstate in some games.

This commit is contained in:
goyuken 2012-12-18 03:03:11 +00:00
parent 26abfe4574
commit d479e5661a
2 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
BizHawk.Emulation/Consoles/Nintendo/NES/APU.cs
View File

@ -98,6 +98,7 @@ namespace BizHawk.Emulation.Consoles.Nintendo
public void SyncState(Serializer ser)
{
ser.BeginSection("Pulse" + unit);
ser.Sync("duty_cnt", ref duty_cnt);
ser.Sync("env_loop", ref env_loop);
ser.Sync("env_constant", ref env_constant);
@ -126,6 +127,7 @@ namespace BizHawk.Emulation.Consoles.Nintendo
ser.Sync("env_divider", ref env_divider);
ser.Sync("env_counter", ref env_counter);
ser.Sync("env_output", ref env_output);
ser.EndSection();
}
public bool IsLenCntNonZero() { return len_cnt > 0; }
@ -324,14 +326,15 @@ namespace BizHawk.Emulation.Consoles.Nintendo
public void SyncState(Serializer ser)
{
ser.BeginSection("Noise");
ser.Sync("env_cnt_value", ref env_cnt_value);
ser.Sync("env_loop", ref env_loop);
ser.Sync("env_constant", ref env_constant);
ser.Sync("mode_cnt", ref mode_cnt);
ser.Sync("period_cnt", ref period_cnt);
ser.Sync("mode_cnt", ref mode_cnt);
ser.Sync("period_cnt", ref period_cnt);
//ser.Sync("mode_cnt", ref mode_cnt);
//ser.Sync("period_cnt", ref period_cnt);
ser.Sync("len_cnt", ref len_cnt);
@ -346,6 +349,7 @@ namespace BizHawk.Emulation.Consoles.Nintendo
ser.Sync("env_divider", ref env_divider);
ser.Sync("env_counter", ref env_counter);
ser.Sync("noise_bit", ref noise_bit);
ser.EndSection();
}
@ -468,6 +472,7 @@ namespace BizHawk.Emulation.Consoles.Nintendo
public void SyncState(Serializer ser)
{
ser.BeginSection("Triangle");
ser.Sync("linear_counter_reload", ref linear_counter_reload);
ser.Sync("control_flag", ref control_flag);
ser.Sync("timer_cnt", ref timer_cnt);
@ -480,6 +485,7 @@ namespace BizHawk.Emulation.Consoles.Nintendo
ser.Sync("timer_cnt_reload", ref timer_cnt_reload);
ser.Sync("seq", ref seq);
ser.Sync("sample", ref sample);
ser.EndSection();
}
public bool IsLenCntNonZero() { return len_cnt > 0; }
@ -627,6 +633,7 @@ namespace BizHawk.Emulation.Consoles.Nintendo
public void SyncState(Serializer ser)
{
ser.BeginSection("DMC");
ser.Sync("irq_enabled", ref irq_enabled);
ser.Sync("loop_flag", ref loop_flag);
ser.Sync("timer_reload", ref timer_reload);
@ -647,6 +654,7 @@ namespace BizHawk.Emulation.Consoles.Nintendo
//int sample = 0; //junk
//ser.Sync("sample", ref sample);
ser.EndSection();
}
public void Run()

5
BizHawk.Emulation/Util.cs
View File

@ -823,7 +823,10 @@ namespace BizHawk
var parts = str.Split(' ');
var key = parts[0];
//UGLY: adds whole string instead of splitting the key. later, split the key, and have the individual Sync methods give up that responsibility
curs.Items[key] = parts[1];
if (!curs.Items.ContainsKey(key))
curs.Items[key] = parts[1];
else
throw new Exception(string.Format("Duplicate key \"{0}\" in serializer savestate!", key));
}
}