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

-Wasn't supposed to actually increment the PC in the disassembler. 

-Cleaned up the 0x004 (Jump) disassembler.
-Implemented 0x004 in the executor.
This commit is contained in:
brandman211 2012-07-08 08:42:32 +00:00
parent 778274a12d
commit a4912e66c0
3 changed files with 46 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
BizHawk.Emulation/BizHawk.Emulation.csproj
View File

@ -239,6 +239,7 @@
<Compile Include="CPUs\68000\OpcodeTable.cs" /> <Compile Include="CPUs\68000\OpcodeTable.cs" />
<Compile Include="CPUs\68000\Tables.cs" /> <Compile Include="CPUs\68000\Tables.cs" />
<Compile Include="CPUs\CP1610\CP1610.cs" /> <Compile Include="CPUs\CP1610\CP1610.cs" />
<Compile Include="CPUs\CP1610\Disassembler.cs" />
<Compile Include="CPUs\CP1610\Execute.cs" /> <Compile Include="CPUs\CP1610\Execute.cs" />
<Compile Include="CPUs\HuC6280\Disassembler.cs" /> <Compile Include="CPUs\HuC6280\Disassembler.cs" />
<Compile Include="CPUs\HuC6280\Execute.cs" /> <Compile Include="CPUs\HuC6280\Execute.cs" />

51
BizHawk.Emulation/CPUs/CP1610/Disassembler.cs
View File

@ -10,7 +10,7 @@ namespace BizHawk.Emulation.CPUs.CP1610
public string Disassemble(ushort pc, out int bytesToAdvance) public string Disassemble(ushort pc, out int bytesToAdvance)
{ {
bytesToAdvance = 1; bytesToAdvance = 1;
int second, third, op1, op2, op3, temp1, temp2; int second, third, op1, op2, op3;
string result = ""; string result = "";
int opcode = ReadMemory(RegisterPC) & 0x3FF; int opcode = ReadMemory(RegisterPC) & 0x3FF;
switch (opcode) switch (opcode)
@ -25,48 +25,31 @@ namespace BizHawk.Emulation.CPUs.CP1610
return "DIS"; return "DIS";
case 0x004: case 0x004:
// 0000:0000:0000:0100 0000:00rr:aaaa:aaff 0000:00aa:aaaa:aaaa // 0000:0000:0000:0100 0000:00rr:aaaa:aaff 0000:00aa:aaaa:aaaa
second = ReadMemory(++RegisterPC); second = ReadMemory((byte)(RegisterPC + 1));
third = ReadMemory(++RegisterPC); third = ReadMemory((byte)(RegisterPC + 1));
// rr indicates the register into which to store the return address // rr indicates the register into which to store the return address
op1 = (second >> 8) & 0x3; op1 = (second >> 8) & 0x3;
// ff indicates how to affect the Interrupt (I) flag in the CP1610 // ff indicates how to affect the Interrupt (I) flag in the CP1610
op2 = second & 0x3; op2 = second & 0x3;
// aaaaaaaaaaaaaaaa indicates the address to where the CP1610 should Jump // aaaaaaaaaaaaaaaa indicates the address to where the CP1610 should Jump
op3 = ((second << 8) & 0xFC00) | (third & 0x3FF); op3 = ((second << 8) & 0xFC00) | (third & 0x3FF);
temp1 = 0x4 ^ op1; result = "J";
if (op1 != 0x3) if (op1 != 0x3)
result += "SR";
switch (op2)
{ {
switch (op2) case 0x1:
{ result += "E";
case 0x0: break;
result = "JSR"; case 0x2:
break; result += "D";
case 0x1: break;
result = "JSRE"; case 0x3:
break; // Unknown opcode.
case 0x2: break;
result = "JSRD";
break;
case 0x3:
break;
}
result += " R" + temp1 + ",";
} }
else if (op1 != 0x3)
switch (op2) result += " R" + (op1 + 4) + ",";
{
case 0x0:
result = "J";
break;
case 0x1:
result = "JE";
break;
case 0x2:
result = "JD";
break;
case 0x3:
break;
}
result += string.Format(" ${0:X4})", op3); result += string.Format(" ${0:X4})", op3);
bytesToAdvance = 3; bytesToAdvance = 3;
return result; return result;

30
BizHawk.Emulation/CPUs/CP1610/Execute.cs
View File

@ -31,7 +31,7 @@ namespace BizHawk.Emulation.CPUs.CP1610
public void Execute(int cycles) public void Execute(int cycles)
{ {
byte target; byte target;
int op1, op2, temp, result; int second, third, op1, op2, op3, temp, result;
PendingCycles += cycles; PendingCycles += cycles;
while (PendingCycles > 0) while (PendingCycles > 0)
{ {
@ -53,7 +53,33 @@ namespace BizHawk.Emulation.CPUs.CP1610
PendingCycles -= 4; TotalExecutedCycles += 4; PendingCycles -= 4; TotalExecutedCycles += 4;
break; break;
case 0x004: // J, JE, JD, JSR, JSRE, JSRD case 0x004: // J, JE, JD, JSR, JSRE, JSRD
throw new NotImplementedException(); // 0000:0000:0000:0100 0000:00rr:aaaa:aaff 0000:00aa:aaaa:aaaa
second = ReadMemory(RegisterPC++);
third = ReadMemory(RegisterPC++);
// rr indicates the register into which to store the return address
op1 = (second >> 8) & 0x3;
// ff indicates how to affect the Interrupt (I) flag in the CP1610
op2 = second & 0x3;
// aaaaaaaaaaaaaaaa indicates the address to where the CP1610 should Jump
op3 = ((second << 8) & 0xFC00) | (third & 0x3FF);
if (op1 != 0x3)
// Store the return address.
Register[op1 + 4] = (ushort)((RegisterPC + 1) & 0xFFFF);
switch (op2)
{
case 0x1:
FlagI = true;
break;
case 0x2:
FlagI = false;
break;
case 0x3:
// Unknown opcode.
throw new ArgumentException();
}
RegisterPC = (ushort)op3;
PendingCycles -= 12; TotalExecutedCycles += 12;
break;
case 0x005: // TCI case 0x005: // TCI
throw new NotImplementedException(); throw new NotImplementedException();
case 0x006: // CLRC case 0x006: // CLRC