deadcade/Ryujinx
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Call InvalidateCacheRegion

Browse source 
# Conflicts:
#	Ryujinx.HLE/HOS/ArmProcessContext.cs
#	src/Ryujinx.HLE/Debugger/Debugger.cs
#	src/Ryujinx.HLE/Debugger/IDebuggableProcess.cs
#	src/Ryujinx.HLE/HOS/Horizon.cs
#	src/Ryujinx.HLE/HOS/Kernel/Process/KProcess.cs
This commit is contained in:
merry 2022-02-13 14:21:23 +00:00 committed by svc64
parent 1b9753d42a
commit 54bf7507d7
7 changed files with 48 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/Ryujinx.HLE/Debugger/Debugger.cs
View file

@ -47,6 +47,8 @@ namespace Ryujinx.HLE.Debugger
private Ryujinx.Cpu.IExecutionContext[] GetThreads() => GetThreadIds().Select(x => GetThread(x)).ToArray(); private Ryujinx.Cpu.IExecutionContext[] GetThreads() => GetThreadIds().Select(x => GetThread(x)).ToArray();
private ulong? GetThreadUid(Ryujinx.Cpu.IExecutionContext thread) => GetThreadIds().Where(x => GetThread(x) == thread).First(); private ulong? GetThreadUid(Ryujinx.Cpu.IExecutionContext thread) => GetThreadIds().Where(x => GetThread(x) == thread).First();
private IVirtualMemoryManager GetMemory() => Device.System.DebugGetApplicationProcess().CpuMemory; private IVirtualMemoryManager GetMemory() => Device.System.DebugGetApplicationProcess().CpuMemory;
private void InvalidateCacheRegion(ulong address, ulong size) =>
Device.System.DebugGetApplicationProcess().InvalidateCacheRegion(address, size);
const int GdbRegisterCount = 68; const int GdbRegisterCount = 68;
@ -436,6 +438,7 @@ namespace Ryujinx.HLE.Debugger
} }
GetMemory().Write(addr, data); GetMemory().Write(addr, data);
InvalidateCacheRegion(addr, len);
ReplyOK(); ReplyOK();
} }
catch (InvalidMemoryRegionException) catch (InvalidMemoryRegionException)

9
src/Ryujinx.HLE/Debugger/IDebuggableProcess.cs
View file

@ -4,9 +4,10 @@ namespace Ryujinx.HLE.Debugger
{ {
public interface IDebuggableProcess public interface IDebuggableProcess
{ {
public void DebugStopAllThreads(); void DebugStopAllThreads();
public ulong[] DebugGetThreadUids(); ulong[] DebugGetThreadUids();
public Ryujinx.Cpu.IExecutionContext DebugGetThreadContext(ulong threadUid); Ryujinx.Cpu.IExecutionContext DebugGetThreadContext(ulong threadUid);
public IVirtualMemoryManager CpuMemory { get; } IVirtualMemoryManager CpuMemory { get; }
void InvalidateCacheRegion(ulong address, ulong size);
} }
} }

5
src/Ryujinx.HLE/HOS/Horizon.cs
View file

@ -5,6 +5,7 @@ using LibHac.Fs.Shim;
using LibHac.FsSystem; using LibHac.FsSystem;
using LibHac.Tools.FsSystem; using LibHac.Tools.FsSystem;
using Ryujinx.Cpu; using Ryujinx.Cpu;
using Ryujinx.HLE.Debugger;
using Ryujinx.HLE.FileSystem; using Ryujinx.HLE.FileSystem;
using Ryujinx.HLE.HOS.Kernel; using Ryujinx.HLE.HOS.Kernel;
using Ryujinx.HLE.HOS.Kernel.Memory; using Ryujinx.HLE.HOS.Kernel.Memory;
@ -474,11 +475,11 @@ namespace Ryujinx.HLE.HOS
IsPaused = pause; IsPaused = pause;
} }
public Debugger.IDebuggableProcess DebugGetApplicationProcess() public IDebuggableProcess DebugGetApplicationProcess()
{ {
lock (KernelContext.Processes) lock (KernelContext.Processes)
{ {
return KernelContext.Processes.Values.Where(x => x.IsApplication).First(); return KernelContext.Processes.Values.FirstOrDefault(x => x.IsApplication)?.GdbStubInterface;
} }
} }
} }

49
src/Ryujinx.HLE/HOS/Kernel/Process/KProcess.cs
View file

@ -1,6 +1,7 @@
using Ryujinx.Common; using Ryujinx.Common;
using Ryujinx.Common.Logging; using Ryujinx.Common.Logging;
using Ryujinx.Cpu; using Ryujinx.Cpu;
using Ryujinx.HLE.Debugger;
using Ryujinx.HLE.Exceptions; using Ryujinx.HLE.Exceptions;
using Ryujinx.HLE.HOS.Kernel.Common; using Ryujinx.HLE.HOS.Kernel.Common;
using Ryujinx.HLE.HOS.Kernel.Memory; using Ryujinx.HLE.HOS.Kernel.Memory;
@ -14,7 +15,7 @@ using System.Threading;
namespace Ryujinx.HLE.HOS.Kernel.Process namespace Ryujinx.HLE.HOS.Kernel.Process
{ {
class KProcess : KSynchronizationObject, Debugger.IDebuggableProcess class KProcess : KSynchronizationObject
{ {
public const uint KernelVersionMajor = 10; public const uint KernelVersionMajor = 10;
public const uint KernelVersionMinor = 4; public const uint KernelVersionMinor = 4;
@ -89,6 +90,7 @@ namespace Ryujinx.HLE.HOS.Kernel.Process
public IVirtualMemoryManager CpuMemory => Context.AddressSpace; public IVirtualMemoryManager CpuMemory => Context.AddressSpace;
public HleProcessDebugger Debugger { get; private set; } public HleProcessDebugger Debugger { get; private set; }
public IDebuggableProcess GdbStubInterface { get { return new DebuggerInterface(this); } }
public KProcess(KernelContext context, bool allowCodeMemoryForJit = false) : base(context) public KProcess(KernelContext context, bool allowCodeMemoryForJit = false) : base(context)
{ {
@ -1176,30 +1178,47 @@ namespace Ryujinx.HLE.HOS.Kernel.Process
return Capabilities.IsSvcPermitted(svcId); return Capabilities.IsSvcPermitted(svcId);
} }
public void DebugStopAllThreads() private class DebuggerInterface : IDebuggableProcess
{ {
lock (_threadingLock) private readonly KProcess _parent;
public DebuggerInterface(KProcess p)
{ {
foreach (KThread thread in _threads) _parent = p;
}
public void DebugStopAllThreads()
{
lock (_parent._threadingLock)
{ {
thread.Context.DebugStop(); foreach (KThread thread in _parent._threads)
{
thread.Context.DebugStop();
}
} }
} }
}
public ulong[] DebugGetThreadUids() public ulong[] DebugGetThreadUids()
{
lock (_threadingLock)
{ {
return _threads.Select(x => x.ThreadUid).ToArray(); lock (_parent._threadingLock)
{
return _parent._threads.Select(x => x.ThreadUid).ToArray();
}
} }
}
public Ryujinx.Cpu.IExecutionContext DebugGetThreadContext(ulong threadUid) public Ryujinx.Cpu.IExecutionContext DebugGetThreadContext(ulong threadUid)
{
lock (_threadingLock)
{ {
return _threads.Where(x => x.ThreadUid == threadUid).FirstOrDefault()?.Context; lock (_parent._threadingLock)
{
return _parent._threads.FirstOrDefault(x => x.ThreadUid == threadUid)?.Context;
}
}
public IVirtualMemoryManager CpuMemory { get { return _parent.CpuMemory; } }
public void InvalidateCacheRegion(ulong address, ulong size)
{
_parent.Context.InvalidateCacheRegion(address, size);
} }
} }
} }