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

-Throw exceptions for TCI, SIN, and BEXT. 

-Added and logged INTRM, BUSRQ, BUSAK, and MSYNC.
This commit is contained in:
brandman211 2012-08-05 06:47:00 +00:00
parent b83bb1901d
commit e9a8980f0c
2 changed files with 23 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
BizHawk.Emulation/CPUs/CP1610/CP1610.cs
View File

@ -5,7 +5,7 @@ namespace BizHawk.Emulation.CPUs.CP1610
{ {
public sealed partial class CP1610 public sealed partial class CP1610
{ {
private bool FlagS, FlagC, FlagZ, FlagO, FlagI, FlagD; private bool FlagS, FlagC, FlagZ, FlagO, FlagI, FlagD, IntRM, BusRq, BusAk, MSync;
private ushort[] Register = new ushort[8]; private ushort[] Register = new ushort[8];
public ushort RegisterSP { get { return Register[6]; } set { Register[6] = value; } } public ushort RegisterSP { get { return Register[6]; } set { Register[6] = value; } }
public ushort RegisterPC { get { return Register[7]; } set { Register[7] = value; } } public ushort RegisterPC { get { return Register[7]; } set { Register[7] = value; } }
@ -33,12 +33,16 @@ namespace BizHawk.Emulation.CPUs.CP1610
log.WriteLine("R{0:d} = {1:X4}", register, Register[register]); log.WriteLine("R{0:d} = {1:X4}", register, Register[register]);
log.WriteLine("SP = {0:X4}", RegisterSP); log.WriteLine("SP = {0:X4}", RegisterSP);
log.WriteLine("PC = {0:X4}", RegisterPC); log.WriteLine("PC = {0:X4}", RegisterPC);
log.WriteLine("S = {0:X4}", FlagS); log.WriteLine("S = {0}", FlagS);
log.WriteLine("C = {0:X4}", FlagC); log.WriteLine("C = {0}", FlagC);
log.WriteLine("Z = {0:X4}", FlagZ); log.WriteLine("Z = {0}", FlagZ);
log.WriteLine("O = {0:X4}", FlagO); log.WriteLine("O = {0}", FlagO);
log.WriteLine("I = {0:X4}", FlagI); log.WriteLine("I = {0}", FlagI);
log.WriteLine("D = {0:X4}", FlagD); log.WriteLine("D = {0}", FlagD);
log.WriteLine("INTRM = {0}", IntRM);
log.WriteLine("BUSRQ = {0}", BusRq);
log.WriteLine("BUSAK = {0}", BusAk);
log.WriteLine("MSYNC = {0}", MSync);
log.Flush(); log.Flush();
} }
} }

23
BizHawk.Emulation/CPUs/CP1610/Execute.cs
View File

@ -8,7 +8,14 @@ namespace BizHawk.Emulation.CPUs.CP1610
{ {
public sealed partial class CP1610 public sealed partial class CP1610
{ {
private const string HLT_UNEXPECTED = "HLT is an unexpected behavior."; private const string UNEXPECTED_HLT = "HLT is an unexpected behavior; Intellivision should run so long as the power"
+ " is on.";
private const string UNEXPECTED_TCI = "TCI is an unexpected behavior; Intellivision doesn't connect the pin of the"
+ " same name to anything useful.";
private const string UNEXPECTED_SIN = "SIN is an unexpected behavior; Intellivision doesn't connect the CPU's PCIT"
+ " pin to anything else.";
private const string UNEXPECTED_BEXT = "BEXT is an unexpected behavior; Intellivision not connected to the External"
+ " Branch Condition Address pins (EBCA0-EBCA3).";
private void Calc_FlagC(int result) private void Calc_FlagC(int result)
{ {
@ -57,7 +64,7 @@ namespace BizHawk.Emulation.CPUs.CP1610
switch (opcode) switch (opcode)
{ {
case 0x000: // HLT case 0x000: // HLT
throw new ArgumentException(HLT_UNEXPECTED); throw new ArgumentException(UNEXPECTED_HLT);
case 0x001: // SDBD case 0x001: // SDBD
FlagD = true; FlagD = true;
PendingCycles -= 4; TotalExecutedCycles += 4; PendingCycles -= 4; TotalExecutedCycles += 4;
@ -98,10 +105,7 @@ namespace BizHawk.Emulation.CPUs.CP1610
PendingCycles -= 12; TotalExecutedCycles += 12; PendingCycles -= 12; TotalExecutedCycles += 12;
break; break;
case 0x005: // TCI case 0x005: // TCI
throw new NotImplementedException(); throw new ArgumentException(UNEXPECTED_TCI);
// Little or no use in Intellivision.
PendingCycles -= 4; TotalExecutedCycles += 4;
break;
case 0x006: // CLRC case 0x006: // CLRC
FlagC = false; FlagC = false;
PendingCycles -= 4; TotalExecutedCycles += 4; PendingCycles -= 4; TotalExecutedCycles += 4;
@ -224,10 +228,7 @@ namespace BizHawk.Emulation.CPUs.CP1610
// SIN // SIN
case 0x036: case 0x036:
case 0x037: case 0x037:
throw new NotImplementedException(); throw new ArgumentException(UNEXPECTED_SIN);
// Little or no use in Intellivision.
PendingCycles -= 6; TotalExecutedCycles += 6;
break;
// RSWD // RSWD
case 0x038: case 0x038:
case 0x039: case 0x039:
@ -1017,7 +1018,7 @@ namespace BizHawk.Emulation.CPUs.CP1610
ext = opcode & 0x10; ext = opcode & 0x10;
// BEXT // BEXT
if (ext != 0) if (ext != 0)
throw new NotImplementedException("BEXT not implemented."); throw new ArgumentException(UNEXPECTED_BEXT);
else else
{ {
switch (cond) switch (cond)