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

Added Interruptible and assigned it for every op.

This commit is contained in:
brandman211 2012-08-05 07:04:03 +00:00
parent e9a8980f0c
commit a19b76e6cc
2 changed files with 44 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
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, IntRM, BusRq, BusAk, MSync; private bool FlagS, FlagC, FlagZ, FlagO, FlagI, FlagD, IntRM, BusRq, BusAk, MSync, Interruptible;
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; } }

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

@ -68,14 +68,17 @@ namespace BizHawk.Emulation.CPUs.CP1610
case 0x001: // SDBD case 0x001: // SDBD
FlagD = true; FlagD = true;
PendingCycles -= 4; TotalExecutedCycles += 4; PendingCycles -= 4; TotalExecutedCycles += 4;
Interruptible = false;
break; break;
case 0x002: // EIS case 0x002: // EIS
FlagI = true; FlagI = true;
PendingCycles -= 4; TotalExecutedCycles += 4; PendingCycles -= 4; TotalExecutedCycles += 4;
Interruptible = false;
break; break;
case 0x003: // DIS case 0x003: // DIS
FlagI = false; FlagI = false;
PendingCycles -= 4; TotalExecutedCycles += 4; PendingCycles -= 4; TotalExecutedCycles += 4;
Interruptible = false;
break; break;
case 0x004: // J, JE, JD, JSR, JSRE, JSRD case 0x004: // J, JE, JD, JSR, JSRE, JSRD
// 0000:0000:0000:0100 0000:00rr:aaaa:aaff 0000:00aa:aaaa:aaaa // 0000:0000:0000:0100 0000:00rr:aaaa:aaff 0000:00aa:aaaa:aaaa
@ -103,16 +106,19 @@ namespace BizHawk.Emulation.CPUs.CP1610
} }
RegisterPC = (ushort)addr; RegisterPC = (ushort)addr;
PendingCycles -= 12; TotalExecutedCycles += 12; PendingCycles -= 12; TotalExecutedCycles += 12;
Interruptible = true;
break; break;
case 0x005: // TCI case 0x005: // TCI
throw new ArgumentException(UNEXPECTED_TCI); throw new ArgumentException(UNEXPECTED_TCI);
case 0x006: // CLRC case 0x006: // CLRC
FlagC = false; FlagC = false;
PendingCycles -= 4; TotalExecutedCycles += 4; PendingCycles -= 4; TotalExecutedCycles += 4;
Interruptible = false;
break; break;
case 0x007: // SETC case 0x007: // SETC
FlagC = true; FlagC = true;
PendingCycles -= 4; TotalExecutedCycles += 4; PendingCycles -= 4; TotalExecutedCycles += 4;
Interruptible = false;
break; break;
// INCR // INCR
case 0x008: case 0x008:
@ -130,6 +136,7 @@ namespace BizHawk.Emulation.CPUs.CP1610
Calc_FlagZ(result); Calc_FlagZ(result);
Register[dest] = (ushort)result; Register[dest] = (ushort)result;
PendingCycles -= 6; TotalExecutedCycles += 6; PendingCycles -= 6; TotalExecutedCycles += 6;
Interruptible = true;
break; break;
// DECR // DECR
case 0x010: case 0x010:
@ -146,6 +153,7 @@ namespace BizHawk.Emulation.CPUs.CP1610
Calc_FlagZ(result); Calc_FlagZ(result);
Register[dest] = (ushort)result; Register[dest] = (ushort)result;
PendingCycles -= 6; TotalExecutedCycles += 6; PendingCycles -= 6; TotalExecutedCycles += 6;
Interruptible = true;
break; break;
// COMR // COMR
case 0x018: case 0x018:
@ -163,6 +171,7 @@ namespace BizHawk.Emulation.CPUs.CP1610
Calc_FlagZ(result); Calc_FlagZ(result);
Register[dest] = (ushort)result; Register[dest] = (ushort)result;
PendingCycles -= 6; TotalExecutedCycles += 6; PendingCycles -= 6; TotalExecutedCycles += 6;
Interruptible = true;
break; break;
// NEGR // NEGR
case 0x020: case 0x020:
@ -185,6 +194,7 @@ namespace BizHawk.Emulation.CPUs.CP1610
result &= 0xFFFF; result &= 0xFFFF;
Register[dest] = (ushort)result; Register[dest] = (ushort)result;
PendingCycles -= 6; TotalExecutedCycles += 6; PendingCycles -= 6; TotalExecutedCycles += 6;
Interruptible = true;
break; break;
// ADCR // ADCR
case 0x028: case 0x028:
@ -207,6 +217,7 @@ namespace BizHawk.Emulation.CPUs.CP1610
result &= 0xFFFF; result &= 0xFFFF;
Register[dest] = (ushort)result; Register[dest] = (ushort)result;
PendingCycles -= 6; TotalExecutedCycles += 6; PendingCycles -= 6; TotalExecutedCycles += 6;
Interruptible = true;
break; break;
// GSWD // GSWD
case 0x030: case 0x030:
@ -219,11 +230,13 @@ namespace BizHawk.Emulation.CPUs.CP1610
(FlagC ? 1 : 0); (FlagC ? 1 : 0);
Register[dest] = (ushort)((status_word << 12) | (status_word << 4)); Register[dest] = (ushort)((status_word << 12) | (status_word << 4));
PendingCycles -= 6; TotalExecutedCycles += 6; PendingCycles -= 6; TotalExecutedCycles += 6;
Interruptible = true;
break; break;
// NOP // NOP
case 0x034: case 0x034:
case 0x035: case 0x035:
PendingCycles -= 6; TotalExecutedCycles += 6; PendingCycles -= 6; TotalExecutedCycles += 6;
Interruptible = true;
break; break;
// SIN // SIN
case 0x036: case 0x036:
@ -246,6 +259,7 @@ namespace BizHawk.Emulation.CPUs.CP1610
FlagZ = ((src_value & 0x20) != 0) ? true : false; FlagZ = ((src_value & 0x20) != 0) ? true : false;
FlagS = ((src_value & 0x10) != 0) ? true : false; FlagS = ((src_value & 0x10) != 0) ? true : false;
PendingCycles -= 6; TotalExecutedCycles += 6; PendingCycles -= 6; TotalExecutedCycles += 6;
Interruptible = true;
break; break;
// SWAP // SWAP
case 0x040: case 0x040:
@ -274,6 +288,7 @@ namespace BizHawk.Emulation.CPUs.CP1610
Calc_FlagS_7(result); Calc_FlagS_7(result);
Calc_FlagZ(result); Calc_FlagZ(result);
Register[dest] = (ushort)result; Register[dest] = (ushort)result;
Interruptible = false;
break; break;
// SLL // SLL
case 0x048: case 0x048:
@ -301,6 +316,7 @@ namespace BizHawk.Emulation.CPUs.CP1610
Calc_FlagS(result); Calc_FlagS(result);
Calc_FlagZ(result); Calc_FlagZ(result);
Register[dest] = (ushort)result; Register[dest] = (ushort)result;
Interruptible = false;
break; break;
// RLC // RLC
case 0x050: case 0x050:
@ -332,6 +348,7 @@ namespace BizHawk.Emulation.CPUs.CP1610
Calc_FlagS(result); Calc_FlagS(result);
Calc_FlagZ(result); Calc_FlagZ(result);
Register[dest] = (ushort)result; Register[dest] = (ushort)result;
Interruptible = false;
break; break;
// SLLC // SLLC
case 0x058: case 0x058:
@ -362,6 +379,7 @@ namespace BizHawk.Emulation.CPUs.CP1610
Calc_FlagS(result); Calc_FlagS(result);
Calc_FlagZ(result); Calc_FlagZ(result);
Register[dest] = (ushort)result; Register[dest] = (ushort)result;
Interruptible = false;
break; break;
// SLR // SLR
case 0x060: case 0x060:
@ -389,6 +407,7 @@ namespace BizHawk.Emulation.CPUs.CP1610
Calc_FlagS_7(result); Calc_FlagS_7(result);
Calc_FlagZ(result); Calc_FlagZ(result);
Register[dest] = (ushort)result; Register[dest] = (ushort)result;
Interruptible = false;
break; break;
// SAR // SAR
case 0x068: case 0x068:
@ -419,6 +438,7 @@ namespace BizHawk.Emulation.CPUs.CP1610
Calc_FlagS_7(result); Calc_FlagS_7(result);
Calc_FlagZ(result); Calc_FlagZ(result);
Register[dest] = (ushort)result; Register[dest] = (ushort)result;
Interruptible = false;
break; break;
// RRC // RRC
case 0x070: case 0x070:
@ -450,6 +470,7 @@ namespace BizHawk.Emulation.CPUs.CP1610
Calc_FlagS_7(result); Calc_FlagS_7(result);
Calc_FlagZ(result); Calc_FlagZ(result);
Register[dest] = (ushort)result; Register[dest] = (ushort)result;
Interruptible = false;
break; break;
// SARC // SARC
case 0x078: case 0x078:
@ -482,6 +503,7 @@ namespace BizHawk.Emulation.CPUs.CP1610
Calc_FlagS_7(result); Calc_FlagS_7(result);
Calc_FlagZ(result); Calc_FlagZ(result);
Register[dest] = (ushort)result; Register[dest] = (ushort)result;
Interruptible = false;
break; break;
// MOVR // MOVR
case 0x080: case 0x080:
@ -562,6 +584,7 @@ namespace BizHawk.Emulation.CPUs.CP1610
{ {
PendingCycles -= 6; TotalExecutedCycles += 6; PendingCycles -= 6; TotalExecutedCycles += 6;
} }
Interruptible = true;
break; break;
// ADDR // ADDR
case 0x0C0: case 0x0C0:
@ -641,6 +664,7 @@ namespace BizHawk.Emulation.CPUs.CP1610
result &= 0xFFFF; result &= 0xFFFF;
Register[dest] = (ushort)result; Register[dest] = (ushort)result;
PendingCycles -= 6; TotalExecutedCycles += 6; PendingCycles -= 6; TotalExecutedCycles += 6;
Interruptible = true;
break; break;
// SUBR // SUBR
case 0x100: case 0x100:
@ -720,6 +744,7 @@ namespace BizHawk.Emulation.CPUs.CP1610
result &= 0xFFFF; result &= 0xFFFF;
Register[dest] = (ushort)result; Register[dest] = (ushort)result;
PendingCycles -= 6; TotalExecutedCycles += 6; PendingCycles -= 6; TotalExecutedCycles += 6;
Interruptible = true;
break; break;
// CMPR // CMPR
case 0x140: case 0x140:
@ -797,6 +822,7 @@ namespace BizHawk.Emulation.CPUs.CP1610
Calc_FlagS(result); Calc_FlagS(result);
Calc_FlagZ(result); Calc_FlagZ(result);
PendingCycles -= 6; TotalExecutedCycles += 6; PendingCycles -= 6; TotalExecutedCycles += 6;
Interruptible = true;
break; break;
// ANDR // ANDR
case 0x180: case 0x180:
@ -871,6 +897,7 @@ namespace BizHawk.Emulation.CPUs.CP1610
Calc_FlagZ(result); Calc_FlagZ(result);
Register[dest] = (ushort)result; Register[dest] = (ushort)result;
PendingCycles -= 6; TotalExecutedCycles += 6; PendingCycles -= 6; TotalExecutedCycles += 6;
Interruptible = true;
break; break;
// XORR // XORR
case 0x1C0: case 0x1C0:
@ -944,6 +971,7 @@ namespace BizHawk.Emulation.CPUs.CP1610
Calc_FlagZ(result); Calc_FlagZ(result);
Register[dest] = (ushort)result; Register[dest] = (ushort)result;
PendingCycles -= 6; TotalExecutedCycles += 6; PendingCycles -= 6; TotalExecutedCycles += 6;
Interruptible = true;
break; break;
// Branch Forward, no External Condition // Branch Forward, no External Condition
case 0x200: // B case 0x200: // B
@ -1101,6 +1129,7 @@ namespace BizHawk.Emulation.CPUs.CP1610
{ {
PendingCycles -= 7; TotalExecutedCycles += 7; PendingCycles -= 7; TotalExecutedCycles += 7;
} }
Interruptible = true;
break; break;
// MVO // MVO
case 0x240: case 0x240:
@ -1115,6 +1144,7 @@ namespace BizHawk.Emulation.CPUs.CP1610
addr = ReadMemory(RegisterPC++); addr = ReadMemory(RegisterPC++);
WriteMemory(addr, Register[src]); WriteMemory(addr, Register[src]);
PendingCycles -= 11; TotalExecutedCycles += 11; PendingCycles -= 11; TotalExecutedCycles += 11;
Interruptible = false;
break; break;
// MVO@ // MVO@
case 0x248: case 0x248:
@ -1180,6 +1210,7 @@ namespace BizHawk.Emulation.CPUs.CP1610
if (mem >= 0x4) if (mem >= 0x4)
Register[mem]++; Register[mem]++;
PendingCycles -= 9; TotalExecutedCycles += 9; PendingCycles -= 9; TotalExecutedCycles += 9;
Interruptible = false;
break; break;
// MVI // MVI
case 0x280: case 0x280:
@ -1195,6 +1226,7 @@ namespace BizHawk.Emulation.CPUs.CP1610
addr = ReadMemory(RegisterPC++); addr = ReadMemory(RegisterPC++);
Register[dest] = ReadMemory(addr); Register[dest] = ReadMemory(addr);
PendingCycles -= 10; TotalExecutedCycles += 10; PendingCycles -= 10; TotalExecutedCycles += 10;
Interruptible = true;
break; break;
// MVI@ // MVI@
case 0x288: case 0x288:
@ -1280,6 +1312,7 @@ namespace BizHawk.Emulation.CPUs.CP1610
// Auto-increment the memory register if it does so on write. // Auto-increment the memory register if it does so on write.
if (mem >= 0x4 && mem != 0x6) if (mem >= 0x4 && mem != 0x6)
Register[mem]++; Register[mem]++;
Interruptible = true;
break; break;
// ADD // ADD
case 0x2C0: case 0x2C0:
@ -1303,6 +1336,7 @@ namespace BizHawk.Emulation.CPUs.CP1610
result &= 0xFFFF; result &= 0xFFFF;
Register[dest] = (ushort)result; Register[dest] = (ushort)result;
PendingCycles -= 10; TotalExecutedCycles += 10; PendingCycles -= 10; TotalExecutedCycles += 10;
Interruptible = true;
break; break;
// ADD@ // ADD@
case 0x2C8: case 0x2C8:
@ -1396,6 +1430,7 @@ namespace BizHawk.Emulation.CPUs.CP1610
Calc_FlagZ(result); Calc_FlagZ(result);
result &= 0xFFFF; result &= 0xFFFF;
Register[dest] = (ushort)result; Register[dest] = (ushort)result;
Interruptible = true;
break; break;
// SUB // SUB
case 0x300: case 0x300:
@ -1419,6 +1454,7 @@ namespace BizHawk.Emulation.CPUs.CP1610
result &= 0xFFFF; result &= 0xFFFF;
Register[dest] = (ushort)result; Register[dest] = (ushort)result;
PendingCycles -= 10; TotalExecutedCycles += 10; PendingCycles -= 10; TotalExecutedCycles += 10;
Interruptible = true;
break; break;
// SUB@ // SUB@
case 0x308: case 0x308:
@ -1513,6 +1549,7 @@ namespace BizHawk.Emulation.CPUs.CP1610
Calc_FlagZ(result); Calc_FlagZ(result);
result &= 0xFFFF; result &= 0xFFFF;
Register[dest] = (ushort)result; Register[dest] = (ushort)result;
Interruptible = true;
break; break;
// CMP // CMP
case 0x340: case 0x340:
@ -1533,6 +1570,7 @@ namespace BizHawk.Emulation.CPUs.CP1610
Calc_FlagS(result); Calc_FlagS(result);
Calc_FlagZ(result); Calc_FlagZ(result);
PendingCycles -= 10; TotalExecutedCycles += 10; PendingCycles -= 10; TotalExecutedCycles += 10;
Interruptible = true;
break; break;
// CMP@ // CMP@
case 0x348: case 0x348:
@ -1625,6 +1663,7 @@ namespace BizHawk.Emulation.CPUs.CP1610
Calc_FlagO_Add(dest_value, -mem_read); Calc_FlagO_Add(dest_value, -mem_read);
Calc_FlagS(result); Calc_FlagS(result);
Calc_FlagZ(result); Calc_FlagZ(result);
Interruptible = true;
break; break;
// AND // AND
case 0x380: case 0x380:
@ -1645,6 +1684,7 @@ namespace BizHawk.Emulation.CPUs.CP1610
Calc_FlagZ(result); Calc_FlagZ(result);
Register[dest] = (ushort)result; Register[dest] = (ushort)result;
PendingCycles -= 10; TotalExecutedCycles += 10; PendingCycles -= 10; TotalExecutedCycles += 10;
Interruptible = true;
break; break;
// AND@ // AND@
case 0x388: case 0x388:
@ -1734,6 +1774,7 @@ namespace BizHawk.Emulation.CPUs.CP1610
Calc_FlagS(result); Calc_FlagS(result);
Calc_FlagZ(result); Calc_FlagZ(result);
Register[dest] = (ushort)result; Register[dest] = (ushort)result;
Interruptible = true;
break; break;
// XOR // XOR
case 0x3C0: case 0x3C0:
@ -1754,6 +1795,7 @@ namespace BizHawk.Emulation.CPUs.CP1610
Calc_FlagZ(result); Calc_FlagZ(result);
Register[dest] = (ushort)result; Register[dest] = (ushort)result;
PendingCycles -= 10; TotalExecutedCycles += 10; PendingCycles -= 10; TotalExecutedCycles += 10;
Interruptible = true;
break; break;
// XOR@ // XOR@
case 0x3C8: case 0x3C8:
@ -1844,6 +1886,7 @@ namespace BizHawk.Emulation.CPUs.CP1610
Calc_FlagS(result); Calc_FlagS(result);
Calc_FlagZ(result); Calc_FlagZ(result);
Register[dest] = (ushort)result; Register[dest] = (ushort)result;
Interruptible = true;
break; break;
} }
if (FlagD == prev_FlagD) if (FlagD == prev_FlagD)