crafterpika/ryujinx
1
0
Fork 0
mirror of https://git.ryujinx.app/ryubing/ryujinx.git synced 2025-06-27 22:06:24 +02:00
Code Issues Projects Releases Packages Wiki Activity

gdb: Fix ExecutionContext

Browse source
This commit is contained in:
Coxxs 2025-06-21 14:31:00 +08:00
parent 9506eba982
commit fe02ff3a3a
2 changed files with 15 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/ARMeilleure/State/ExecutionContext.cs
View file

@ -153,7 +153,7 @@ namespace ARMeilleure.State
public void StepHandler() public void StepHandler()
{ {
_stepCallback.Invoke(this); _stepCallback?.Invoke(this);
} }
public void RequestDebugStep() public void RequestDebugStep()
@ -166,7 +166,7 @@ namespace ARMeilleure.State
{ {
if (Optimizations.EnableDebugging) if (Optimizations.EnableDebugging)
{ {
DebugPc = Pc; // TODO: Is this the best place to update DebugPc? DebugPc = Pc;
} }
_breakCallback?.Invoke(this, address, imm); _breakCallback?.Invoke(this, address, imm);
@ -176,7 +176,7 @@ namespace ARMeilleure.State
{ {
if (Optimizations.EnableDebugging) if (Optimizations.EnableDebugging)
{ {
DebugPc = Pc; // TODO: Is this the best place to update DebugPc? DebugPc = Pc;
} }
_supervisorCallback?.Invoke(this, address, imm); _supervisorCallback?.Invoke(this, address, imm);

13
src/Ryujinx.Cpu/LightningJit/State/ExecutionContext.cs
View file

@ -1,3 +1,4 @@
using ARMeilleure;
using ARMeilleure.Memory; using ARMeilleure.Memory;
using ARMeilleure.State; using ARMeilleure.State;
using System; using System;
@ -127,7 +128,7 @@ namespace Ryujinx.Cpu.LightningJit.State
public void StepHandler() public void StepHandler()
{ {
_stepCallback.Invoke(this); _stepCallback?.Invoke(this);
} }
public void RequestDebugStep() public void RequestDebugStep()
@ -138,11 +139,21 @@ namespace Ryujinx.Cpu.LightningJit.State
internal void OnBreak(ulong address, int imm) internal void OnBreak(ulong address, int imm)
{ {
if (Optimizations.EnableDebugging)
{
DebugPc = Pc;
}
_breakCallback?.Invoke(this, address, imm); _breakCallback?.Invoke(this, address, imm);
} }
internal void OnSupervisorCall(ulong address, int imm) internal void OnSupervisorCall(ulong address, int imm)
{ {
if (Optimizations.EnableDebugging)
{
DebugPc = Pc;
}
_supervisorCallback?.Invoke(this, address, imm); _supervisorCallback?.Invoke(this, address, imm);
} }