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

Merge pull request #1330 from TASVideos/z80fixes 

Z80: fix IN A, (N) flag affection
This commit is contained in:
Asnivor 2018-09-19 23:01:30 +01:00 committed by GitHub
parent e0b6c67b70 3d55446526
commit 2ed0c919d2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
BizHawk.Emulation.Cores/CPUs/Z80A/Operations.cs
View File

@ -58,7 +58,13 @@ namespace BizHawk.Emulation.Cores.Components.Z80A
Flag3 = Regs[dest].Bit(3); Flag3 = Regs[dest].Bit(3);
} }
public void TR_Func(ushort dest, ushort src) public void IN_A_N_Func(ushort dest, ushort src_l, ushort src_h)
{
Regs[dest] = ReadHardware((ushort)(Regs[src_l] | (Regs[src_h]) << 8));
Regs[DB] = Regs[dest];
}
public void TR_Func(ushort dest, ushort src)
{ {
Regs[dest] = Regs[src]; Regs[dest] = Regs[src];
} }

2
BizHawk.Emulation.Cores/CPUs/Z80A/Tables_Direct.cs
View File

@ -609,7 +609,7 @@ namespace BizHawk.Emulation.Cores.Components.Z80A
IDLE, IDLE,
WAIT, WAIT,
WAIT, WAIT,
IN, A, Z, W, IN_A_N, A, Z, W,
INC16, Z, W, INC16, Z, W,
WAIT, WAIT,
OP_F, OP_F,

4
BizHawk.Emulation.Cores/CPUs/Z80A/Z80A.cs
View File

@ -80,6 +80,7 @@ namespace BizHawk.Emulation.Cores.Components.Z80A
public const ushort RST = 65; public const ushort RST = 65;
public const ushort REP_OP_I = 66; public const ushort REP_OP_I = 66;
public const ushort REP_OP_O = 67; public const ushort REP_OP_O = 67;
public const ushort IN_A_N = 68;
// non-state variables // non-state variables
public ushort Ztemp1, Ztemp2, Ztemp3, Ztemp4; public ushort Ztemp1, Ztemp2, Ztemp3, Ztemp4;
@ -478,6 +479,9 @@ namespace BizHawk.Emulation.Cores.Components.Z80A
case IN: case IN:
IN_Func(cur_instr[instr_pntr++], cur_instr[instr_pntr++], cur_instr[instr_pntr++]); IN_Func(cur_instr[instr_pntr++], cur_instr[instr_pntr++], cur_instr[instr_pntr++]);
break; break;
case IN_A_N:
IN_A_N_Func(cur_instr[instr_pntr++], cur_instr[instr_pntr++], cur_instr[instr_pntr++]);
break;
case NEG: case NEG:
NEG_8_Func(cur_instr[instr_pntr++]); NEG_8_Func(cur_instr[instr_pntr++]);
break; break;