Refactor Disassembler class and add new Disassemble overloads (#12)

SamboyCoding · Jul 6, 2023 · a37eb58 · a37eb58
1 parent cb8877f
commit a37eb58
Show file tree

Hide file tree

Showing 6 changed files with 226 additions and 116 deletions.
diff --git a/Disarm.Tests/BasicTests.cs b/Disarm.Tests/BasicTests.cs
@@ -9,7 +9,7 @@ public BasicTests(ITestOutputHelper testOutputHelper) : base(testOutputHelper) {
     [Fact]
     public void TestDisassembleEntireBody()
     {
-        var result = Disassembler.DisassembleOnDemand(TestBodies.IncludesPcRelAddressing, 0);
+        var result = Disassembler.Disassemble(TestBodies.IncludesPcRelAddressing, 0);
 
         foreach (var instruction in result)
         {
@@ -20,11 +20,46 @@ public void TestDisassembleEntireBody()
     [Fact]
     public void TestLongerBody()
     {
-        var result = Disassembler.DisassembleOnDemand(TestBodies.HasABadBitMask, 0);
+        var result = Disassembler.Disassemble(TestBodies.HasABadBitMask, 0);
 
         foreach (var instruction in result)
         {
             OutputHelper.WriteLine(instruction.ToString());
         }
     }
+
+    [Fact]
+    public unsafe void TestOverloads()
+    {
+        byte[] byteArray = TestBodies.HasABadBitMask;
+        ReadOnlySpan<byte> span = byteArray;
+        ReadOnlyMemory<byte> memory = byteArray;
+        fixed (byte* bytePointer = byteArray)
+        {
+            using var byteArrayEnumerator = Disassembler.Disassemble(byteArray, 0).GetEnumerator();
+            using var spanEnumerator = Disassembler.Disassemble(span, 0).GetEnumerator();
+            using var spanListEnumerator = Disassembler.Disassemble(span, 0, out _).GetEnumerator();
+            using var memoryEnumerator = Disassembler.Disassemble(memory, 0).GetEnumerator();
+            using var bytePointerEnumerator = Disassembler.Disassemble(bytePointer, byteArray.Length, 0).GetEnumerator();
+
+            while (byteArrayEnumerator.MoveNext())
+            {
+                Assert.True(spanEnumerator.MoveNext());
+                Assert.True(spanListEnumerator.MoveNext());
+                Assert.True(memoryEnumerator.MoveNext());
+                Assert.True(bytePointerEnumerator.MoveNext());
+
+                var expected = byteArrayEnumerator.Current;
+                Assert.Equal(expected, spanEnumerator.Current);
+                Assert.Equal(expected, spanListEnumerator.Current);
+                Assert.Equal(expected, memoryEnumerator.Current);
+                Assert.Equal(expected, bytePointerEnumerator.Current);
+            }
+
+            Assert.False(spanEnumerator.MoveNext());
+            Assert.False(spanListEnumerator.MoveNext());
+            Assert.False(memoryEnumerator.MoveNext());
+            Assert.False(bytePointerEnumerator.MoveNext());
+        }
+    }
 }
diff --git a/Disarm.Tests/BranchTests.cs b/Disarm.Tests/BranchTests.cs
@@ -13,7 +13,7 @@ public void BranchAddressesAreCorrect()
     {
         ulong address = 0x023b6a90;
         var bytes = new byte[] { 0x3f, 0x69, 0xa2, 0x17 };
-        var insn = Disassembler.Disassemble(bytes, address).Instructions[0];
+        var insn = Disassembler.Disassemble(bytes, address).Single();
 
         Assert.Equal(Arm64Mnemonic.B, insn.Mnemonic);
         Assert.Equal(0xc50f8cU, insn.BranchTarget);

diff --git a/Disarm.Tests/Disarm.Tests.csproj b/Disarm.Tests/Disarm.Tests.csproj
@@ -4,6 +4,7 @@
         <TargetFramework>net6.0</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
+        <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
 
         <IsPackable>false</IsPackable>
     </PropertyGroup>

diff --git a/Disarm/Arm64DisassemblyResult.cs b/Disarm/Arm64DisassemblyResult.cs
diff --git a/Disarm/Disarm.csproj b/Disarm/Disarm.csproj
@@ -11,6 +11,7 @@
         <ImplicitUsings>enable</ImplicitUsings>
         <LangVersion>10</LangVersion>
         <Nullable>enable</Nullable>
+        <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
         <PackageId>Disarm</PackageId>
         <PackageLicenseExpression>MIT</PackageLicenseExpression>
         <PackageProjectUrl>https://github.com/SamboyCoding/Disarm</PackageProjectUrl>
@@ -31,7 +32,7 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="IndexRange" Version="1.0.2" Condition="'$(TargetFramework)' == 'netstandard2.0'" />
+        <PackageReference Include="PolySharp" Version="1.13.1" Condition="'$(TargetFramework)' == 'netstandard2.0'" />
         <PackageReference Include="System.Memory" Version="4.5.5" Condition="'$(TargetFramework)' == 'netstandard2.0'" />
         <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
     </ItemGroup>