diff options
Diffstat (limited to 'Ryujinx.Cpu')
| -rw-r--r-- | Ryujinx.Cpu/CpuContext.cs | 16 | ||||
| -rw-r--r-- | Ryujinx.Cpu/MemoryManager.cs | 10 |
2 files changed, 24 insertions, 2 deletions
diff --git a/Ryujinx.Cpu/CpuContext.cs b/Ryujinx.Cpu/CpuContext.cs index 275fcc68..45040586 100644 --- a/Ryujinx.Cpu/CpuContext.cs +++ b/Ryujinx.Cpu/CpuContext.cs @@ -10,10 +10,22 @@ namespace Ryujinx.Cpu public CpuContext(MemoryManager memory) { _translator = new Translator(new JitMemoryAllocator(), memory); + memory.UnmapEvent += UnmapHandler; } - public static ExecutionContext CreateExecutionContext() => new ExecutionContext(new JitMemoryAllocator()); + private void UnmapHandler(ulong address, ulong size) + { + _translator.InvalidateJitCacheRegion(address, size); + } - public void Execute(ExecutionContext context, ulong address) => _translator.Execute(context, address); + public static ExecutionContext CreateExecutionContext() + { + return new ExecutionContext(new JitMemoryAllocator()); + } + + public void Execute(ExecutionContext context, ulong address) + { + _translator.Execute(context, address); + } } } diff --git a/Ryujinx.Cpu/MemoryManager.cs b/Ryujinx.Cpu/MemoryManager.cs index 36ae9b32..5a778e64 100644 --- a/Ryujinx.Cpu/MemoryManager.cs +++ b/Ryujinx.Cpu/MemoryManager.cs @@ -40,6 +40,8 @@ namespace Ryujinx.Cpu public MemoryTracking Tracking { get; } + internal event Action<ulong, ulong> UnmapEvent; + /// <summary> /// Creates a new instance of the memory manager. /// </summary> @@ -100,6 +102,14 @@ namespace Ryujinx.Cpu /// <param name="size">Size of the range to be unmapped</param> public void Unmap(ulong va, ulong size) { + // If size is 0, there's nothing to unmap, just exit early. + if (size == 0) + { + return; + } + + UnmapEvent?.Invoke(va, size); + ulong remainingSize = size; ulong oVa = va; while (remainingSize != 0) |