Update to latest Iced (#1502)

* Update BenchmarkDotNet.Disassembler.x64.csproj * Update BenchmarkDotNet.Disassembler.x86.csproj * Update BenchmarkDotNet.csproj * Replace obsoletes
dotnet · Jul 18, 2020 · b356ac8 · b356ac8
1 parent 13ee8be
commit b356ac8
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 15 deletions.
diff --git a/src/BenchmarkDotNet.Disassembler.x64/BenchmarkDotNet.Disassembler.x64.csproj b/src/BenchmarkDotNet.Disassembler.x64/BenchmarkDotNet.Disassembler.x64.csproj
@@ -14,7 +14,7 @@
     <RootNamespace>BenchmarkDotNet.Disassembler</RootNamespace>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Iced" Version="1.7.0" />
+    <PackageReference Include="Iced" Version="1.8.0" />
     <PackageReference Include="Microsoft.Diagnostics.Runtime" Version="1.1.126102" />
   </ItemGroup>
 </Project>
diff --git a/src/BenchmarkDotNet.Disassembler.x86/BenchmarkDotNet.Disassembler.x86.csproj b/src/BenchmarkDotNet.Disassembler.x86/BenchmarkDotNet.Disassembler.x86.csproj
@@ -20,7 +20,7 @@
     <Compile Include="..\BenchmarkDotNet.Disassembler.x64\Program.cs" Link="Program.cs" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Iced" Version="1.7.0" />
+    <PackageReference Include="Iced" Version="1.8.0" />
     <PackageReference Include="Microsoft.Diagnostics.Runtime" Version="1.1.126102" />
   </ItemGroup>
 </Project>
diff --git a/src/BenchmarkDotNet/BenchmarkDotNet.csproj b/src/BenchmarkDotNet/BenchmarkDotNet.csproj
@@ -15,7 +15,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="CommandLineParser" Version="2.4.3" />
-    <PackageReference Include="Iced" Version="1.4.0" />
+    <PackageReference Include="Iced" Version="1.8.0" />
     <PackageReference Include="Microsoft.Diagnostics.Runtime" Version="1.1.126102" />
     <PackageReference Include="Microsoft.DotNet.PlatformAbstractions" Version="2.1.0" />
     <PackageReference Include="Microsoft.Win32.Registry" Version="4.5.0" />

diff --git a/src/BenchmarkDotNet/Disassemblers/DisassemblyDiagnoser.cs b/src/BenchmarkDotNet/Disassemblers/DisassemblyDiagnoser.cs
@@ -156,7 +156,7 @@ private static IEnumerable<IExporter> GetExporters(Dictionary<BenchmarkCase, Dis
         }
 
         private static long SumNativeCodeSize(DisassemblyResult disassembly)
-            => disassembly.Methods.Sum(method => method.Maps.Sum(map => map.SourceCodes.OfType<Asm>().Sum(asm => asm.Instruction.ByteLength)));
+            => disassembly.Methods.Sum(method => method.Maps.Sum(map => map.SourceCodes.OfType<Asm>().Sum(asm => asm.Instruction.Length)));
 
         private class NativeCodeSizeMetricDescriptor : IMetricDescriptor
         {

diff --git a/src/BenchmarkDotNet/Disassemblers/DisassemblyDiagnoserConfig.cs b/src/BenchmarkDotNet/Disassemblers/DisassemblyDiagnoserConfig.cs
@@ -65,13 +65,13 @@ internal Formatter GetFormatterWithSymbolSolver(IReadOnlyDictionary<ulong, strin
             switch (Formatter)
             {
                 case MasmFormatter masmFormatter:
-                    return new MasmFormatter(masmFormatter.MasmOptions, symbolSolver);
+                    return new MasmFormatter(masmFormatter.Options, symbolSolver);
                 case NasmFormatter nasmFormatter:
-                    return new NasmFormatter(nasmFormatter.NasmOptions, symbolSolver);
+                    return new NasmFormatter(nasmFormatter.Options, symbolSolver);
                 case GasFormatter gasFormatter:
-                    return new GasFormatter(gasFormatter.GasOptions, symbolSolver);
+                    return new GasFormatter(gasFormatter.Options, symbolSolver);
                 case IntelFormatter intelFormatter:
-                    return new IntelFormatter(intelFormatter.IntelOptions, symbolSolver);
+                    return new IntelFormatter(intelFormatter.Options, symbolSolver);
                 default:
                     // we don't know how to translate it so we just return the original one
                     // it's better not to solve symbols rather than throw exception ;)

diff --git a/src/BenchmarkDotNet/Disassemblers/Exporters/GithubMarkdownDisassemblyExporter.cs b/src/BenchmarkDotNet/Disassemblers/Exporters/GithubMarkdownDisassemblyExporter.cs
@@ -61,7 +61,7 @@ internal static void Export(ILogger logger, DisassemblyResult disassemblyResult,
                     {
                         checked
                         {
-                            totalSizeInBytes += (uint)asm.Instruction.ByteLength;
+                            totalSizeInBytes += (uint)asm.Instruction.Length;
                         }
 
                         logger.WriteLine($"       {element.TextRepresentation}");

diff --git a/src/BenchmarkDotNet/Disassemblers/InstructionFormatter.cs b/src/BenchmarkDotNet/Disassemblers/InstructionFormatter.cs
@@ -25,7 +25,7 @@ internal static class InstructionFormatter
     {
         internal static string Format(Instruction instruction, Formatter formatter, bool printInstructionAddresses, uint pointerSize)
         {
-            var output = new StringBuilderFormatterOutput();
+            var output = new StringOutput();
 
             if (printInstructionAddresses)
             {
@@ -37,14 +37,14 @@ internal static string Format(Instruction instruction, Formatter formatter, bool
             return output.ToString();
         }
 
-        private static void FormatInstructionPointer(Instruction instruction, Formatter formatter, uint pointerSize, StringBuilderFormatterOutput output)
+        private static void FormatInstructionPointer(Instruction instruction, Formatter formatter, uint pointerSize, StringOutput output)
         {
             string ipFormat = formatter.Options.LeadingZeroes
                 ? pointerSize == 4 ? "X8" : "X16"
                 : "X";
 
-            output.Write(instruction.IP.ToString(ipFormat), FormatterOutputTextKind.Text);
-            output.Write(" ", FormatterOutputTextKind.Text);
+            output.Write(instruction.IP.ToString(ipFormat), FormatterTextKind.Text);
+            output.Write(" ", FormatterTextKind.Text);
         }
     }
 }
diff --git a/src/BenchmarkDotNet/Exporters/InstructionPointerExporter.cs b/src/BenchmarkDotNet/Exporters/InstructionPointerExporter.cs
@@ -74,7 +74,7 @@ private string Export(Summary summary, BenchmarkCase benchmarkCase, DisassemblyR
             IEnumerable<ulong> Range(Asm asm)
             {
                 // most probably asm.StartAddress would be enough, but I don't want to miss any edge case
-                for (ulong instructionPointer = asm.InstructionPointer; instructionPointer < asm.InstructionPointer + (ulong)asm.Instruction.ByteLength; instructionPointer++)
+                for (ulong instructionPointer = asm.InstructionPointer; instructionPointer < asm.InstructionPointer + (ulong)asm.Instruction.Length; instructionPointer++)
                     yield return instructionPointer;
             }
 
@@ -124,7 +124,7 @@ private static IReadOnlyList<MethodWithCounters> SumHardwareCountersPerMethod(Di
                             foreach (var hardwareCounter in pmcStats.Counters)
                             {
                                 // most probably asm.StartAddress would be enough, but I don't want to miss any edge case
-                                for (ulong instructionPointer = asm.InstructionPointer; instructionPointer < asm.InstructionPointer + (ulong)asm.Instruction.ByteLength; instructionPointer++)
+                                for (ulong instructionPointer = asm.InstructionPointer; instructionPointer < asm.InstructionPointer + (ulong)asm.Instruction.Length; instructionPointer++)
                                     if (hardwareCounter.Value.PerInstructionPointer.TryGetValue(instructionPointer, out ulong value))
                                         totalsPerCounter[hardwareCounter.Key] = totalsPerCounter[hardwareCounter.Key] + value;
                             }
-Original file line number
+Diff line change
@@ Expand Up @@
                         {
                             checked
                             {
-                                totalSizeInBytes += (uint)asm.Instruction.ByteLength;
+                                totalSizeInBytes += (uint)asm.Instruction.Length;
                             }
                             logger.WriteLine($"       {element.TextRepresentation}");
@@ Expand Down @@