Cleanup Context API (#1593)

* Cleanup Context API

* Remove exit to prvent crash

common/kernel/context.h

@@ -39,15 +39,7 @@ struct Context : Arch, DeterministicRNG
     // True when detailed per-net timing is to be stored / reported
     bool detailed_timing_report = false;
 
-    ArchArgs arch_args;
-
-    Context(ArchArgs args) : Arch(args)
-    {
-        BaseCtx::as_ctx = this;
-        arch_args = args;
-    }
-
-    ArchArgs getArchArgs() { return arch_args; }
+    Context(ArchArgs args) : Arch(args) { BaseCtx::as_ctx = this; }
 
     // --------------------------------------------------------------
 

common/kernel/embed.cc

@@ -3,8 +3,8 @@
 #define NOMINMAX
 #include <windows.h>
 #endif
-#include <filesystem>
 #include <boost/iostreams/device/mapped_file.hpp>
+#include <filesystem>
 #include "embed.h"
 #include "nextpnr.h"
 

gui/basewindow.cc

@@ -368,7 +368,7 @@ void BaseMainWindow::open_json()
     if (!fileName.isEmpty()) {
         disableActions();
         if (ctx->settings.find(ctx->id("synth")) == ctx->settings.end()) {
-            ArchArgs chipArgs = ctx->getArchArgs();
+            ArchArgs chipArgs = ctx->args;
             ctx = std::unique_ptr<Context>(new Context(chipArgs));
             Q_EMIT contextChanged(ctx.get());
         }

gui/himbaechel/mainwindow.cc

@@ -20,7 +20,6 @@
 #include "mainwindow.h"
 
 #include <QMessageBox>
-#include <cstdlib>
 
 static void initMainResource() { Q_INIT_RESOURCE(nextpnr); }
 
@@ -46,7 +45,6 @@ void MainWindow::new_proj()
 {
     QMessageBox::critical(0, "Error",
                           "Creating a new project not supported in himbächel mode, please re-start from command line.");
-    std::exit(1);
 }
 
 NEXTPNR_NAMESPACE_END

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])$");

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")) {