Move WriteBytes to AMemory, implement it with a Marshal copy like ReadBytes, fix regression on address range checking

1 files changed, 34 insertions, 25 deletions

diff --git a/ChocolArm64/Memory/AMemory.cs b/ChocolArm64/Memory/AMemory.cs
index 2adf5403..fe250d4b 100644
--- a/ChocolArm64/Memory/AMemory.cs
+++ b/ChocolArm64/Memory/AMemory.cs
@@ -353,22 +353,6 @@ namespace ChocolArm64.Memory
             return *((ulong*)(RamPtr + (uint)Position));
         }
 
-        public byte[] ReadBytes(long Position, long Size)
-        {
-            if ((uint)Size > int.MaxValue)
-            {
-                throw new ArgumentOutOfRangeException(nameof(Size));
-            }
-
-            EnsureRangeIsValid(Position, Size, AMemoryPerm.Read);
-
-            byte[] Data = new byte[Size];
-
-            Marshal.Copy((IntPtr)(RamPtr + (uint)Position), Data, 0, (int)Size);
-
-            return Data;
-        }
-
         public Vector128<float> ReadVector8Unchecked(long Position)
         {
             if (Sse2.IsSupported)
@@ -433,6 +417,22 @@ namespace ChocolArm64.Memory
             }
         }
 
+        public byte[] ReadBytes(long Position, long Size)
+        {
+            if ((uint)Size > int.MaxValue)
+            {
+                throw new ArgumentOutOfRangeException(nameof(Size));
+            }
+
+            EnsureRangeIsValid(Position, Size, AMemoryPerm.Read);
+
+            byte[] Data = new byte[Size];
+
+            Marshal.Copy((IntPtr)(RamPtr + (uint)Position), Data, 0, (int)Size);
+
+            return Data;
+        }
+
         public void WriteSByte(long Position, sbyte Value)
         {
             WriteByte(Position, (byte)Value);
@@ -666,23 +666,19 @@ namespace ChocolArm64.Memory
             }
         }
 
-        private void EnsureAccessIsValid(long Position, AMemoryPerm Perm)
+        public void WriteBytes(long Position, byte[] Data)
         {
-            if (!Manager.IsMapped(Position))
-            {
-                throw new VmmPageFaultException(Position);
-            }
+            EnsureRangeIsValid(Position, (uint)Data.Length, AMemoryPerm.Write);
 
-            if (!Manager.HasPermission(Position, Perm))
-            {
-                throw new VmmAccessViolationException(Position, Perm);
-            }
+            Marshal.Copy(Data, 0, (IntPtr)(RamPtr + (uint)Position), Data.Length);
         }
 
         private void EnsureRangeIsValid(long Position, long Size, AMemoryPerm Perm)
         {
             long EndPos = Position + Size;
 
+            Position &= ~AMemoryMgr.PageMask;
+
             while ((ulong)Position < (ulong)EndPos)
             {
                 EnsureAccessIsValid(Position, Perm);
@@ -691,6 +687,19 @@ namespace ChocolArm64.Memory
             }
         }
 
+        private void EnsureAccessIsValid(long Position, AMemoryPerm Perm)
+        {
+            if (!Manager.IsMapped(Position))
+            {
+                throw new VmmPageFaultException(Position);
+            }
+
+            if (!Manager.HasPermission(Position, Perm))
+            {
+                throw new VmmAccessViolationException(Position, Perm);
+            }
+        }
+
         public void Dispose()
         {
             Dispose(true);