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

Merge branch 'master' of https://github.com/TASVideos/BizHawk

This commit is contained in:
adelikat 2016-12-07 12:33:47 -06:00
parent 72e5c3e4dd eda1b44238
commit 6b02e9d551
5 changed files with 46 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
BizHawk.Emulation.Cores/CPUs/CP1610/CP1610.Execute.cs
View File

@ -1,6 +1,4 @@
using System; using System;
using BizHawk.Common;
using BizHawk.Emulation.Common; using BizHawk.Emulation.Common;
namespace BizHawk.Emulation.Cores.Components.CP1610 namespace BizHawk.Emulation.Cores.Components.CP1610
@ -49,15 +47,6 @@ namespace BizHawk.Emulation.Cores.Components.CP1610
}; };
} }
public void SyncState(Serializer ser)
{
ser.BeginSection("CP1610");
// TODO
ser.EndSection();
}
private void Calc_FlagC(int result) private void Calc_FlagC(int result)
{ {
FlagC = ((result & 0x10000) != 0); FlagC = ((result & 0x10000) != 0);

28
BizHawk.Emulation.Cores/CPUs/CP1610/CP1610.cs
View File

@ -1,6 +1,6 @@
using System; using System;
using System.IO; using System.IO;
using BizHawk.Common;
using BizHawk.Emulation.Common; using BizHawk.Emulation.Common;
namespace BizHawk.Emulation.Cores.Components.CP1610 namespace BizHawk.Emulation.Cores.Components.CP1610
@ -12,7 +12,7 @@ namespace BizHawk.Emulation.Cores.Components.CP1610
private bool FlagS, FlagC, FlagZ, FlagO, FlagI, FlagD, IntRM, BusRq, BusAk, Interruptible, Interrupted; private bool FlagS, FlagC, FlagZ, FlagO, FlagI, FlagD, IntRM, BusRq, BusAk, Interruptible, Interrupted;
//private bool MSync; //private bool MSync;
private readonly ushort[] Register = new ushort[8]; private ushort[] Register = new ushort[8];
private ushort RegisterSP { get { return Register[6]; } set { Register[6] = value; } } private ushort RegisterSP { get { return Register[6]; } set { Register[6] = value; } }
private ushort RegisterPC { get { return Register[7]; } set { Register[7] = value; } } private ushort RegisterPC { get { return Register[7]; } set { Register[7] = value; } }
@ -35,6 +35,30 @@ namespace BizHawk.Emulation.Cores.Components.CP1610
private static bool Logging = true; private static bool Logging = true;
private static readonly StreamWriter Log; private static readonly StreamWriter Log;
public void SyncState(Serializer ser)
{
ser.BeginSection("CP1610");
ser.Sync("Register", ref Register, false);
ser.Sync("FlagS", ref FlagS);
ser.Sync("FlagC", ref FlagC);
ser.Sync("FlagZ", ref FlagZ);
ser.Sync("FlagO", ref FlagO);
ser.Sync("FlagI", ref FlagI);
ser.Sync("FlagD", ref FlagD);
ser.Sync("IntRM", ref IntRM);
ser.Sync("BusRq", ref BusRq);
ser.Sync("BusAk", ref BusAk);
ser.Sync("BusRq", ref BusRq);
ser.Sync("Interruptible", ref Interruptible);
ser.Sync("Interrupted", ref Interrupted);
ser.Sync("Toal_executed_cycles", ref TotalExecutedCycles);
ser.Sync("Pending Cycles", ref PendingCycles);
ser.EndSection();
}
static CP1610() static CP1610()
{ {
if (Logging) if (Logging)

8
BizHawk.Emulation.Cores/Consoles/Intellivision/Intellivision.IStatable.cs
View File

@ -51,6 +51,14 @@ namespace BizHawk.Emulation.Cores.Intellivision
ser.Sync("version", ref version); ser.Sync("version", ref version);
ser.Sync("Frame", ref _frame); ser.Sync("Frame", ref _frame);
ser.Sync("ScratchpadRam", ref ScratchpadRam, false);
ser.Sync("SystemRam", ref SystemRam, false);
ser.Sync("ExecutiveRom", ref ExecutiveRom, false);
ser.Sync("GraphicsRom", ref GraphicsRom, false);
ser.Sync("GraphicsRam", ref GraphicsRam, false);
_cpu.SyncState(ser); _cpu.SyncState(ser);
_stic.SyncState(ser); _stic.SyncState(ser);
_psg.SyncState(ser); _psg.SyncState(ser);

4
BizHawk.Emulation.Cores/Consoles/Intellivision/PSG.cs
View File

@ -36,7 +36,9 @@ namespace BizHawk.Emulation.Cores.Intellivision
{ {
ser.BeginSection("PSG"); ser.BeginSection("PSG");
// TODO ser.Sync("Register", ref Register, false);
ser.Sync("Toal_executed_cycles", ref TotalExecutedCycles);
ser.Sync("Pending Cycles", ref PendingCycles);
ser.EndSection(); ser.EndSection();
} }

8
BizHawk.Emulation.Cores/Consoles/Intellivision/STIC.cs
View File

@ -29,7 +29,13 @@ namespace BizHawk.Emulation.Cores.Intellivision
{ {
ser.BeginSection("STIC"); ser.BeginSection("STIC");
// TODO ser.Sync("Sr1", ref Sr1);
ser.Sync("Sr2", ref Sr2);
ser.Sync("Sst", ref Sst);
ser.Sync("Fgbg", ref Fgbg);
ser.Sync("Toal_executed_cycles", ref TotalExecutedCycles);
ser.Sync("Pending Cycles", ref PendingCycles);
ser.Sync("Registers", ref Register, false);
ser.EndSection(); ser.EndSection();
} }