Fix: more struggles with broken build

Author: uxmal

src/Core/Configuration/PlatformDefinition.cs

@@ -115,7 +115,7 @@ public virtual IPlatform Load(IServiceProvider services, IProcessorArchitecture
             var type = svc.GetType(TypeName);
             if (type is null)
                 throw new TypeLoadException(
-                    string.Format("Unable to load {0} environment.", Description));
+                    $"Unable to load {Description} environment.");
             var platform = (Platform)Activator.CreateInstance(type, services, arch)!;
             LoadSettingsFromConfiguration(services, platform);
             return platform;

src/Environments/SysV/ArchSpecific/ArchSpecificFactory.cs

@@ -130,6 +130,7 @@ public ArchSpecificFactory(IServiceProvider services, IProcessorArchitecture arc
                     var t = svc.GetType("Reko.Arch.X86.X86CallingConvention,Reko.Arch.X86");
                     this.ccX86 = (ICallingConvention)Activator.CreateInstance(
                         t,
+                        arch,
                         4,      // stackAlignment,
                         4,      // pointerSize,
                         true,   // callerCleanup,

src/Native/ArmNative/Arm64Rewriter.h

@@ -45,8 +45,8 @@ class Arm64Rewriter : public ComBase, public INativeRewriter
 	STDMETHOD_(ULONG, AddRef)() override { return ComBase::AddRef(); }
 	STDMETHOD_(ULONG, Release)() override { return ComBase::Release(); }
 
-	STDMETHOD_(int32_t, Next)();
-	STDMETHOD_(int32_t, GetCount)();
+	STDMETHOD_(int32_t, Next)() override;
+	STDMETHOD_(int32_t, GetCount)() override;
 
 private:
 	void AddConditional(void(*mkInstr)());

src/Native/ArmNative/ThumbArchitecture.h

@@ -21,9 +21,9 @@ class ThumbArchitecture : public ComBase, public INativeArchitecture
 public:
 	ThumbArchitecture();
 
-	virtual STDMETHODIMP QueryInterface(REFIID riid, void ** ppvObject);
-	virtual STDMETHODIMP_(ULONG) AddRef(void) override { return ComBase::AddRef(); }
-	virtual STDMETHODIMP_(ULONG) Release(void) override { return ComBase::Release(); }
+	STDMETHODIMP QueryInterface(REFIID riid, void ** ppvObject) override;
+	STDMETHODIMP_(ULONG) AddRef(void) override { return ComBase::AddRef(); }
+	STDMETHODIMP_(ULONG) Release(void) override { return ComBase::Release(); }
 
 	STDMETHODIMP GetAllRegisters(int category, int * pcRegs, void * * ppRegs) override;
 	STDMETHODIMP_(INativeDisassembler *) CreateDisassembler(void * bytes, int length, int offset, uint64_t uAddr) override;

src/UnitTests/Arch/X86/Disassembler/V20DisassemblerTests.cs

@@ -111,7 +111,7 @@ public void V20Dis_repnc_for_cmps_scas()
         public void V20Dis_rep_kept_for_non_compare_string_instructions()
         {
             var repMovs = Disassemble(v20Arch, LoadAddress, "F3 A4");
-            Assert.AreEqual("rep movsb", repMovs.ToString());
+            Assert.AreEqual("rep movbk", repMovs.ToString());
         }
 
         // V20 bit-manipulation instructions (0F prefix)

src/tools/c2xml/Program.cs

@@ -113,8 +113,13 @@ public int DoExecute(string [] args)
             catch (Exception ex)
             {
                 Console.WriteLine(
-                    $"c2xml: an error occurred when loading platform {envElem.Name} ({envElem.TypeName}). {ex.Message}");
+                    $"c2xml: an error occurred when loading platform {envElem.Name} ({envElem.TypeName}).");
+                for (Exception e = ex; e is not null; e = e.InnerException)
+                {
+                    Console.WriteLine($" {e.Message}");
+                }
                 Console.WriteLine(ex.StackTrace);
+                Console.WriteLine("Constructor(s):");
                 return 1;
             }