aboutsummaryrefslogtreecommitdiff
path: root/src/Ryujinx.Cpu/Tracking
diff options
context:
space:
mode:
authorriperiperi <rhy3756547@hotmail.com>2023-05-05 22:40:46 +0100
committerGitHub <noreply@github.com>2023-05-05 23:40:46 +0200
commit7df4fcada702dbc01d09b8f6fa027f5d409e33e3 (patch)
treed006bc4b9b78d81475a288b6c5ee9dfd7c3f3d33 /src/Ryujinx.Cpu/Tracking
parentd6698680bef4ac37b63d67c5415edf5717a84b3a (diff)
GPU: Remove CPU region handle containers (#4817)
* GPU: Remove CPU region handle containers. Another one for the "I don't know why I didn't do this earlier" pile. This removes the "Cpu" prefixed region handle classes, which each mirror a region handle type from Ryujinx.Memory. Originally, not all projects had a reference to Ryujinx.Memory, so these classes were introduced to bridge the gap. Someone else crossed that bridge since, so these classes don't have much of a purpose anymore. This PR replaces all uses of CpuRegionHandle etc to their direct Ryujinx.Memory versions. RegionHandle methods (specifically QueryModified) are about the hottest path there is in the entire emulator, so there is a nice boost from doing this. * Add docs
Diffstat (limited to 'src/Ryujinx.Cpu/Tracking')
-rw-r--r--src/Ryujinx.Cpu/Tracking/CpuMultiRegionHandle.cs28
-rw-r--r--src/Ryujinx.Cpu/Tracking/CpuRegionHandle.cs37
-rw-r--r--src/Ryujinx.Cpu/Tracking/CpuSmartMultiRegionHandle.cs26
3 files changed, 0 insertions, 91 deletions
diff --git a/src/Ryujinx.Cpu/Tracking/CpuMultiRegionHandle.cs b/src/Ryujinx.Cpu/Tracking/CpuMultiRegionHandle.cs
deleted file mode 100644
index 0ed8bfc5..00000000
--- a/src/Ryujinx.Cpu/Tracking/CpuMultiRegionHandle.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-using Ryujinx.Memory.Tracking;
-using System;
-using System.Collections.Generic;
-
-namespace Ryujinx.Cpu.Tracking
-{
- public class CpuMultiRegionHandle : IMultiRegionHandle
- {
- private readonly MultiRegionHandle _impl;
-
- public bool Dirty => _impl.Dirty;
-
- internal CpuMultiRegionHandle(MultiRegionHandle impl)
- {
- _impl = impl;
- }
-
- public void Dispose() => _impl.Dispose();
- public void ForceDirty(ulong address, ulong size) => _impl.ForceDirty(address, size);
- public IEnumerable<IRegionHandle> GetHandles() => _impl.GetHandles();
- public void QueryModified(Action<ulong, ulong> modifiedAction) => _impl.QueryModified(modifiedAction);
- public void QueryModified(ulong address, ulong size, Action<ulong, ulong> modifiedAction) => _impl.QueryModified(address, size, modifiedAction);
- public void QueryModified(ulong address, ulong size, Action<ulong, ulong> modifiedAction, int sequenceNumber) => _impl.QueryModified(address, size, modifiedAction, sequenceNumber);
- public void RegisterAction(ulong address, ulong size, RegionSignal action) => _impl.RegisterAction(address, size, action);
- public void RegisterPreciseAction(ulong address, ulong size, PreciseRegionSignal action) => _impl.RegisterPreciseAction(address, size, action);
- public void SignalWrite() => _impl.SignalWrite();
- }
-}
diff --git a/src/Ryujinx.Cpu/Tracking/CpuRegionHandle.cs b/src/Ryujinx.Cpu/Tracking/CpuRegionHandle.cs
deleted file mode 100644
index e766460f..00000000
--- a/src/Ryujinx.Cpu/Tracking/CpuRegionHandle.cs
+++ /dev/null
@@ -1,37 +0,0 @@
-using Ryujinx.Memory.Tracking;
-using System;
-
-namespace Ryujinx.Cpu.Tracking
-{
- public class CpuRegionHandle : IRegionHandle
- {
- private readonly RegionHandle _impl;
-
- public bool Dirty => _impl.Dirty;
- public bool Unmapped => _impl.Unmapped;
- public ulong Address => _impl.Address;
- public ulong Size => _impl.Size;
- public ulong EndAddress => _impl.EndAddress;
-
- internal CpuRegionHandle(RegionHandle impl)
- {
- _impl = impl;
- }
-
- public void Dispose() => _impl.Dispose();
- public bool DirtyOrVolatile() => _impl.DirtyOrVolatile();
- public void ForceDirty() => _impl.ForceDirty();
- public IRegionHandle GetHandle() => _impl;
- public void RegisterAction(RegionSignal action) => _impl.RegisterAction(action);
- public void RegisterPreciseAction(PreciseRegionSignal action) => _impl.RegisterPreciseAction(action);
- public void RegisterDirtyEvent(Action action) => _impl.RegisterDirtyEvent(action);
- public void Reprotect(bool asDirty = false) => _impl.Reprotect(asDirty);
-
- public bool OverlapsWith(ulong address, ulong size) => _impl.OverlapsWith(address, size);
-
- public bool RangeEquals(CpuRegionHandle other)
- {
- return _impl.RealAddress == other._impl.RealAddress && _impl.RealSize == other._impl.RealSize;
- }
- }
-}
diff --git a/src/Ryujinx.Cpu/Tracking/CpuSmartMultiRegionHandle.cs b/src/Ryujinx.Cpu/Tracking/CpuSmartMultiRegionHandle.cs
deleted file mode 100644
index 665271c6..00000000
--- a/src/Ryujinx.Cpu/Tracking/CpuSmartMultiRegionHandle.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-using Ryujinx.Memory.Tracking;
-using System;
-
-namespace Ryujinx.Cpu.Tracking
-{
- public class CpuSmartMultiRegionHandle : IMultiRegionHandle
- {
- private readonly SmartMultiRegionHandle _impl;
-
- public bool Dirty => _impl.Dirty;
-
- internal CpuSmartMultiRegionHandle(SmartMultiRegionHandle impl)
- {
- _impl = impl;
- }
-
- public void Dispose() => _impl.Dispose();
- public void ForceDirty(ulong address, ulong size) => _impl.ForceDirty(address, size);
- public void RegisterAction(RegionSignal action) => _impl.RegisterAction(action);
- public void RegisterPreciseAction(PreciseRegionSignal action) => _impl.RegisterPreciseAction(action);
- public void QueryModified(Action<ulong, ulong> modifiedAction) => _impl.QueryModified(modifiedAction);
- public void QueryModified(ulong address, ulong size, Action<ulong, ulong> modifiedAction) => _impl.QueryModified(address, size, modifiedAction);
- public void QueryModified(ulong address, ulong size, Action<ulong, ulong> modifiedAction, int sequenceNumber) => _impl.QueryModified(address, size, modifiedAction, sequenceNumber);
- public void SignalWrite() => _impl.SignalWrite();
- }
-}