From a8c270778a344eb2d9e96507c47844225d3a39bb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?John=20K=C3=A4ll=C3=A9n?= <johnkal@gmail.com>
Date: Thu, 3 Aug 2023 15:01:21 +0200
Subject: [PATCH] Maintenance: code cleanup

---
 src/Arch/Sanyo/LC8670Disassembler.cs           | 2 +-
 src/Core/IRFormat/IRFormatLexer.cs             | 3 ---
 src/Core/Machine/MachineInstructionRenderer.cs | 4 ----
 subjects/regression.log                        | 6 +++---
 4 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/src/Arch/Sanyo/LC8670Disassembler.cs b/src/Arch/Sanyo/LC8670Disassembler.cs
index 64ed5f1369..47570d3f7a 100644
--- a/src/Arch/Sanyo/LC8670Disassembler.cs
+++ b/src/Arch/Sanyo/LC8670Disassembler.cs
@@ -61,7 +61,7 @@ public LC8670Disassembler(LC8670Architecture arch, EndianImageReader rdr)
         public override LC8670Instruction NotYetImplemented(string message)
         {
             var testSvc = arch.Services.GetService<ITestGenerationService>();
-            testSvc?.ReportMissingDecoder("LC86104Dis", Address.Ptr16(0x0100), rdr, message);
+            testSvc?.ReportMissingDecoder("LC86104Dis", this.addr, rdr, message);
             return CreateInvalidInstruction();
         }
 
diff --git a/src/Core/IRFormat/IRFormatLexer.cs b/src/Core/IRFormat/IRFormatLexer.cs
index 15e48065e7..952f3eb96f 100644
--- a/src/Core/IRFormat/IRFormatLexer.cs
+++ b/src/Core/IRFormat/IRFormatLexer.cs
@@ -19,11 +19,8 @@
 #endregion
 
 using System;
-using System.Collections.Generic;
 using System.IO;
-using System.Linq;
 using System.Text;
-using System.Threading.Tasks;
 
 namespace Reko.Core.IRFormat
 {
diff --git a/src/Core/Machine/MachineInstructionRenderer.cs b/src/Core/Machine/MachineInstructionRenderer.cs
index 4b59d5897c..94f045f68c 100644
--- a/src/Core/Machine/MachineInstructionRenderer.cs
+++ b/src/Core/Machine/MachineInstructionRenderer.cs
@@ -18,13 +18,9 @@
  */
 #endregion
 
-using Reko.Core.Expressions;
 using Reko.Core.NativeInterface;
 using System;
-using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
-using System.Linq;
-using System.Runtime.InteropServices;
 using System.Text;
 
 namespace Reko.Core.Machine
diff --git a/subjects/regression.log b/subjects/regression.log
index 17ec9fce02..35c81cf471 100644
--- a/subjects/regression.log
+++ b/subjects/regression.log
@@ -1129,8 +1129,8 @@ Signature of 'Microsoft Visual C++ 8' detected.
 0000F19C: warning: Unable to determine the upper bound of an indirect call or jump; there may be more than 2 entries.
 fn00008FF2: error: An error occurred while rewriting procedure to high-level language.
     Can't collapse fn00008FF2_entry (Tail) => l00008FF0_thunk_fn00008FF2) in procedure fn00008FF2
-       at Reko.Structure.StructureAnalysis.CollapseToTailRegion(Region from, Region to, AbsynStatement stm) in d:\dev\uxmal\reko\master\src\Decompiler\Structure\StructureAnalysis.cs:line 980
-   at Reko.Structure.StructureAnalysis.VirtualizeEdge(VirtualEdge vEdge) in d:\dev\uxmal\reko\master\src\Decompiler\Structure\StructureAnalysis.cs:line 930
+       at Reko.Structure.StructureAnalysis.CollapseToTailRegion(Region from, Region to, AbsynStatement stm) in d:\dev\uxmal\reko\master\src\Decompiler\Structure\StructureAnalysis.cs:line 958
+   at Reko.Structure.StructureAnalysis.VirtualizeEdge(VirtualEdge vEdge) in d:\dev\uxmal\reko\master\src\Decompiler\Structure\StructureAnalysis.cs:line 904
    at Reko.Structure.StructureAnalysis.VirtualizeReturn(Region n) in d:\dev\uxmal\reko\master\src\Decompiler\Structure\StructureAnalysis.cs:line 310
    at Reko.Structure.StructureAnalysis.ProcessUnresolvedRegions() in d:\dev\uxmal\reko\master\src\Decompiler\Structure\StructureAnalysis.cs:line 283
    at Reko.Structure.StructureAnalysis.Execute() in d:\dev\uxmal\reko\master\src\Decompiler\Structure\StructureAnalysis.cs:line 170
@@ -2521,4 +2521,4 @@ varargs_test.exe: warning: Win32 X86-64 main procedure finder not implemented ye
 === PE\x86\VCExeSample\VCExeSample
 Signature of 'Microsoft Visual C++ 8' detected.
 
-Decompiled 90 binaries in 73.09 seconds.
+Decompiled 90 binaries in 65.77 seconds.