diff options
Diffstat (limited to 'ARMeilleure/State')
| -rw-r--r-- | ARMeilleure/State/ExecutionContext.cs | 5 | ||||
| -rw-r--r-- | ARMeilleure/State/NativeContext.cs | 10 |
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 |