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

move property AddressSpaceSize up by the other properties

Browse source
This commit is contained in:
Jim Horvath 2024-03-08 21:14:11 -05:00
commit 5eb93be7c0
4 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/Ryujinx.Cpu/AppleHv/HvMemoryManager.cs
View file

@ -56,6 +56,8 @@ namespace Ryujinx.Cpu.AppleHv
public event Action<ulong, ulong> UnmapEvent; public event Action<ulong, ulong> UnmapEvent;
protected override ulong AddressSpaceSize { get; }
/// <summary> /// <summary>
/// Creates a new instance of the Hypervisor memory manager. /// Creates a new instance of the Hypervisor memory manager.
/// </summary> /// </summary>
@ -862,8 +864,6 @@ namespace Ryujinx.Cpu.AppleHv
_addressSpace.Dispose(); _addressSpace.Dispose();
} }
protected override ulong AddressSpaceSize { get; }
protected override Span<byte> GetPhysicalAddressSpan(ulong pa, int size) protected override Span<byte> GetPhysicalAddressSpan(ulong pa, int size)
=> _backingMemory.GetSpan(pa, size); => _backingMemory.GetSpan(pa, size);

4
src/Ryujinx.Cpu/Jit/MemoryManager.cs
View file

@ -44,6 +44,8 @@ namespace Ryujinx.Cpu.Jit
public event Action<ulong, ulong> UnmapEvent; public event Action<ulong, ulong> UnmapEvent;
protected override ulong AddressSpaceSize { get; }
/// <summary> /// <summary>
/// Creates a new instance of the memory manager. /// Creates a new instance of the memory manager.
/// </summary> /// </summary>
@ -623,8 +625,6 @@ namespace Ryujinx.Cpu.Jit
/// </summary> /// </summary>
protected override void Destroy() => _pageTable.Dispose(); protected override void Destroy() => _pageTable.Dispose();
protected override ulong AddressSpaceSize { get; }
protected override Span<byte> GetPhysicalAddressSpan(ulong pa, int size) protected override Span<byte> GetPhysicalAddressSpan(ulong pa, int size)
=> _backingMemory.GetSpan(pa, size); => _backingMemory.GetSpan(pa, size);

4
src/Ryujinx.Cpu/Jit/MemoryManagerHostMapped.cs
View file

@ -54,6 +54,8 @@ namespace Ryujinx.Cpu.Jit
public event Action<ulong, ulong> UnmapEvent; public event Action<ulong, ulong> UnmapEvent;
protected override ulong AddressSpaceSize { get; }
/// <summary> /// <summary>
/// Creates a new instance of the host mapped memory manager. /// Creates a new instance of the host mapped memory manager.
/// </summary> /// </summary>
@ -774,8 +776,6 @@ namespace Ryujinx.Cpu.Jit
_memoryEh.Dispose(); _memoryEh.Dispose();
} }
protected override ulong AddressSpaceSize { get; }
protected override Span<byte> GetPhysicalAddressSpan(ulong pa, int size) protected override Span<byte> GetPhysicalAddressSpan(ulong pa, int size)
=> _addressSpace.Mirror.GetSpan(pa, size); => _addressSpace.Mirror.GetSpan(pa, size);

4
src/Ryujinx.Memory/AddressSpaceManager.cs
View file

@ -24,6 +24,8 @@ namespace Ryujinx.Memory
private readonly MemoryBlock _backingMemory; private readonly MemoryBlock _backingMemory;
private readonly PageTable<nuint> _pageTable; private readonly PageTable<nuint> _pageTable;
protected override ulong AddressSpaceSize { get; }
/// <summary> /// <summary>
/// Creates a new instance of the memory manager. /// Creates a new instance of the memory manager.
/// </summary> /// </summary>
@ -401,8 +403,6 @@ namespace Ryujinx.Memory
// Only the ARM Memory Manager has tracking for now. // Only the ARM Memory Manager has tracking for now.
} }
protected override ulong AddressSpaceSize { get; }
protected override unsafe Span<byte> GetPhysicalAddressSpan(nuint pa, int size) protected override unsafe Span<byte> GetPhysicalAddressSpan(nuint pa, int size)
=> new((void*)pa, size); => new((void*)pa, size);