From ba3438f24acc99bc8033dd7c72e24c451d360215 Mon Sep 17 00:00:00 2001 From: Emmanuel Hansen Date: Sat, 20 Jan 2024 18:55:24 +0000 Subject: [PATCH] fix arm jit rebase --- src/Ryujinx.Cpu/LightningJit/LightningJitEngine.cs | 2 +- src/Ryujinx.Cpu/Nce/NceCpuContext.cs | 4 ++++ src/Ryujinx.Cpu/Nce/NceMemoryBlock.cs | 1 + 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/Ryujinx.Cpu/LightningJit/LightningJitEngine.cs b/src/Ryujinx.Cpu/LightningJit/LightningJitEngine.cs index c97ddc7c7..ce48dbf54 100644 --- a/src/Ryujinx.Cpu/LightningJit/LightningJitEngine.cs +++ b/src/Ryujinx.Cpu/LightningJit/LightningJitEngine.cs @@ -12,7 +12,7 @@ namespace Ryujinx.Cpu.LightningJit } /// - public ICpuContext CreateCpuContext(IMemoryManager memoryManager, bool for64Bit) + public ICpuContext CreateCpuContext(ICpuMemoryManager memoryManager, bool for64Bit) { return new LightningJitCpuContext(_tickSource, memoryManager, for64Bit); } diff --git a/src/Ryujinx.Cpu/Nce/NceCpuContext.cs b/src/Ryujinx.Cpu/Nce/NceCpuContext.cs index 5cfddf7e7..45daaa34d 100644 --- a/src/Ryujinx.Cpu/Nce/NceCpuContext.cs +++ b/src/Ryujinx.Cpu/Nce/NceCpuContext.cs @@ -136,5 +136,9 @@ namespace Ryujinx.Cpu.Nce public void PrepareCodeRange(ulong address, ulong size) { } + + public void Dispose() + { + } } } diff --git a/src/Ryujinx.Cpu/Nce/NceMemoryBlock.cs b/src/Ryujinx.Cpu/Nce/NceMemoryBlock.cs index a8f0b8e0e..7bf180eb4 100644 --- a/src/Ryujinx.Cpu/Nce/NceMemoryBlock.cs +++ b/src/Ryujinx.Cpu/Nce/NceMemoryBlock.cs @@ -16,6 +16,7 @@ namespace Ryujinx.Cpu.Nce } public void Commit(ulong offset, ulong size) => _impl.Commit(offset, size); + public void MapAsRw(ulong offset, ulong size) => _impl.Reprotect(offset, size, MemoryPermission.ReadAndWrite); public void MapAsRx(ulong offset, ulong size) => _impl.Reprotect(offset, size, MemoryPermission.ReadAndExecute); public void MapAsRwx(ulong offset, ulong size) => _impl.Reprotect(offset, size, MemoryPermission.ReadWriteExecute);