From c133d00e2e4f8837ff158232bffd0e7e0500400f Mon Sep 17 00:00:00 2001
From: YRabbit <rabbit@yrabbit.cyou>
Date: Thu, 23 Oct 2025 15:58:01 +1000
Subject: [PATCH] Gowin. Take the arch arguments directly. (#1592)

Since ctx->getArchArgs() no longer returns architecture-specific
arguments, we read the args field directly.

Signed-off-by: YRabbit <rabbit@yrabbit.cyou>
---
 himbaechel/uarch/gowin/gowin.cc | 2 +-
 himbaechel/uarch/gowin/pack.cc  | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/himbaechel/uarch/gowin/gowin.cc b/himbaechel/uarch/gowin/gowin.cc
index 2e21759d..b4615a05 100644
--- a/himbaechel/uarch/gowin/gowin.cc
+++ b/himbaechel/uarch/gowin/gowin.cc
@@ -179,7 +179,7 @@ void GowinImpl::init(Context *ctx)
 
     gwu.init(ctx);
 
-    const ArchArgs &args = ctx->getArchArgs();
+    const ArchArgs &args = ctx->args;
 
     // package and speed class
     std::regex speedre = std::regex("(.*)(C[0-9]/I[0-9])$");
diff --git a/himbaechel/uarch/gowin/pack.cc b/himbaechel/uarch/gowin/pack.cc
index d0e5810a..ed3433ec 100644
--- a/himbaechel/uarch/gowin/pack.cc
+++ b/himbaechel/uarch/gowin/pack.cc
@@ -2696,7 +2696,7 @@ struct GowinPacker
                 divide_sdp(ci, new_cells);
             } else {
                 log_error("The fix for SDP when ports A and B have different bit widths has not yet been implemented. "
-                          "Cell'%s'\n",
+                          "Cell: '%s'\n",
                           ci->type.c_str(ctx));
             }
         }
@@ -3934,7 +3934,7 @@ struct GowinPacker
             pincfg_cell->connectPort(port, ctx->nets.at(ctx->id("$PACKER_VCC")).get());
         }
 
-        const ArchArgs &args = ctx->getArchArgs();
+        const ArchArgs &args = ctx->args;
 
         pincfg_cell->addInput(id_SSPI);
         if (args.options.count("sspi_as_gpio")) {