From f77694e4f774c9391aad5344e70a7c8721cfedc6 Mon Sep 17 00:00:00 2001
From: gdkchan <gab.dark.100@gmail.com>
Date: Sun, 3 May 2020 19:54:50 -0300
Subject: Implement a new physical memory manager and replace DeviceMemory
 (#856)

* Implement a new physical memory manager and replace DeviceMemory

* Proper generic constraints

* Fix debug build

* Add memory tests

* New CPU memory manager and general code cleanup

* Remove host memory management from CPU project, use Ryujinx.Memory instead

* Fix tests

* Document exceptions on MemoryBlock

* Fix leak on unix memory allocation

* Proper disposal of some objects on tests

* Fix JitCache not being set as initialized

* GetRef without checks for 8-bits and 16-bits CAS

* Add MemoryBlock destructor

* Throw in separate method to improve codegen

* Address PR feedback

* QueryModified improvements

* Fix memory write tracking not marking all pages as modified in some cases

* Simplify MarkRegionAsModified

* Remove XML doc for ghost param

* Add back optimization to avoid useless buffer updates

* Add Ryujinx.Cpu project, move MemoryManager there and remove MemoryBlockWrapper

* Some nits

* Do not perform address translation when size is 0

* Address PR feedback and format NativeInterface class

* Remove ghost parameter description

* Update Ryujinx.Cpu to .NET Core 3.1

* Address PR feedback

* Fix build

* Return a well defined value for GetPhysicalAddress with invalid VA, and do not return unmapped ranges as modified

* Typo
---
 Ryujinx.HLE/HOS/Kernel/Common/KernelTransfer.cs | 30 ++++++++++++-------------
 1 file changed, 15 insertions(+), 15 deletions(-)

(limited to 'Ryujinx.HLE/HOS/Kernel/Common/KernelTransfer.cs')

diff --git a/Ryujinx.HLE/HOS/Kernel/Common/KernelTransfer.cs b/Ryujinx.HLE/HOS/Kernel/Common/KernelTransfer.cs
index 62330d6b..cd8d6661 100644
--- a/Ryujinx.HLE/HOS/Kernel/Common/KernelTransfer.cs
+++ b/Ryujinx.HLE/HOS/Kernel/Common/KernelTransfer.cs
@@ -1,5 +1,5 @@
+using Ryujinx.Cpu;
 using Ryujinx.HLE.HOS.Kernel.Process;
-using ARMeilleure.Memory;
 
 namespace Ryujinx.HLE.HOS.Kernel.Common
 {
@@ -9,10 +9,10 @@ namespace Ryujinx.HLE.HOS.Kernel.Common
         {
             KProcess currentProcess = system.Scheduler.GetCurrentProcess();
 
-            if (currentProcess.CpuMemory.IsMapped((long)address) &&
-                currentProcess.CpuMemory.IsMapped((long)address + 3))
+            if (currentProcess.CpuMemory.IsMapped(address) &&
+                currentProcess.CpuMemory.IsMapped(address + 3))
             {
-                value = currentProcess.CpuMemory.ReadInt32((long)address);
+                value = currentProcess.CpuMemory.Read<int>(address);
 
                 return true;
             }
@@ -28,10 +28,10 @@ namespace Ryujinx.HLE.HOS.Kernel.Common
 
             for (int index = 0; index < values.Length; index++, address += 4)
             {
-                if (currentProcess.CpuMemory.IsMapped((long)address) &&
-                    currentProcess.CpuMemory.IsMapped((long)address + 3))
+                if (currentProcess.CpuMemory.IsMapped(address) &&
+                    currentProcess.CpuMemory.IsMapped(address + 3))
                 {
-                    values[index]= currentProcess.CpuMemory.ReadInt32((long)address);
+                    values[index]= currentProcess.CpuMemory.Read<int>(address);
                 }
                 else
                 {
@@ -46,8 +46,8 @@ namespace Ryujinx.HLE.HOS.Kernel.Common
         {
             KProcess currentProcess = system.Scheduler.GetCurrentProcess();
 
-            if (currentProcess.CpuMemory.IsMapped((long)address) &&
-                currentProcess.CpuMemory.IsMapped((long)address + size - 1))
+            if (currentProcess.CpuMemory.IsMapped(address) &&
+                currentProcess.CpuMemory.IsMapped(address + (ulong)size - 1))
             {
                 value = MemoryHelper.ReadAsciiString(currentProcess.CpuMemory, (long)address, size);
 
@@ -63,10 +63,10 @@ namespace Ryujinx.HLE.HOS.Kernel.Common
         {
             KProcess currentProcess = system.Scheduler.GetCurrentProcess();
 
-            if (currentProcess.CpuMemory.IsMapped((long)address) &&
-                currentProcess.CpuMemory.IsMapped((long)address + 3))
+            if (currentProcess.CpuMemory.IsMapped(address) &&
+                currentProcess.CpuMemory.IsMapped(address + 3))
             {
-                currentProcess.CpuMemory.WriteInt32((long)address, value);
+                currentProcess.CpuMemory.Write(address, value);
 
                 return true;
             }
@@ -78,10 +78,10 @@ namespace Ryujinx.HLE.HOS.Kernel.Common
         {
             KProcess currentProcess = system.Scheduler.GetCurrentProcess();
 
-            if (currentProcess.CpuMemory.IsMapped((long)address) &&
-                currentProcess.CpuMemory.IsMapped((long)address + 7))
+            if (currentProcess.CpuMemory.IsMapped(address) &&
+                currentProcess.CpuMemory.IsMapped(address + 7))
             {
-                currentProcess.CpuMemory.WriteInt64((long)address, value);
+                currentProcess.CpuMemory.Write(address, value);
 
                 return true;
             }
-- 
cgit v1.2.3