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

O2Hawk: cpu work

This commit is contained in:
alyosha-tas 2020-04-19 22:52:34 -04:00
parent 91dd8c938e
commit 724f5db816
2 changed files with 23 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
BizHawk.Emulation.Cores/CPUs/Intel8048/I8048.cs
View File

@ -421,18 +421,23 @@ namespace BizHawk.Emulation.Cores.Components.I8048
break; break;
case TEST_COND: case TEST_COND:
reg_d_ad = cur_instr[instr_pntr++]; reg_d_ad = cur_instr[instr_pntr++];
if ((reg_d_ad == 0) && !TF) { cur_instr[instr_pntr + 9] = IDLE; }
if ((reg_d_ad == 1) && T0) { cur_instr[instr_pntr + 9] = IDLE; } bool test_pass = true;
if ((reg_d_ad == 2) && !T0) { cur_instr[instr_pntr + 9] = IDLE; } if ((reg_d_ad == 0) && !TF) { test_pass = false; }
if ((reg_d_ad == 3) && T1) { cur_instr[instr_pntr + 9] = IDLE; } if ((reg_d_ad == 1) && T0) { test_pass = false; }
if ((reg_d_ad == 4) && !T1) { cur_instr[instr_pntr + 9] = IDLE; } if ((reg_d_ad == 2) && !T0) { test_pass = false; }
if ((reg_d_ad == 5) && !F1) { cur_instr[instr_pntr + 9] = IDLE; } if ((reg_d_ad == 3) && T1) { test_pass = false; }
if ((reg_d_ad == 6) && IRQPending) { cur_instr[instr_pntr + 9] = IDLE; } if ((reg_d_ad == 4) && !T1) { test_pass = false; }
if ((reg_d_ad == 7) && (Regs[A] == 0)) { cur_instr[instr_pntr + 9] = IDLE; } if ((reg_d_ad == 5) && !F1) { test_pass = false; }
if ((reg_d_ad == 8) && !FlagF0) { cur_instr[instr_pntr + 9] = IDLE; } if ((reg_d_ad == 6) && IRQPending) { test_pass = false; }
if ((reg_d_ad == 9) && (Regs[A] != 0)) { cur_instr[instr_pntr + 9] = IDLE; } if ((reg_d_ad == 7) && (Regs[A] == 0)) { test_pass = false; }
if ((reg_d_ad == 10) && FlagC) { cur_instr[instr_pntr + 9] = IDLE; } if ((reg_d_ad == 8) && !FlagF0) { test_pass = false; }
if ((reg_d_ad == 11) && !FlagC) { cur_instr[instr_pntr + 9] = IDLE; } if ((reg_d_ad == 9) && (Regs[A] != 0)) { test_pass = false; }
if ((reg_d_ad == 10) && FlagC) { test_pass = false; }
if ((reg_d_ad == 11) && !FlagC) { test_pass = false; }
if (test_pass) { cur_instr[instr_pntr + 6] = ALU2; }
else { cur_instr[instr_pntr + 9] = IDLE; }
break; break;
} }

7
BizHawk.Emulation.Cores/CPUs/Intel8048/OP_Tables.cs
View File

@ -433,11 +433,13 @@ namespace BizHawk.Emulation.Cores.Components.I8048
{ {
if (Regs[A].Bit(Tebit)) if (Regs[A].Bit(Tebit))
{ {
// NOTE: no PC increment here, jump is relative to last 256 address block before increment.
// so for a JPB starting at 0xFE does not overflow to 0x100 before the jump
PopulateCURINSTR(IDLE, PopulateCURINSTR(IDLE,
IDLE, IDLE,
IDLE, IDLE,
RD, ALU, PC, RD, ALU, PC,
INC11, PC, IDLE,
IDLE, IDLE,
IDLE, IDLE,
IDLE, IDLE,
@ -461,6 +463,9 @@ namespace BizHawk.Emulation.Cores.Components.I8048
public void JP_COND(ushort COND, ushort SPEC) public void JP_COND(ushort COND, ushort SPEC)
{ {
// NOTE: PC increment here gets replaced with ALU2 if ondition met, jump is relative to last 256 address block before increment.
// so for a JPC starting at 0xFE does not overflow to 0x100 before the jump
PopulateCURINSTR(IDLE, PopulateCURINSTR(IDLE,
TEST_COND, COND, TEST_COND, COND,
IDLE, IDLE,