diff --git a/src/Ryujinx.Cpu/AppleHv/HvMemoryManager.cs b/src/Ryujinx.Cpu/AppleHv/HvMemoryManager.cs index ac6020324c..6e864f4ca6 100644 --- a/src/Ryujinx.Cpu/AppleHv/HvMemoryManager.cs +++ b/src/Ryujinx.Cpu/AppleHv/HvMemoryManager.cs @@ -56,6 +56,8 @@ namespace Ryujinx.Cpu.AppleHv public event Action UnmapEvent; + protected override ulong AddressSpaceSize { get; } + /// /// Creates a new instance of the Hypervisor memory manager. /// @@ -862,8 +864,6 @@ namespace Ryujinx.Cpu.AppleHv _addressSpace.Dispose(); } - protected override ulong AddressSpaceSize { get; } - protected override Span GetPhysicalAddressSpan(ulong pa, int size) => _backingMemory.GetSpan(pa, size); diff --git a/src/Ryujinx.Cpu/Jit/MemoryManager.cs b/src/Ryujinx.Cpu/Jit/MemoryManager.cs index de10fba4b1..bbfdf536eb 100644 --- a/src/Ryujinx.Cpu/Jit/MemoryManager.cs +++ b/src/Ryujinx.Cpu/Jit/MemoryManager.cs @@ -44,6 +44,8 @@ namespace Ryujinx.Cpu.Jit public event Action UnmapEvent; + protected override ulong AddressSpaceSize { get; } + /// /// Creates a new instance of the memory manager. /// @@ -623,8 +625,6 @@ namespace Ryujinx.Cpu.Jit /// protected override void Destroy() => _pageTable.Dispose(); - protected override ulong AddressSpaceSize { get; } - protected override Span GetPhysicalAddressSpan(ulong pa, int size) => _backingMemory.GetSpan(pa, size); diff --git a/src/Ryujinx.Cpu/Jit/MemoryManagerHostMapped.cs b/src/Ryujinx.Cpu/Jit/MemoryManagerHostMapped.cs index 7111cd36bc..0b6ba260ab 100644 --- a/src/Ryujinx.Cpu/Jit/MemoryManagerHostMapped.cs +++ b/src/Ryujinx.Cpu/Jit/MemoryManagerHostMapped.cs @@ -54,6 +54,8 @@ namespace Ryujinx.Cpu.Jit public event Action UnmapEvent; + protected override ulong AddressSpaceSize { get; } + /// /// Creates a new instance of the host mapped memory manager. /// @@ -774,8 +776,6 @@ namespace Ryujinx.Cpu.Jit _memoryEh.Dispose(); } - protected override ulong AddressSpaceSize { get; } - protected override Span GetPhysicalAddressSpan(ulong pa, int size) => _addressSpace.Mirror.GetSpan(pa, size); diff --git a/src/Ryujinx.Memory/AddressSpaceManager.cs b/src/Ryujinx.Memory/AddressSpaceManager.cs index eff8ef11c3..b953eb306e 100644 --- a/src/Ryujinx.Memory/AddressSpaceManager.cs +++ b/src/Ryujinx.Memory/AddressSpaceManager.cs @@ -24,6 +24,8 @@ namespace Ryujinx.Memory private readonly MemoryBlock _backingMemory; private readonly PageTable _pageTable; + protected override ulong AddressSpaceSize { get; } + /// /// Creates a new instance of the memory manager. /// @@ -401,8 +403,6 @@ namespace Ryujinx.Memory // Only the ARM Memory Manager has tracking for now. } - protected override ulong AddressSpaceSize { get; } - protected override unsafe Span GetPhysicalAddressSpan(nuint pa, int size) => new((void*)pa, size);