From 7ad65bd96ef83e3ebd4a7274bf1bb0213afeaf6b Mon Sep 17 00:00:00 2001 From: alyosha-tas Date: Thu, 7 Jun 2018 11:11:56 -0400 Subject: [PATCH] z80: WZ fixes --- BizHawk.Emulation.Cores/CPUs/Z80A/Tables_Direct.cs | 2 +- BizHawk.Emulation.Cores/CPUs/Z80A/Z80A.cs | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/BizHawk.Emulation.Cores/CPUs/Z80A/Tables_Direct.cs b/BizHawk.Emulation.Cores/CPUs/Z80A/Tables_Direct.cs index 1618cd986d..f305eafbab 100644 --- a/BizHawk.Emulation.Cores/CPUs/Z80A/Tables_Direct.cs +++ b/BizHawk.Emulation.Cores/CPUs/Z80A/Tables_Direct.cs @@ -541,7 +541,7 @@ namespace BizHawk.Emulation.Cores.Components.Z80A WAIT, WAIT, OUT, Z, W, A, - INC16, Z, W, + INC16, Z, ALU, WAIT, OP_F, OP}; diff --git a/BizHawk.Emulation.Cores/CPUs/Z80A/Z80A.cs b/BizHawk.Emulation.Cores/CPUs/Z80A/Z80A.cs index b335d052bf..8407f0d937 100644 --- a/BizHawk.Emulation.Cores/CPUs/Z80A/Z80A.cs +++ b/BizHawk.Emulation.Cores/CPUs/Z80A/Z80A.cs @@ -491,10 +491,10 @@ namespace BizHawk.Emulation.Cores.Components.Z80A if (((Regs[C] | (Regs[B] << 8)) != 0) && (Ztemp3 > 0)) { cur_instr = new ushort[] - {TR16, Z, W, PCl, PCh, - INC16, Z, W, - DEC16, PCl, PCh, + {DEC16, PCl, PCh, DEC16, PCl, PCh, + TR16, Z, W, PCl, PCh, + INC16, Z, W, IDLE, Ztemp2, E, D, WAIT, @@ -525,10 +525,10 @@ namespace BizHawk.Emulation.Cores.Components.Z80A if (((Regs[C] | (Regs[B] << 8)) != 0) && (Ztemp3 > 0) && !FlagZ) { cur_instr = new ushort[] - {TR16, Z, W, PCl, PCh, - INC16, Z, W, - DEC16, PCl, PCh, + {DEC16, PCl, PCh, DEC16, PCl, PCh, + TR16, Z, W, PCl, PCh, + INC16, Z, W, IDLE, Ztemp2, L, H, WAIT,