aboutsummaryrefslogtreecommitdiff
path: root/ARMeilleure/Memory
diff options
context:
space:
mode:
Diffstat (limited to 'ARMeilleure/Memory')
-rw-r--r--ARMeilleure/Memory/IMemoryManager.cs40
-rw-r--r--ARMeilleure/Memory/MemoryHelper.cs8
-rw-r--r--ARMeilleure/Memory/MemoryManager.cs2
3 files changed, 5 insertions, 45 deletions
diff --git a/ARMeilleure/Memory/IMemoryManager.cs b/ARMeilleure/Memory/IMemoryManager.cs
deleted file mode 100644
index bcee5db2..00000000
--- a/ARMeilleure/Memory/IMemoryManager.cs
+++ /dev/null
@@ -1,40 +0,0 @@
-using ARMeilleure.State;
-using System;
-
-namespace ARMeilleure.Memory
-{
- public interface IMemoryManager : IMemory, IDisposable
- {
- void Map(long va, long pa, long size);
-
- void Unmap(long position, long size);
-
- bool IsMapped(long position);
-
- long GetPhysicalAddress(long virtualAddress);
-
- bool IsRegionModified(long position, long size);
-
- bool TryGetHostAddress(long position, long size, out IntPtr ptr);
-
- bool IsValidPosition(long position);
-
- bool AtomicCompareExchangeInt32(long position, int expected, int desired);
-
- int AtomicIncrementInt32(long position);
-
- int AtomicDecrementInt32(long position);
-
- byte[] ReadBytes(long position, long size);
-
- void ReadBytes(long position, byte[] data, int startIndex, int size);
-
- void WriteVector128(long position, V128 value);
-
- void WriteBytes(long position, byte[] data);
-
- void WriteBytes(long position, byte[] data, int startIndex, int size);
-
- void CopyBytes(long src, long dst, long size);
- }
-} \ No newline at end of file
diff --git a/ARMeilleure/Memory/MemoryHelper.cs b/ARMeilleure/Memory/MemoryHelper.cs
index 71ddac23..8e310d4d 100644
--- a/ARMeilleure/Memory/MemoryHelper.cs
+++ b/ARMeilleure/Memory/MemoryHelper.cs
@@ -7,7 +7,7 @@ namespace ARMeilleure.Memory
{
public static class MemoryHelper
{
- public static void FillWithZeros(IMemoryManager memory, long position, int size)
+ public static void FillWithZeros(MemoryManager memory, long position, int size)
{
int size8 = size & ~(8 - 1);
@@ -22,7 +22,7 @@ namespace ARMeilleure.Memory
}
}
- public unsafe static T Read<T>(IMemoryManager memory, long position) where T : struct
+ public unsafe static T Read<T>(MemoryManager memory, long position) where T : struct
{
long size = Marshal.SizeOf<T>();
@@ -34,7 +34,7 @@ namespace ARMeilleure.Memory
}
}
- public unsafe static void Write<T>(IMemoryManager memory, long position, T value) where T : struct
+ public unsafe static void Write<T>(MemoryManager memory, long position, T value) where T : struct
{
long size = Marshal.SizeOf<T>();
@@ -48,7 +48,7 @@ namespace ARMeilleure.Memory
memory.WriteBytes(position, data);
}
- public static string ReadAsciiString(IMemoryManager memory, long position, long maxSize = -1)
+ public static string ReadAsciiString(MemoryManager memory, long position, long maxSize = -1)
{
using (MemoryStream ms = new MemoryStream())
{
diff --git a/ARMeilleure/Memory/MemoryManager.cs b/ARMeilleure/Memory/MemoryManager.cs
index 12c11843..c6224988 100644
--- a/ARMeilleure/Memory/MemoryManager.cs
+++ b/ARMeilleure/Memory/MemoryManager.cs
@@ -7,7 +7,7 @@ using static ARMeilleure.Memory.MemoryManagement;
namespace ARMeilleure.Memory
{
- public unsafe class MemoryManager : IMemoryManager
+ public unsafe class MemoryManager
{
public const int PageBits = 12;
public const int PageSize = 1 << PageBits;