aboutsummaryrefslogtreecommitdiff
path: root/ARMeilleure/State
diff options
context:
space:
mode:
authorgdkchan <gab.dark.100@gmail.com>2020-05-03 19:54:50 -0300
committerGitHub <noreply@github.com>2020-05-04 08:54:50 +1000
commitf77694e4f774c9391aad5344e70a7c8721cfedc6 (patch)
tree36bccaeb153bd5d921c751966b8a734a7b4b6ae1 /ARMeilleure/State
parent1758424208335d1f4ff7c27c554e517c81bf72f6 (diff)
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
Diffstat (limited to 'ARMeilleure/State')
-rw-r--r--ARMeilleure/State/ExecutionContext.cs5
-rw-r--r--ARMeilleure/State/NativeContext.cs10
2 files changed, 9 insertions, 6 deletions
diff --git a/ARMeilleure/State/ExecutionContext.cs b/ARMeilleure/State/ExecutionContext.cs
index 57a05dbf..866eafbc 100644
--- a/ARMeilleure/State/ExecutionContext.cs
+++ b/ARMeilleure/State/ExecutionContext.cs
@@ -1,3 +1,4 @@
+using ARMeilleure.Memory;
using System;
using System.Diagnostics;
@@ -73,9 +74,9 @@ namespace ARMeilleure.State
_tickCounter.Start();
}
- public ExecutionContext()
+ public ExecutionContext(IJitMemoryAllocator allocator)
{
- _nativeContext = new NativeContext();
+ _nativeContext = new NativeContext(allocator);
Running = true;
diff --git a/ARMeilleure/State/NativeContext.cs b/ARMeilleure/State/NativeContext.cs
index 95d976ee..10c4c37f 100644
--- a/ARMeilleure/State/NativeContext.cs
+++ b/ARMeilleure/State/NativeContext.cs
@@ -17,11 +17,13 @@ namespace ARMeilleure.State
RegisterConsts.FlagsCount * FlagSize +
RegisterConsts.FpFlagsCount * FlagSize + ExtraSize;
- public IntPtr BasePtr { get; }
+ private readonly IJitMemoryBlock _block;
- public NativeContext()
+ public IntPtr BasePtr => _block.Pointer;
+
+ public NativeContext(IJitMemoryAllocator allocator)
{
- BasePtr = MemoryManagement.Allocate(TotalSize);
+ _block = allocator.Allocate(TotalSize);
}
public ulong GetX(int index)
@@ -193,7 +195,7 @@ namespace ARMeilleure.State
public void Dispose()
{
- MemoryManagement.Free(BasePtr);
+ _block.Dispose();
}
}
} \ No newline at end of file