Update to latest verific

[yosys.git] / kernel / register.cc

diff --git a/kernel/register.cc b/kernel/register.cc
index 925d0d77615262ab7b32ac7c77920747b52a470d..226963fdaa7c93c4e560ac9853f8feb2034f75e9 100644 (file)
--- a/kernel/register.cc
+++ b/kernel/register.cc
@@ -1,7 +1,7 @@
 /*
  *  yosys -- Yosys Open SYnthesis Suite
  *
- *  Copyright (C) 2012  Clifford Wolf <clifford@clifford.at>
+ *  Copyright (C) 2012  Claire Xenia Wolf <claire@yosyshq.com>
  *
  *  Permission to use, copy, modify, and/or distribute this software for any
  *  purpose with or without fee is hereby granted, provided that the above
@@ -238,6 +238,7 @@ void Pass::call(RTLIL::Design *design, std::string command)
                return;
 
        if (tok[0] == '!') {
+#if !defined(YOSYS_DISABLE_SPAWN)
                cmd_buf = command.substr(command.find('!') + 1);
                while (!cmd_buf.empty() && (cmd_buf.back() == ' ' || cmd_buf.back() == '\t' ||
                                cmd_buf.back() == '\r' || cmd_buf.back() == '\n'))
@@ -247,6 +248,9 @@ void Pass::call(RTLIL::Design *design, std::string command)
                if (retCode != 0)
                        log_cmd_error("Shell command returned error code %d.\n", retCode);
                return;
+#else
+               log_cmd_error("Shell is not available.\n");
+#endif
        }
 
        while (!tok.empty()) {
@@ -749,7 +753,7 @@ static struct CellHelpMessages {
 
 struct HelpPass : public Pass {
        HelpPass() : Pass("help", "display help messages") { }
-       void help() YS_OVERRIDE
+       void help() override
        {
                log("\n");
                log("    help  ................  list all commands\n");
@@ -818,7 +822,7 @@ struct HelpPass : public Pass {
 
                fclose(f);
        }
-       void execute(std::vector<std::string> args, RTLIL::Design*) YS_OVERRIDE
+       void execute(std::vector<std::string> args, RTLIL::Design*) override
        {
                if (args.size() == 1) {
                        log("\n");
@@ -922,7 +926,7 @@ struct HelpPass : public Pass {
 
 struct EchoPass : public Pass {
        EchoPass() : Pass("echo", "turning echoing back of commands on and off") { }
-       void help() YS_OVERRIDE
+       void help() override
        {
                log("\n");
                log("    echo on\n");
@@ -935,7 +939,7 @@ struct EchoPass : public Pass {
                log("Do not print all commands to log before executing them. (default)\n");
                log("\n");
        }
-       void execute(std::vector<std::string> args, RTLIL::Design*) YS_OVERRIDE
+       void execute(std::vector<std::string> args, RTLIL::Design*) override
        {
                if (args.size() > 2)
                        cmd_error(args, 2, "Unexpected argument.");
@@ -960,7 +964,7 @@ struct MinisatSatSolver : public SatSolver {
        MinisatSatSolver() : SatSolver("minisat") {
                yosys_satsolver = this;
        }
-       ezSAT *create() YS_OVERRIDE {
+       ezSAT *create() override {
                return new ezMiniSAT();
        }
 } MinisatSatSolver;