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

z80: more contention work

This commit is contained in:
alyosha-tas 2018-06-07 10:37:26 -04:00
parent 843dc7a69a
commit cd7df2ea07
2 changed files with 139 additions and 117 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -452,10 +452,10 @@
operation, L, H, operation, L, H,
WAIT, WAIT,
WR, E, D, ALU, WR, E, D, ALU,
operation, E, D, IDLE,
SET_FL_LD_R, 0, operation, repeat_instr}; SET_FL_LD_R, 0, operation, repeat_instr};
BUSRQ = new ushort[] { H, 0, 0, D, 0, 0, D, D}; BUSRQ = new ushort[] { H, 0, 0, D, 0, 0, D, D };
} }
private void CP_OP_R(ushort operation, ushort repeat_instr) private void CP_OP_R(ushort operation, ushort repeat_instr)
@ -464,7 +464,7 @@
{IDLE, {IDLE,
WAIT, WAIT,
RD, ALU, L, H, RD, ALU, L, H,
operation, L, H, IDLE,
DEC16, C, B, DEC16, C, B,
operation, Z, W, operation, Z, W,
IDLE, IDLE,

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

@ -81,7 +81,8 @@ namespace BizHawk.Emulation.Cores.Components.Z80A
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;
// non-state variables
public ushort Ztemp1, Ztemp2, Ztemp3, Ztemp4;
public byte temp_R; public byte temp_R;
public Z80A() public Z80A()
@ -482,11 +483,71 @@ namespace BizHawk.Emulation.Cores.Components.Z80A
case SET_FL_LD_R: case SET_FL_LD_R:
DEC16_Func(C, B); DEC16_Func(C, B);
SET_FL_LD_Func(); SET_FL_LD_Func();
Repeat_Op();
Ztemp1 = cur_instr[instr_pntr++];
Ztemp2 = cur_instr[instr_pntr++];
Ztemp3 = cur_instr[instr_pntr++];
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,
IDLE,
Ztemp2, E, D,
WAIT,
OP_F,
OP};
BUSRQ = new ushort[] { D, D, D, D, D, PCh, 0, 0, 0 };
}
else
{
cur_instr = new ushort[]
{ Ztemp2, E, D,
WAIT,
OP_F,
OP };
BUSRQ = new ushort[] { PCh, 0, 0, 0 };
}
instr_pntr = 0; bus_pntr = 0;
break; break;
case SET_FL_CP_R: case SET_FL_CP_R:
SET_FL_CP_Func(); SET_FL_CP_Func();
Repeat_Op();
Ztemp1 = cur_instr[instr_pntr++];
Ztemp2 = cur_instr[instr_pntr++];
Ztemp3 = cur_instr[instr_pntr++];
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,
IDLE,
Ztemp2, L, H,
WAIT,
OP_F,
OP};
BUSRQ = new ushort[] { H, H, H, H, H, PCh, 0, 0, 0 };
}
else
{
cur_instr = new ushort[]
{ Ztemp2, L, H,
WAIT,
OP_F,
OP };
BUSRQ = new ushort[] { PCh, 0, 0, 0 };
}
instr_pntr = 0; bus_pntr = 0;
break; break;
case SET_FL_IR: case SET_FL_IR:
SET_FL_IR_Func(cur_instr[instr_pntr++]); SET_FL_IR_Func(cur_instr[instr_pntr++]);
@ -508,10 +569,9 @@ namespace BizHawk.Emulation.Cores.Components.Z80A
case REP_OP_I: case REP_OP_I:
Write_Func(cur_instr[instr_pntr++], cur_instr[instr_pntr++], cur_instr[instr_pntr++]); Write_Func(cur_instr[instr_pntr++], cur_instr[instr_pntr++], cur_instr[instr_pntr++]);
ushort temp4 = cur_instr[instr_pntr++]; Ztemp4 = cur_instr[instr_pntr++];
if (temp4 == DEC16) if (Ztemp4 == DEC16)
{ {
DEC16_Func(L, H);
TR16_Func(Z, W, C, B); TR16_Func(Z, W, C, B);
DEC16_Func(Z, W); DEC16_Func(Z, W);
DEC8_Func(B); DEC8_Func(B);
@ -524,7 +584,6 @@ namespace BizHawk.Emulation.Cores.Components.Z80A
} }
else else
{ {
INC16_Func(L, H);
TR16_Func(Z, W, C, B); TR16_Func(Z, W, C, B);
INC16_Func(Z, W); INC16_Func(Z, W);
DEC8_Func(B); DEC8_Func(B);
@ -536,13 +595,42 @@ namespace BizHawk.Emulation.Cores.Components.Z80A
FlagP = TableParity[((Regs[ALU] + Regs[C] + 1) & 7) ^ Regs[B]]; FlagP = TableParity[((Regs[ALU] + Regs[C] + 1) & 7) ^ Regs[B]];
} }
Repeat_Op(); Ztemp1 = cur_instr[instr_pntr++];
Ztemp2 = cur_instr[instr_pntr++];
Ztemp3 = cur_instr[instr_pntr++];
if ((Regs[B] != 0) && (Ztemp3 > 0))
{
cur_instr = new ushort[]
{IDLE,
IDLE,
DEC16, PCl, PCh,
DEC16, PCl, PCh,
IDLE,
Ztemp2, L, H,
WAIT,
OP_F,
OP};
BUSRQ = new ushort[] { H, H, H, H, H, PCh, 0, 0, 0 };
}
else
{
cur_instr = new ushort[]
{ Ztemp2, L, H,
WAIT,
OP_F,
OP };
BUSRQ = new ushort[] { PCh, 0, 0, 0 };
}
instr_pntr = 0; bus_pntr = 0;
break; break;
case REP_OP_O: case REP_OP_O:
OUT_Func(cur_instr[instr_pntr++], cur_instr[instr_pntr++], cur_instr[instr_pntr++]); OUT_Func(cur_instr[instr_pntr++], cur_instr[instr_pntr++], cur_instr[instr_pntr++]);
ushort temp5 = cur_instr[instr_pntr++]; Ztemp4 = cur_instr[instr_pntr++];
if (temp5 == DEC16) if (Ztemp4 == DEC16)
{ {
DEC16_Func(L, H); DEC16_Func(L, H);
DEC8_Func(B); DEC8_Func(B);
@ -563,94 +651,25 @@ namespace BizHawk.Emulation.Cores.Components.Z80A
FlagH = FlagC = (Regs[ALU] + Regs[L]) > 0xFF; FlagH = FlagC = (Regs[ALU] + Regs[L]) > 0xFF;
FlagP = TableParity[((Regs[ALU] + Regs[L]) & 7) ^ (Regs[B])]; FlagP = TableParity[((Regs[ALU] + Regs[L]) & 7) ^ (Regs[B])];
Repeat_Op(); Ztemp1 = cur_instr[instr_pntr++];
break; Ztemp2 = cur_instr[instr_pntr++];
} Ztemp3 = cur_instr[instr_pntr++];
TotalExecutedCycles++;
}
public void Repeat_Op() if ((Regs[B] != 0) && (Ztemp3 > 0))
{
// determine if we repeat based on what operation we are doing
// single execution versions also come here, but never repeat
ushort temp1 = cur_instr[instr_pntr++];
ushort temp2 = cur_instr[instr_pntr++];
ushort temp3 = cur_instr[instr_pntr++];
bool repeat = false;
int Reg16_d = Regs[C] | (Regs[B] << 8);
switch (temp1)
{
case 0:
repeat = Reg16_d != 0;
break;
case 1:
repeat = (Reg16_d != 0) && !FlagZ;
break;
case 2:
repeat = Regs[B] != 0;
break;
case 3:
repeat = Regs[B] != 0;
break;
}
// if we repeat, we do a 5 cycle refresh which decrements PC by 2
// if we don't repeat, continue on as a normal opcode fetch
if (repeat && temp3 > 0)
{ {
cur_instr = new ushort[] cur_instr = new ushort[]
{DEC16, PCl, PCh, {IDLE,
IDLE,
DEC16, PCl, PCh,
DEC16, PCl, PCh, DEC16, PCl, PCh,
IDLE,
IDLE,
IDLE, IDLE,
IDLE, IDLE,
WAIT, WAIT,
OP_F, OP_F,
OP}; OP};
if (temp1 == 0)
{
BUSRQ = new ushort[] { D, D, D, D, D, PCh, 0, 0, 0 };
}
else if (temp1 == 1)
{
BUSRQ = new ushort[] { H, H, H, H, H, PCh, 0, 0, 0 };
}
else if (temp1 == 2)
{
BUSRQ = new ushort[] { H, H, H, H, H, PCh, 0, 0, 0 };
}
else if (temp1 == 3)
{
BUSRQ = new ushort[] { B, B, B, B, B, PCh, 0, 0, 0 }; BUSRQ = new ushort[] { B, B, B, B, B, PCh, 0, 0, 0 };
} }
instr_pntr = 0; bus_pntr = 0;
// adjust WZ register accordingly
switch (temp1)
{
case 0:
// TEST: PC before or after the instruction?
Regs[Z] = Regs[PCl];
Regs[W] = Regs[PCh];
INC16_Func(Z, W);
break;
case 1:
// TEST: PC before or after the instruction?
Regs[Z] = Regs[PCl];
Regs[W] = Regs[PCh];
INC16_Func(Z, W);
break;
case 2:
// Nothing
break;
case 3:
// Nothing
break;
}
}
else else
{ {
cur_instr = new ushort[] cur_instr = new ushort[]
@ -660,8 +679,11 @@ namespace BizHawk.Emulation.Cores.Components.Z80A
OP }; OP };
BUSRQ = new ushort[] { PCh, 0, 0, 0 }; BUSRQ = new ushort[] { PCh, 0, 0, 0 };
instr_pntr = 0; bus_pntr = 0;
} }
instr_pntr = 0; bus_pntr = 0;
break;
}
TotalExecutedCycles++;
} }
// tracer stuff // tracer stuff