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

SMS: maybe fix some desyncs. needs retest by someone that can make it fail

This commit is contained in:
beirich 2014-01-31 03:50:38 +00:00
parent e634d9558a
commit 4f65c621e5
2 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
BizHawk.Emulation.Cores/Consoles/Sega/SMS/SMS.cs
View File

@ -352,7 +352,7 @@ namespace BizHawk.Emulation.Cores.Sega.MasterSystem
public byte[] SaveStateBinary()
{
var buf = new byte[24802 + 1 + 16384 + 16384];
var buf = new byte[24806 + 1 + 16384 + 16384];
var stream = new MemoryStream(buf);
var writer = new BinaryWriter(stream);
SaveStateBinary(writer);

22
BizHawk.Emulation.Cores/Consoles/Sega/SMS/VDP.cs
View File

@ -27,8 +27,9 @@ namespace BizHawk.Emulation.Cores.Sega.MasterSystem
VdpCommand vdpCommand;
int TmsMode = 4;
bool VIntPending;
bool HIntPending;
bool VIntPending; // FIXME put in savestate
bool HIntPending; // FIXME put in savestate
int lineIntLinesRemaining; // FIXME put in savestate
SMS Sms;
VdpMode mode;
@ -320,8 +321,6 @@ namespace BizHawk.Emulation.Cores.Sega.MasterSystem
}
}
int lineIntLinesRemaining;
void ProcessFrameInterrupt()
{
if (ScanLine == FrameHeight + 1)
@ -415,6 +414,9 @@ namespace BizHawk.Emulation.Cores.Sega.MasterSystem
writer.WriteLine("ReadBuffer {0:X2}", VdpBuffer);
writer.WriteLine("VdpAddress {0:X4}", VdpAddress);
writer.WriteLine("Command " + Enum.GetName(typeof(VdpCommand), vdpCommand));
writer.WriteLine("HIntPending {0}", HIntPending);
writer.WriteLine("VIntPending {0}", VIntPending);
writer.WriteLine("LineIntLinesRemaining {0}", lineIntLinesRemaining);
writer.Write("Registers ");
Registers.SaveAsHex(writer);
@ -446,6 +448,12 @@ namespace BizHawk.Emulation.Cores.Sega.MasterSystem
VdpAddress = ushort.Parse(args[1], NumberStyles.HexNumber);
else if (args[0] == "Command")
vdpCommand = (VdpCommand)Enum.Parse(typeof(VdpCommand), args[1]);
else if (args[0] == "HIntPending")
HIntPending = bool.Parse(args[1]);
else if (args[0] == "VIntPending")
VIntPending = bool.Parse(args[1]);
else if (args[0] == "LineIntLinesRemaining")
lineIntLinesRemaining = int.Parse(args[1]);
else if (args[0] == "Registers")
Registers.ReadFromHex(args[1]);
else if (args[0] == "CRAM")
@ -475,6 +483,9 @@ namespace BizHawk.Emulation.Cores.Sega.MasterSystem
writer.Write(VdpBuffer);
writer.Write(VdpAddress);
writer.Write((byte)vdpCommand);
writer.Write(HIntPending);
writer.Write(VIntPending);
writer.Write((short)lineIntLinesRemaining);
writer.Write(Registers);
writer.Write(CRAM);
writer.Write(VRAM);
@ -488,6 +499,9 @@ namespace BizHawk.Emulation.Cores.Sega.MasterSystem
VdpBuffer = reader.ReadByte();
VdpAddress = reader.ReadUInt16();
vdpCommand = (VdpCommand)Enum.ToObject(typeof(VdpCommand), reader.ReadByte());
HIntPending = reader.ReadBoolean();
VIntPending = reader.ReadBoolean();
lineIntLinesRemaining = reader.ReadInt16();
Registers = reader.ReadBytes(Registers.Length);
CRAM = reader.ReadBytes(CRAM.Length);
VRAM = reader.ReadBytes(VRAM.Length);