Nabile
/
DotN64
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Make delay slot accessible for the debugger.

master
Nabile Rahmani 2017-11-16 11:41:46 +01:00
parent 449b6ebd0c
commit 12f287ea12
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
DotN64/CPU/VR4300/VR4300.cs
View File

@ -13,7 +13,6 @@ namespace DotN64.CPU
private readonly IReadOnlyDictionary<OpCode, Action<Instruction>> operations;
private readonly IReadOnlyDictionary<SpecialOpCode, Action<Instruction>> specialOperations;
private readonly IReadOnlyDictionary<RegImmOpCode, Action<Instruction>> regImmOperations;
private ulong? delaySlot;
private const ulong ResetVector = 0xFFFFFFFFBFC00000;
@ -73,6 +72,8 @@ namespace DotN64.CPU
get => divMode;
set => divMode = (byte)(value & ((1 << 2) - 1));
}
public ulong? DelaySlot { get; private set; }
#endregion
#region Constructors
@ -114,7 +115,7 @@ namespace DotN64.CPU
[SpecialOpCode.ADD] = i => GPR[i.RD] = (ulong)((int)GPR[i.RS] + (int)GPR[i.RT]),
[SpecialOpCode.JR] = i =>
{
delaySlot = PC;
DelaySlot = PC;
PC = GPR[i.RS];
},
[SpecialOpCode.SRL] = i => GPR[i.RD] = (ulong)((int)GPR[i.RT] >> i.SA),
@ -179,15 +180,15 @@ namespace DotN64.CPU
{
Instruction instruction;
if (!delaySlot.HasValue)
if (!DelaySlot.HasValue)
{
instruction = ReadWord(PC);
PC += Instruction.Size;
}
else
{
instruction = ReadWord(delaySlot.Value);
delaySlot = null;
instruction = ReadWord(DelaySlot.Value);
DelaySlot = null;
}
Run(instruction);
@ -202,7 +203,7 @@ namespace DotN64.CPU
if (result)
{
delaySlot = PC;
DelaySlot = PC;
PC += (ulong)(short)instruction.Immediate << 2;
}

2
DotN64/Diagnostics/Debugger.cs
View File

@ -152,7 +152,7 @@ namespace DotN64.Diagnostics
private void Disassemble(ulong? address = null)
{
if (!address.HasValue)
address = nintendo64.CPU.PC;
address = nintendo64.CPU.DelaySlot ?? nintendo64.CPU.PC;
var physicalAddress = address.Value;
var instruction = nintendo64.CPU.CP0.Map(ref physicalAddress).ReadWord(physicalAddress);