Updated: Reloaded.Memory.Buffers to LargeAddressAware Version

Reloaded-Project · Jun 18, 2022 · 3008dab · 3008dab
1 parent 9031bb0
commit 3008dab
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/Source/Reloaded.Assembler/Assembler.cs b/Source/Reloaded.Assembler/Assembler.cs
@@ -21,9 +21,9 @@ public unsafe class Assembler : IDisposable
     {
         // Address and size of allocation of where the text/mnemonics to be assembled will be stored.
         private object  _lock = new object();
-        private IntPtr  _textAddress;
+        private nuint  _textAddress;
         private int     _textSize;
-        private IntPtr  _resultAddress;
+        private nuint _resultAddress;
         private int     _resultSize;
 
         private static readonly MemoryBufferHelper _bufferHelper;
@@ -146,7 +146,7 @@ public byte[] Assemble(string mnemonics, ushort passLimit = 100)
                 _processMemory.WriteRaw(_textAddress, mnemonicBytes);
 
                 // Assemble and check result.
-                var result = _assembleFunction(_textAddress, _resultAddress, (IntPtr)_resultSize, passLimit, IntPtr.Zero);
+                var result = _assembleFunction((IntPtr)(void*)_textAddress, (IntPtr)(void*)_resultAddress, (IntPtr)_resultSize, passLimit, IntPtr.Zero);
 
                 //    As stated in FASMDLL.TXT, at the beginning of the block, the FASM_STATE structure will reside.
                 //    It is defined in FASM.ASH. We read it here.
@@ -219,7 +219,7 @@ private void AllocateText(int textSize, int retryCount)
             _textAddress = allocationProperties.MemoryAddress;
             _textSize = allocationProperties.Size;
 
-            if (_textAddress == IntPtr.Zero)
+            if (_textAddress == 0)
                 throw new FasmWrapperException("Failed to allocate text memory for Assembler.");
         }
 
@@ -232,7 +232,7 @@ private void AllocateResult(int resultSize, int retryCount)
             _resultAddress = allocationProperties.MemoryAddress;
             _resultSize = allocationProperties.Size;
 
-            if (_resultAddress == IntPtr.Zero)
+            if (_resultAddress == 0)
                 throw new FasmWrapperException("Failed to allocate result memory for Assembler.");
         }
 

diff --git a/Source/Reloaded.Assembler/Reloaded.Assembler.csproj b/Source/Reloaded.Assembler/Reloaded.Assembler.csproj
@@ -25,6 +25,7 @@
     <PackageLicenseFile>LICENSE</PackageLicenseFile>
     <PackageIcon>Icon.png</PackageIcon>
 
+    <LangVersion>preview</LangVersion>
     <IsTrimmable>true</IsTrimmable>
   </PropertyGroup>
 
@@ -50,6 +51,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Reloaded.Memory.Buffers" Version="1.4.6" />
+    <PackageReference Include="Reloaded.Memory.Buffers" Version="2.0.0" />
   </ItemGroup>
 </Project>