Merge branch 'koriakin/xc7nocarrymux' into xaig

[yosys.git] / kernel / driver.cc

diff --git a/kernel/driver.cc b/kernel/driver.cc
index a0bb7e60a13fa14f10225e207c399ad2178d0658..f273057dd765d4872efcfa3f38a4be92a93fceca 100644 (file)
--- a/kernel/driver.cc
+++ b/kernel/driver.cc
@@ -110,6 +110,10 @@ int main(int argc, char **argv)
        log_error_stderr = true;
        yosys_banner();
        yosys_setup();
+#ifdef WITH_PYTHON
+       PyRun_SimpleString(("sys.path.append(\""+proc_self_dirname()+"\")").c_str());
+       PyRun_SimpleString(("sys.path.append(\""+proc_share_dirname()+"plugins\")").c_str());
+#endif
 
        if (argc == 2)
        {
@@ -291,6 +295,9 @@ int main(int argc, char **argv)
                printf("    -E <depsfile>\n");
                printf("        write a Makefile dependencies file with in- and output file names\n");
                printf("\n");
+               printf("    -g\n");
+               printf("        globally enable debug log messages\n");
+               printf("\n");
                printf("    -V\n");
                printf("        print version information and exit\n");
                printf("\n");
@@ -311,7 +318,7 @@ int main(int argc, char **argv)
        }
 
        int opt;
-       while ((opt = getopt(argc, argv, "MXAQTVSm:f:Hh:b:o:p:l:L:qv:tds:c:W:w:e:D:P:E:")) != -1)
+       while ((opt = getopt(argc, argv, "MXAQTVSgm:f:Hh:b:o:p:l:L:qv:tds:c:W:w:e:D:P:E:")) != -1)
        {
                switch (opt)
                {
@@ -336,6 +343,9 @@ int main(int argc, char **argv)
                case 'S':
                        passes_commands.push_back("synth");
                        break;
+               case 'g':
+                       log_force_debug++;
+                       break;
                case 'm':
                        plugin_filenames.push_back(optarg);
                        break;
@@ -469,6 +479,10 @@ int main(int argc, char **argv)
 #endif
 
        yosys_setup();
+#ifdef WITH_PYTHON
+       PyRun_SimpleString(("sys.path.append(\""+proc_self_dirname()+"\")").c_str());
+       PyRun_SimpleString(("sys.path.append(\""+proc_share_dirname()+"plugins\")").c_str());
+#endif
        log_error_atexit = yosys_atexit;
 
        for (auto &fn : plugin_filenames)
@@ -515,13 +529,13 @@ int main(int argc, char **argv)
                        log_error("Can't open dependencies file for writing: %s\n", strerror(errno));
                bool first = true;
                for (auto fn : yosys_output_files) {
-                       fprintf(f, "%s%s", first ? "" : " ", fn.c_str());
+                       fprintf(f, "%s%s", first ? "" : " ", escape_filename_spaces(fn).c_str());
                        first = false;
                }
                fprintf(f, ":");
                for (auto fn : yosys_input_files) {
                        if (yosys_output_files.count(fn) == 0)
-                               fprintf(f, " %s", fn.c_str());
+                               fprintf(f, " %s", escape_filename_spaces(fn).c_str());
                }
                fprintf(f, "\n");
        }