Fix: build break.

uxmal · Mar 31, 2023 · 603817e · 603817e
1 parent 59349b2
commit 603817e
Show file tree

Hide file tree

Showing 4 changed files with 254 additions and 249 deletions.
diff --git a/src/Arch/Microchip/Common/PICArchitecture.cs b/src/Arch/Microchip/Common/PICArchitecture.cs
@@ -60,7 +60,6 @@ public PICArchitecture(IServiceProvider services, string archId, Dictionary<stri
             PointerType = PrimitiveType.Ptr32;
             WordWidth = PrimitiveType.Byte;
             this.Options = null!;
-            LoadUserOptions(options);
         }
 
         public PICArchitecture(IServiceProvider services, Dictionary<string, object> options)

diff --git a/src/Arch/Padauk/PadaukArchitecture.cs b/src/Arch/Padauk/PadaukArchitecture.cs
@@ -20,6 +20,7 @@
 
 using Reko.Core;
 using Reko.Core.Expressions;
+using Reko.Core.Hll.Pascal;
 using Reko.Core.Lib;
 using Reko.Core.Machine;
 using Reko.Core.Memory;
@@ -128,6 +129,11 @@ public override string GrfToString(RegisterStorage flagregister, string prefix,
             return s.ToString();
         }
 
+        public override void LoadUserOptions(Dictionary<string, object>? options)
+        {
+            this.Options = options ?? new Dictionary<string, object>(StringComparer.OrdinalIgnoreCase);
+        }
+
         public override Address MakeAddressFromConstant(Constant c, bool codeAlign)
         {
             return Address.Ptr16(c.ToUInt16());

diff --git a/src/Drivers/CmdLine/CmdLineDriver.cs b/src/Drivers/CmdLine/CmdLineDriver.cs
@@ -318,19 +318,19 @@ private void DecompileRawImage(Dictionary<string, object> pArgs)
         {
             try
             {
+                var arch = config.GetArchitecture((string) pArgs["--arch"]);
+                if (arch is null)
+                    throw new ApplicationException(string.Format("Unknown architecture {0}", pArgs["--arch"]));
                 Dictionary<string, object> archOptions;
                 if (pArgs.TryGetValue("--arch-options", out var oArchOptions))
                 {
                     archOptions = (Dictionary<string, object>) oArchOptions;
+                    arch.LoadUserOptions(archOptions);
                 }
                 else
                 {
-                    archOptions = new Dictionary<string, object>(StringComparer.OrdinalIgnoreCase);
+                    archOptions = new Dictionary<string,object>(StringComparer.OrdinalIgnoreCase);
                 }
-                var arch = config.GetArchitecture((string) pArgs["--arch"], archOptions);
-                if (arch is null)
-                    throw new ApplicationException(string.Format("Unknown architecture {0}", pArgs["--arch"]));
-
                 pArgs.TryGetValue("--env", out object sEnv);
 
                 if (!pArgs.TryGetValue("--base", out var oAddrBase))