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

z80: IO port re-work and contention

This commit is contained in:
alyosha-tas 2018-06-06 07:33:49 -04:00
parent 620c4b3c2e
commit 74e6f630c3
4 changed files with 41 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
BizHawk.Emulation.Cores/CPUs/Z80A/Registers.cs
View File

@ -45,6 +45,18 @@ namespace BizHawk.Emulation.Cores.Components.Z80A
public ushort[] Regs = new ushort[36]; public ushort[] Regs = new ushort[36];
// IO Contention Constants. Need to distinguish port access and normal memory accesses for zx spectrum
public const ushort BIO1 = 100;
public const ushort BIO2 = 101;
public const ushort BIO3 = 102;
public const ushort BIO4 = 103;
public const ushort WIO1 = 105;
public const ushort WIO2 = 106;
public const ushort WIO3 = 107;
public const ushort WIO4 = 108;
public bool FlagI; public bool FlagI;
public bool FlagW; // wait flag, when set to true reads / writes will be delayed public bool FlagW; // wait flag, when set to true reads / writes will be delayed

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

@ -534,19 +534,19 @@ namespace BizHawk.Emulation.Cores.Components.Z80A
private void OUT_() private void OUT_()
{ {
cur_instr = new ushort[] cur_instr = new ushort[]
{IDLE, {TR, W, A,
WAIT, WAIT,
RD_INC, Z, PCl, PCh, RD_INC, Z, PCl, PCh,
IDLE, IDLE,
IDLE, WAIT,
TR, W, A, WAIT,
OUT, Z, W, A, OUT, Z, W, A,
INC16, Z, W, INC16, Z, W,
WAIT, WAIT,
OP_F, OP_F,
OP}; OP};
BUSRQ = new ushort[] { PCh, 0, 0, 0, 0, 0 ,0, PCh, 0, 0, 0}; BUSRQ = new ushort[] { PCh, 0, 0, WIO1, WIO2, WIO3, WIO4, PCh, 0, 0, 0};
} }
private void OUT_REG_(ushort dest, ushort src) private void OUT_REG_(ushort dest, ushort src)
@ -561,40 +561,40 @@ namespace BizHawk.Emulation.Cores.Components.Z80A
OP_F, OP_F,
OP}; OP};
BUSRQ = new ushort[] { 0, 0, 0, 0, PCh, 0, 0, 0 }; BUSRQ = new ushort[] { WIO1, WIO2, WIO3, WIO4, PCh, 0, 0, 0 };
} }
private void IN_() private void IN_()
{ {
cur_instr = new ushort[] cur_instr = new ushort[]
{IDLE, {TR, W, A,
WAIT, WAIT,
RD_INC, Z, PCl, PCh, RD_INC, Z, PCl, PCh,
IDLE, IDLE,
IDLE, WAIT,
TR, W, A, WAIT,
IN, A, Z, W, IN, A, Z, W,
INC16, Z, W, INC16, Z, W,
WAIT, WAIT,
OP_F, OP_F,
OP}; OP};
BUSRQ = new ushort[] { PCh, 0, 0, 0, 0, 0, 0, PCh, 0, 0, 0 }; BUSRQ = new ushort[] { PCh, 0, 0, WIO1, WIO2, WIO3, WIO4, PCh, 0, 0, 0 };
} }
private void IN_REG_(ushort dest, ushort src) private void IN_REG_(ushort dest, ushort src)
{ {
cur_instr = new ushort[] cur_instr = new ushort[]
{IDLE, {TR16, Z, W, C, B,
TR16, Z, W, C, B,
WAIT, WAIT,
IN, dest, src, B, WAIT,
IN, dest, Z, W,
INC16, Z, W, INC16, Z, W,
WAIT, WAIT,
OP_F, OP_F,
OP}; OP};
BUSRQ = new ushort[] { 0, 0, 0, 0, PCh, 0, 0, 0 }; BUSRQ = new ushort[] { WIO1, WIO2, WIO3, WIO4, PCh, 0, 0, 0 };
} }
private void REG_OP_16_(ushort op, ushort dest_l, ushort dest_h, ushort src_l, ushort src_h) private void REG_OP_16_(ushort op, ushort dest_l, ushort dest_h, ushort src_l, ushort src_h)

12
BizHawk.Emulation.Cores/CPUs/Z80A/Tables_Indirect.cs
View File

@ -447,15 +447,15 @@
{ {
cur_instr = new ushort[] cur_instr = new ushort[]
{IDLE, {IDLE,
IDLE,
WAIT, WAIT,
WAIT, WAIT,
IN, ALU, C, B, IN, ALU, C, B,
IDLE, IDLE,
WAIT, WAIT,
WR, L, H, ALU, REP_OP_I, L, H, ALU, operation, 2, operation, repeat_instr };
REP_OP_I, operation, 2, operation, repeat_instr };
BUSRQ = new ushort[] { I, 0, 0, 0, H, 0, 0, 0}; BUSRQ = new ushort[] { I, BIO1, BIO2, BIO3, BIO4, H, 0, 0};
} }
private void OUT_OP_R(ushort operation, ushort repeat_instr) private void OUT_OP_R(ushort operation, ushort repeat_instr)
@ -467,10 +467,10 @@
RD, ALU, L, H, RD, ALU, L, H,
IDLE, IDLE,
WAIT, WAIT,
OUT, C, B, ALU, WAIT,
REP_OP_O, operation, 3, operation, repeat_instr }; REP_OP_O, C, B, ALU, operation, 3, operation, repeat_instr };
BUSRQ = new ushort[] { I, H, 0, 0, 0, 0, 0, 0}; BUSRQ = new ushort[] { I, H, 0, 0, BIO1, BIO2, BIO3, BIO4 };
} }
// this is an indirect change of a a 16 bit register with memory // this is an indirect change of a a 16 bit register with memory

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

@ -14,7 +14,7 @@ namespace BizHawk.Emulation.Cores.Components.Z80A
// operations that can take place in an instruction // operations that can take place in an instruction
public const ushort IDLE = 0; public const ushort IDLE = 0;
public const ushort OP = 1; public const ushort OP = 1;
public const ushort OP_R = 2; // used for repeating operations public const ushort OP_F = 2; // used for repeating operations
public const ushort HALT = 3; public const ushort HALT = 3;
public const ushort RD = 4; public const ushort RD = 4;
public const ushort WR = 5; public const ushort WR = 5;
@ -77,10 +77,9 @@ namespace BizHawk.Emulation.Cores.Components.Z80A
public const ushort HL_BIT = 62; public const ushort HL_BIT = 62;
public const ushort FTCH_DB = 63; public const ushort FTCH_DB = 63;
public const ushort WAIT = 64; // enterred when readin or writing and FlagW is true public const ushort WAIT = 64; // enterred when readin or writing and FlagW is true
public const ushort OP_F = 65; // fetch the opcode, happens on cycle 3 of fetch cycle public const ushort RST = 65;
public const ushort RST = 66; public const ushort REP_OP_I = 66;
public const ushort REP_OP_I = 67; public const ushort REP_OP_O = 67;
public const ushort REP_OP_O = 68;
public byte temp_R; public byte temp_R;
@ -230,10 +229,9 @@ namespace BizHawk.Emulation.Cores.Components.Z80A
temp_R &= 0x7F; temp_R &= 0x7F;
Regs[R] = (byte)((Regs[R] & 0x80) | temp_R); Regs[R] = (byte)((Regs[R] & 0x80) | temp_R);
break; break;
case OP_R: case OP_F:
opcode = FetchMemory(RegPC);
break; break;
case HALT: case HALT:
halted = true; halted = true;
// NOTE: Check how halt state effects the DB // NOTE: Check how halt state effects the DB
@ -503,14 +501,13 @@ namespace BizHawk.Emulation.Cores.Components.Z80A
bus_pntr--; bus_pntr--;
} }
break; break;
case OP_F:
opcode = FetchMemory(RegPC);
break;
case RST: case RST:
Regs[Z] = cur_instr[instr_pntr++]; Regs[Z] = cur_instr[instr_pntr++];
Regs[W] = 0; Regs[W] = 0;
break; break;
case REP_OP_I: case REP_OP_I:
Write_Func(cur_instr[instr_pntr++], cur_instr[instr_pntr++], cur_instr[instr_pntr++]);
ushort temp4 = cur_instr[instr_pntr++]; ushort temp4 = cur_instr[instr_pntr++];
if (temp4 == DEC16) if (temp4 == DEC16)
{ {
@ -529,6 +526,8 @@ namespace BizHawk.Emulation.Cores.Components.Z80A
Repeat_Op(); Repeat_Op();
break; break;
case REP_OP_O: case REP_OP_O:
OUT_Func(cur_instr[instr_pntr++], cur_instr[instr_pntr++], cur_instr[instr_pntr++]);
ushort temp5 = cur_instr[instr_pntr++]; ushort temp5 = cur_instr[instr_pntr++];
if (temp5 == DEC16) if (temp5 == DEC16)
{ {