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

6502: All non-writes are affected by RDY.

This commit is contained in:
Anthony Konzel 2016-03-09 20:12:49 -06:00
parent bd7e10af6b
commit aa83c33c58
1 changed files with 85 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
BizHawk.Emulation.Cores/CPUs/MOS 6502X/Execute.cs
View File

@ -1152,6 +1152,9 @@ namespace BizHawk.Emulation.Cores.Components.M6502
} }
void RelBranch_Stage3() void RelBranch_Stage3()
{ {
rdy_freeze = !RDY;
if (RDY)
{
FetchDummy(); FetchDummy();
alu_temp = (byte)PC + (int)(sbyte)opcode2; alu_temp = (byte)PC + (int)(sbyte)opcode2;
PC &= 0xFF00; PC &= 0xFF00;
@ -1169,27 +1172,38 @@ namespace BizHawk.Emulation.Cores.Components.M6502
if (!interrupt_pending) if (!interrupt_pending)
branch_irq_hack = true; branch_irq_hack = true;
} }
}
} }
void RelBranch_Stage4() void RelBranch_Stage4()
{ {
rdy_freeze = !RDY;
if (RDY)
{
FetchDummy(); FetchDummy();
if (alu_temp.Bit(31)) if (alu_temp.Bit(31))
PC = (ushort)(PC - 0x100); PC = (ushort)(PC - 0x100);
else PC = (ushort)(PC + 0x100); else PC = (ushort)(PC + 0x100);
}
} }
void NOP() void NOP()
{ {
rdy_freeze = !RDY;
} }
void DecS() void DecS()
{
rdy_freeze = !RDY;
if (RDY)
{ {
S--; S--;
}
} }
void IncS() void IncS()
{
rdy_freeze = !RDY;
if (RDY)
{ {
S++; S++;
}
} }
void JSR() void JSR()
{ {
@ -2041,34 +2055,49 @@ namespace BizHawk.Emulation.Cores.Components.M6502
} }
void Imp_ASL_A() void Imp_ASL_A()
{ {
rdy_freeze = !RDY;
if (RDY)
{
FetchDummy(); FetchDummy();
FlagC = (A & 0x80) != 0; FlagC = (A & 0x80) != 0;
A = (byte)(A << 1); A = (byte)(A << 1);
NZ_A(); NZ_A();
}
} }
void Imp_ROL_A() void Imp_ROL_A()
{ {
rdy_freeze = !RDY;
if (RDY)
{
FetchDummy(); FetchDummy();
temp8 = A; temp8 = A;
A = (byte)((A << 1) | (P & 1)); A = (byte)((A << 1) | (P & 1));
FlagC = (temp8 & 0x80) != 0; FlagC = (temp8 & 0x80) != 0;
NZ_A(); NZ_A();
}
} }
void Imp_ROR_A() void Imp_ROR_A()
{ {
rdy_freeze = !RDY;
if (RDY)
{
FetchDummy(); FetchDummy();
temp8 = A; temp8 = A;
A = (byte)((A >> 1) | ((P & 1) << 7)); A = (byte)((A >> 1) | ((P & 1) << 7));
FlagC = (temp8 & 1) != 0; FlagC = (temp8 & 1) != 0;
NZ_A(); NZ_A();
}
} }
void Imp_LSR_A() void Imp_LSR_A()
{ {
rdy_freeze = !RDY;
if (RDY)
{
FetchDummy(); FetchDummy();
FlagC = (A & 1) != 0; FlagC = (A & 1) != 0;
A = (byte)(A >> 1); A = (byte)(A >> 1);
NZ_A(); NZ_A();
}
} }
void JMP_abs() void JMP_abs()
{ {
@ -2082,8 +2111,6 @@ namespace BizHawk.Emulation.Cores.Components.M6502
void IncPC() void IncPC()
{ {
PC++; PC++;
} }
void ZP_RMW_Stage3() void ZP_RMW_Stage3()
{ {
@ -2097,21 +2124,18 @@ namespace BizHawk.Emulation.Cores.Components.M6502
void ZP_RMW_Stage5() void ZP_RMW_Stage5()
{ {
WriteMemory(opcode2, (byte)alu_temp); WriteMemory(opcode2, (byte)alu_temp);
} }
void ZP_RMW_INC() void ZP_RMW_INC()
{ {
WriteMemory(opcode2, (byte)alu_temp); WriteMemory(opcode2, (byte)alu_temp);
alu_temp = (byte)((alu_temp + 1) & 0xFF); alu_temp = (byte)((alu_temp + 1) & 0xFF);
P = (byte)((P & 0x7D) | TableNZ[alu_temp]); P = (byte)((P & 0x7D) | TableNZ[alu_temp]);
} }
void ZP_RMW_DEC() void ZP_RMW_DEC()
{ {
WriteMemory(opcode2, (byte)alu_temp); WriteMemory(opcode2, (byte)alu_temp);
alu_temp = (byte)((alu_temp - 1) & 0xFF); alu_temp = (byte)((alu_temp - 1) & 0xFF);
P = (byte)((P & 0x7D) | TableNZ[alu_temp]); P = (byte)((P & 0x7D) | TableNZ[alu_temp]);
} }
void ZP_RMW_ASL() void ZP_RMW_ASL()
{ {
@ -2120,7 +2144,6 @@ namespace BizHawk.Emulation.Cores.Components.M6502
FlagC = (value8 & 0x80) != 0; FlagC = (value8 & 0x80) != 0;
alu_temp = value8 = (byte)(value8 << 1); alu_temp = value8 = (byte)(value8 << 1);
P = (byte)((P & 0x7D) | TableNZ[value8]); P = (byte)((P & 0x7D) | TableNZ[value8]);
} }
void ZP_RMW_SRE() void ZP_RMW_SRE()
{ {
@ -2163,7 +2186,6 @@ namespace BizHawk.Emulation.Cores.Components.M6502
alu_temp = value8 = (byte)((value8 >> 1) | ((P & 1) << 7)); alu_temp = value8 = (byte)((value8 >> 1) | ((P & 1) << 7));
FlagC = (temp8 & 1) != 0; FlagC = (temp8 & 1) != 0;
P = (byte)((P & 0x7D) | TableNZ[value8]); P = (byte)((P & 0x7D) | TableNZ[value8]);
} }
void ZP_RMW_ROL() void ZP_RMW_ROL()
{ {
@ -2172,7 +2194,6 @@ namespace BizHawk.Emulation.Cores.Components.M6502
alu_temp = value8 = (byte)((value8 << 1) | (P & 1)); alu_temp = value8 = (byte)((value8 << 1) | (P & 1));
FlagC = (temp8 & 0x80) != 0; FlagC = (temp8 & 0x80) != 0;
P = (byte)((P & 0x7D) | TableNZ[value8]); P = (byte)((P & 0x7D) | TableNZ[value8]);
} }
void ZP_RMW_SLO() void ZP_RMW_SLO()
{ {
@ -2198,7 +2219,6 @@ namespace BizHawk.Emulation.Cores.Components.M6502
FlagC = (temp8 & 0x80) != 0; FlagC = (temp8 & 0x80) != 0;
A &= value8; A &= value8;
NZ_A(); NZ_A();
} }
void AbsIdx_Stage3_Y() void AbsIdx_Stage3_Y()
{ {