From a3a63d43948b79450d1a0ee963ea4796cb3532a0 Mon Sep 17 00:00:00 2001 From: jhorv <38920027+jhorv@users.noreply.github.com> Date: Sat, 9 Mar 2024 19:01:51 -0500 Subject: Refactor memory managers to a common base class, consolidate Read() method logic (#6360) * - add new abstract class `VirtualMemoryManagerBase` - rename `MemoryManagerBase` to `VirtualMemoryManagerRefCountedBase` and derive from `VirtualMemoryManagerBase` - change `AddressSpaceManager`, `HvMemoryManager`, `MemoryManager`, and `MemoryManagerHostMapped` to implement abstract members and use the inherited `void VirtualMemoryManagerBase.Read(TVirtual va, Span data)` implementation. * move property `AddressSpaceSize` up by the other properties --- src/Ryujinx.Cpu/MemoryManagerBase.cs | 32 -------------------------------- 1 file changed, 32 deletions(-) delete mode 100644 src/Ryujinx.Cpu/MemoryManagerBase.cs (limited to 'src/Ryujinx.Cpu/MemoryManagerBase.cs') diff --git a/src/Ryujinx.Cpu/MemoryManagerBase.cs b/src/Ryujinx.Cpu/MemoryManagerBase.cs deleted file mode 100644 index 3288e3a4..00000000 --- a/src/Ryujinx.Cpu/MemoryManagerBase.cs +++ /dev/null @@ -1,32 +0,0 @@ -using Ryujinx.Memory; -using System.Diagnostics; -using System.Threading; - -namespace Ryujinx.Cpu -{ - public abstract class MemoryManagerBase : IRefCounted - { - private int _referenceCount; - - public void IncrementReferenceCount() - { - int newRefCount = Interlocked.Increment(ref _referenceCount); - - Debug.Assert(newRefCount >= 1); - } - - public void DecrementReferenceCount() - { - int newRefCount = Interlocked.Decrement(ref _referenceCount); - - Debug.Assert(newRefCount >= 0); - - if (newRefCount == 0) - { - Destroy(); - } - } - - protected abstract void Destroy(); - } -} -- cgit v1.2.3