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

[PCE] Implement ORA under T-Flag, fixes City Hunter

This commit is contained in:
beirich 2011-07-23 21:24:43 +00:00
parent c383319082
commit 91baebf8b2
4 changed files with 127 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

140
BizHawk.Emulation/CPUs/HuC6280/Execute.cs
View File

@ -73,9 +73,18 @@ namespace BizHawk.Emulation.CPUs.H6280
break; break;
case 0x01: // ORA (addr,X) case 0x01: // ORA (addr,X)
value8 = ReadMemory(ReadWordPageWrap((ushort)((byte)(ReadMemory(PC++)+X)+0x2000))); value8 = ReadMemory(ReadWordPageWrap((ushort)((byte)(ReadMemory(PC++)+X)+0x2000)));
A |= value8; if (FlagT == false)
P = (byte)((P & 0x7D) | TableNZ[A]); {
PendingCycles -= 7; A |= value8;
P = (byte)((P & 0x7D) | TableNZ[A]);
PendingCycles -= 7;
} else {
source8 = ReadMemory((ushort)(0x2000 + X));
source8 |= value8;
P = (byte)((P & 0x7D) | TableNZ[source8]);
WriteMemory((ushort)(0x2000 + X), source8);
PendingCycles -= 10;
}
break; break;
case 0x02: // SXY case 0x02: // SXY
temp8 = X; temp8 = X;
@ -99,9 +108,18 @@ namespace BizHawk.Emulation.CPUs.H6280
break; break;
case 0x05: // ORA zp case 0x05: // ORA zp
value8 = ReadMemory((ushort)(ReadMemory(PC++)+0x2000)); value8 = ReadMemory((ushort)(ReadMemory(PC++)+0x2000));
A |= value8; if (FlagT == false)
P = (byte)((P & 0x7D) | TableNZ[A]); {
PendingCycles -= 4; A |= value8;
P = (byte)((P & 0x7D) | TableNZ[A]);
PendingCycles -= 4;
} else {
source8 = ReadMemory((ushort)(0x2000 + X));
source8 |= value8;
P = (byte)((P & 0x7D) | TableNZ[source8]);
WriteMemory((ushort)(0x2000 + X), source8);
PendingCycles -= 7;
}
break; break;
case 0x06: // ASL zp case 0x06: // ASL zp
value16 = (ushort)(ReadMemory(PC++)+0x2000); value16 = (ushort)(ReadMemory(PC++)+0x2000);
@ -125,9 +143,18 @@ namespace BizHawk.Emulation.CPUs.H6280
break; break;
case 0x09: // ORA #nn case 0x09: // ORA #nn
value8 = ReadMemory(PC++); value8 = ReadMemory(PC++);
A |= value8; if (FlagT == false)
P = (byte)((P & 0x7D) | TableNZ[A]); {
PendingCycles -= 2; A |= value8;
P = (byte)((P & 0x7D) | TableNZ[A]);
PendingCycles -= 2;
} else {
source8 = ReadMemory((ushort)(0x2000 + X));
source8 |= value8;
P = (byte)((P & 0x7D) | TableNZ[source8]);
WriteMemory((ushort)(0x2000 + X), source8);
PendingCycles -= 5;
}
break; break;
case 0x0A: // ASL A case 0x0A: // ASL A
FlagC = (A & 0x80) != 0; FlagC = (A & 0x80) != 0;
@ -146,9 +173,18 @@ namespace BizHawk.Emulation.CPUs.H6280
break; break;
case 0x0D: // ORA addr case 0x0D: // ORA addr
value8 = ReadMemory(ReadWord(PC)); PC += 2; value8 = ReadMemory(ReadWord(PC)); PC += 2;
A |= value8; if (FlagT == false)
P = (byte)((P & 0x7D) | TableNZ[A]); {
PendingCycles -= 5; A |= value8;
P = (byte)((P & 0x7D) | TableNZ[A]);
PendingCycles -= 5;
} else {
source8 = ReadMemory((ushort)(0x2000 + X));
source8 |= value8;
P = (byte)((P & 0x7D) | TableNZ[source8]);
WriteMemory((ushort)(0x2000 + X), source8);
PendingCycles -= 8;
}
break; break;
case 0x0E: // ASL addr case 0x0E: // ASL addr
value16 = ReadWord(PC); PC += 2; value16 = ReadWord(PC); PC += 2;
@ -180,15 +216,33 @@ namespace BizHawk.Emulation.CPUs.H6280
case 0x11: // ORA (addr),Y case 0x11: // ORA (addr),Y
temp16 = ReadWordPageWrap((ushort)(ReadMemory(PC++)+0x2000)); temp16 = ReadWordPageWrap((ushort)(ReadMemory(PC++)+0x2000));
value8 = ReadMemory((ushort)(temp16+Y)); value8 = ReadMemory((ushort)(temp16+Y));
A |= value8; if (FlagT == false)
P = (byte)((P & 0x7D) | TableNZ[A]); {
PendingCycles -= 7; A |= value8;
P = (byte)((P & 0x7D) | TableNZ[A]);
PendingCycles -= 7;
} else {
source8 = ReadMemory((ushort)(0x2000 + X));
source8 |= value8;
P = (byte)((P & 0x7D) | TableNZ[source8]);
WriteMemory((ushort)(0x2000 + X), source8);
PendingCycles -= 10;
}
break; break;
case 0x12: // ORA (addr) case 0x12: // ORA (addr)
value8 = ReadMemory(ReadWordPageWrap((ushort)(ReadMemory(PC++)+0x2000))); value8 = ReadMemory(ReadWordPageWrap((ushort)(ReadMemory(PC++)+0x2000)));
A |= value8; if (FlagT == false)
P = (byte)((P & 0x7D) | TableNZ[A]); {
PendingCycles -= 7; A |= value8;
P = (byte)((P & 0x7D) | TableNZ[A]);
PendingCycles -= 7;
} else {
source8 = ReadMemory((ushort)(0x2000 + X));
source8 |= value8;
P = (byte)((P & 0x7D) | TableNZ[source8]);
WriteMemory((ushort)(0x2000 + X), source8);
PendingCycles -= 10;
}
break; break;
case 0x13: // ST1 #nn case 0x13: // ST1 #nn
value8 = ReadMemory(PC++); value8 = ReadMemory(PC++);
@ -206,9 +260,18 @@ namespace BizHawk.Emulation.CPUs.H6280
break; break;
case 0x15: // ORA zp,X case 0x15: // ORA zp,X
value8 = ReadMemory((ushort)(((ReadMemory(PC++)+X)&0xFF)+0x2000)); value8 = ReadMemory((ushort)(((ReadMemory(PC++)+X)&0xFF)+0x2000));
A |= value8; if (FlagT == false)
P = (byte)((P & 0x7D) | TableNZ[A]); {
PendingCycles -= 4; A |= value8;
P = (byte)((P & 0x7D) | TableNZ[A]);
PendingCycles -= 4;
} else {
source8 = ReadMemory((ushort)(0x2000 + X));
source8 |= value8;
P = (byte)((P & 0x7D) | TableNZ[source8]);
WriteMemory((ushort)(0x2000 + X), source8);
PendingCycles -= 7;
}
break; break;
case 0x16: // ASL zp,X case 0x16: // ASL zp,X
value16 = (ushort)(((ReadMemory(PC++)+X)&0xFF)+0x2000); value16 = (ushort)(((ReadMemory(PC++)+X)&0xFF)+0x2000);
@ -233,9 +296,18 @@ namespace BizHawk.Emulation.CPUs.H6280
case 0x19: // ORA addr,Y case 0x19: // ORA addr,Y
value8 = ReadMemory((ushort)(ReadWord(PC)+Y)); value8 = ReadMemory((ushort)(ReadWord(PC)+Y));
PC += 2; PC += 2;
A |= value8; if (FlagT == false)
P = (byte)((P & 0x7D) | TableNZ[A]); {
PendingCycles -= 5; A |= value8;
P = (byte)((P & 0x7D) | TableNZ[A]);
PendingCycles -= 5;
} else {
source8 = ReadMemory((ushort)(0x2000 + X));
source8 |= value8;
P = (byte)((P & 0x7D) | TableNZ[source8]);
WriteMemory((ushort)(0x2000 + X), source8);
PendingCycles -= 8;
}
break; break;
case 0x1A: // INC A case 0x1A: // INC A
P = (byte)((P & 0x7D) | TableNZ[++A]); P = (byte)((P & 0x7D) | TableNZ[++A]);
@ -253,9 +325,18 @@ namespace BizHawk.Emulation.CPUs.H6280
case 0x1D: // ORA addr,X case 0x1D: // ORA addr,X
value8 = ReadMemory((ushort)(ReadWord(PC)+X)); value8 = ReadMemory((ushort)(ReadWord(PC)+X));
PC += 2; PC += 2;
A |= value8; if (FlagT == false)
P = (byte)((P & 0x7D) | TableNZ[A]); {
PendingCycles -= 5; A |= value8;
P = (byte)((P & 0x7D) | TableNZ[A]);
PendingCycles -= 5;
} else {
source8 = ReadMemory((ushort)(0x2000 + X));
source8 |= value8;
P = (byte)((P & 0x7D) | TableNZ[source8]);
WriteMemory((ushort)(0x2000 + X), source8);
PendingCycles -= 8;
}
break; break;
case 0x1E: // ASL addr,X case 0x1E: // ASL addr,X
value16 = (ushort)(ReadWord(PC)+X); value16 = (ushort)(ReadWord(PC)+X);
@ -2087,7 +2168,7 @@ namespace BizHawk.Emulation.CPUs.H6280
case 0xF4: // SET case 0xF4: // SET
int a; // TODO remove these extra checks int a; // TODO remove these extra checks
string b = Disassemble(PC, out a); string b = Disassemble(PC, out a);
if (b.StartsWith("ADC") == false && b.StartsWith("EOR") == false && b.StartsWith("AND") == false) if (b.StartsWith("ADC") == false && b.StartsWith("EOR") == false && b.StartsWith("AND") == false && b.StartsWith("ORA") == false)
Console.WriteLine("SETTING T FLAG, NEXT INSTRUCTION IS UNHANDLED: {0}", b); Console.WriteLine("SETTING T FLAG, NEXT INSTRUCTION IS UNHANDLED: {0}", b);
FlagT = true; FlagT = true;
PendingCycles -= 2; PendingCycles -= 2;
@ -2198,7 +2279,8 @@ namespace BizHawk.Emulation.CPUs.H6280
PendingCycles -= 6; PendingCycles -= 6;
break; break;
default: default:
throw new Exception(String.Format("Unhandled opcode: {0:X2}", opcode)); Console.WriteLine("Unhandled opcode: {0:X2}", opcode);
break;
} }
P &= 0xDF; // Clear T flag P &= 0xDF; // Clear T flag

1
BizHawk.Emulation/Consoles/PC Engine/Compat.txt
View File

@ -21,7 +21,6 @@ Outrun - Req HBlank hack to eliminate visual artifact
Tiger Road - On second level, sprites should be getting masked from the top status area somehow Tiger Road - On second level, sprites should be getting masked from the top status area somehow
Bouken Danshaku Don - The Lost Sunheart (J) - Uses LFO in intro sound strongly! Bouken Danshaku Don - The Lost Sunheart (J) - Uses LFO in intro sound strongly!
City Hunter- uses SET on ORA instruction
Eagan's Rendered Sprite Demo by Eagan Rackley (PD) - demonstrates sprites that shouldnt be displayed Eagan's Rendered Sprite Demo by Eagan Rackley (PD) - demonstrates sprites that shouldnt be displayed
Games Express CD Card 1993 - dont forget to treat as a turbocd system card Games Express CD Card 1993 - dont forget to treat as a turbocd system card
Puzzle Boy(J) - screen vert height is fucked up...needs to be masked or just clipped? Puzzle Boy(J) - screen vert height is fucked up...needs to be masked or just clipped?

3
CpuCoreGenerator/HuC6280/CoreGenerator.cs
View File

@ -502,7 +502,8 @@ namespace HuC6280
} }
w.WriteLine(" default:"); w.WriteLine(" default:");
w.WriteLine(" throw new Exception(String.Format(\"Unhandled opcode: {0:X2}\", opcode));"); w.WriteLine(" Console.WriteLine(\"Unhandled opcode: {0:X2}\", opcode);");
w.WriteLine(" break;");
w.WriteLine(" }"); w.WriteLine(" }");
w.WriteLine(); w.WriteLine();
w.WriteLine(" P &= 0xDF; // Clear T flag"); w.WriteLine(" P &= 0xDF; // Clear T flag");

18
CpuCoreGenerator/HuC6280/Instructions.cs
View File

@ -342,9 +342,19 @@ namespace HuC6280
private void ORA(OpcodeInfo op, TextWriter w) private void ORA(OpcodeInfo op, TextWriter w)
{ {
GetValue8(op, w, "value8"); GetValue8(op, w, "value8");
w.WriteLine(Spaces + "A |= value8;");
w.WriteLine(Spaces + SetNZ("A")); w.WriteLine(Spaces + "if (FlagT == false)");
w.WriteLine(Spaces + "PendingCycles -= {0};", op.Cycles); w.WriteLine(Spaces + "{");
w.WriteLine(Spaces + " A |= value8;");
w.WriteLine(Spaces + " "+SetNZ("A"));
w.WriteLine(Spaces + " PendingCycles -= {0};", op.Cycles);
w.WriteLine(Spaces + "} else {");
w.WriteLine(Spaces + " source8 = ReadMemory((ushort)(0x2000 + X));");
w.WriteLine(Spaces + " source8 |= value8;");
w.WriteLine(Spaces + " " + SetNZ("source8"));
w.WriteLine(Spaces + " WriteMemory((ushort)(0x2000 + X), source8);");
w.WriteLine(Spaces + " PendingCycles -= {0};", op.Cycles+3);
w.WriteLine(Spaces + "}");
} }
private void PushReg(OpcodeInfo op, TextWriter w, string reg) private void PushReg(OpcodeInfo op, TextWriter w, string reg)
@ -496,7 +506,7 @@ namespace HuC6280
{ {
w.WriteLine(" int a; // TODO remove these extra checks"); // TODO remove these extra checks w.WriteLine(" int a; // TODO remove these extra checks"); // TODO remove these extra checks
w.WriteLine(" string b = Disassemble(PC, out a);"); w.WriteLine(" string b = Disassemble(PC, out a);");
w.WriteLine(" if (b.StartsWith(\"ADC\") == false && b.StartsWith(\"EOR\") == false && b.StartsWith(\"AND\") == false)"); w.WriteLine(" if (b.StartsWith(\"ADC\") == false && b.StartsWith(\"EOR\") == false && b.StartsWith(\"AND\") == false && b.StartsWith(\"ORA\") == false)");
w.WriteLine(" Console.WriteLine(\"SETTING T FLAG, NEXT INSTRUCTION IS UNHANDLED: {0}\", b);"); w.WriteLine(" Console.WriteLine(\"SETTING T FLAG, NEXT INSTRUCTION IS UNHANDLED: {0}\", b);");
w.WriteLine(Spaces + "FlagT = true;"); w.WriteLine(Spaces + "FlagT = true;");
w.WriteLine(Spaces + "PendingCycles -= {0};", op.Cycles); w.WriteLine(Spaces + "PendingCycles -= {0};", op.Cycles);