Revert "Merge remote-tracking branch 'origin/eddie/shregmap_improve' into xc7mux"
[yosys.git] / kernel / yosys.cc
index a40ad4372fb4ad5b300c64bb3839b551f2ede86b..377572fc2984243a2ede59d2e35af34a7fa27b8d 100644 (file)
@@ -2,11 +2,11 @@
  *  yosys -- Yosys Open SYnthesis Suite
  *
  *  Copyright (C) 2012  Clifford Wolf <clifford@clifford.at>
- *  
+ *
  *  Permission to use, copy, modify, and/or distribute this software for any
  *  purpose with or without fee is hereby granted, provided that the above
  *  copyright notice and this permission notice appear in all copies.
- *  
+ *
  *  THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
  *  WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
  *  MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
  */
 
 #include "kernel/yosys.h"
+#include "kernel/celltypes.h"
 
 #ifdef YOSYS_ENABLE_READLINE
 #  include <readline/readline.h>
 #  include <readline/history.h>
 #endif
 
+#ifdef YOSYS_ENABLE_EDITLINE
+#  include <editline/readline.h>
+#endif
+
 #ifdef YOSYS_ENABLE_PLUGINS
 #  include <dlfcn.h>
 #endif
 
-#ifdef _WIN32
+#if defined(_WIN32)
 #  include <windows.h>
+#  include <io.h>
+#elif defined(__APPLE__)
+#  include <mach-o/dyld.h>
+#  include <unistd.h>
+#  include <dirent.h>
+#  include <sys/stat.h>
+#else
+#  include <unistd.h>
+#  include <dirent.h>
+#  include <sys/types.h>
+#  include <sys/wait.h>
+#  include <sys/stat.h>
+#endif
+
+#if !defined(_WIN32) && defined(YOSYS_ENABLE_GLOB)
+#  include <glob.h>
+#endif
+
+#ifdef __FreeBSD__
+#  include <sys/sysctl.h>
+#endif
+
+#ifdef WITH_PYTHON
+#if PY_MAJOR_VERSION >= 3
+#   define INIT_MODULE PyInit_libyosys
+    extern "C" PyObject* INIT_MODULE();
+#else
+#   define INIT_MODULE initlibyosys
+       extern "C" void INIT_MODULE();
+#endif
 #endif
 
-#include <unistd.h>
 #include <limits.h>
 #include <errno.h>
 
 YOSYS_NAMESPACE_BEGIN
 
 int autoidx = 1;
+int yosys_xtrace = 0;
 RTLIL::Design *yosys_design = NULL;
+CellTypes yosys_celltypes;
 
 #ifdef YOSYS_ENABLE_TCL
 Tcl_Interp *yosys_tcl_interp = NULL;
 #endif
 
+std::set<std::string> yosys_input_files, yosys_output_files;
+
+bool memhasher_active = false;
+uint32_t memhasher_rng = 123456;
+std::vector<void*> memhasher_store;
+
+void memhasher_on()
+{
+#if defined(__linux__) || defined(__FreeBSD__)
+       memhasher_rng += time(NULL) << 16 ^ getpid();
+#endif
+       memhasher_store.resize(0x10000);
+       memhasher_active = true;
+}
+
+void memhasher_off()
+{
+       for (auto p : memhasher_store)
+               if (p) free(p);
+       memhasher_store.clear();
+       memhasher_active = false;
+}
+
+void memhasher_do()
+{
+       memhasher_rng ^= memhasher_rng << 13;
+       memhasher_rng ^= memhasher_rng >> 17;
+       memhasher_rng ^= memhasher_rng << 5;
+
+       int size, index = (memhasher_rng >> 4) & 0xffff;
+       switch (memhasher_rng & 7) {
+               case 0: size =   16; break;
+               case 1: size =  256; break;
+               case 2: size = 1024; break;
+               case 3: size = 4096; break;
+               default: size = 0;
+       }
+       if (index < 16) size *= 16;
+       memhasher_store[index] = realloc(memhasher_store[index], size);
+}
+
+void yosys_banner()
+{
+       log("\n");
+       log(" /----------------------------------------------------------------------------\\\n");
+       log(" |                                                                            |\n");
+       log(" |  yosys -- Yosys Open SYnthesis Suite                                       |\n");
+       log(" |                                                                            |\n");
+       log(" |  Copyright (C) 2012 - 2018  Clifford Wolf <clifford@clifford.at>           |\n");
+       log(" |                                                                            |\n");
+       log(" |  Permission to use, copy, modify, and/or distribute this software for any  |\n");
+       log(" |  purpose with or without fee is hereby granted, provided that the above    |\n");
+       log(" |  copyright notice and this permission notice appear in all copies.         |\n");
+       log(" |                                                                            |\n");
+       log(" |  THE SOFTWARE IS PROVIDED \"AS IS\" AND THE AUTHOR DISCLAIMS ALL WARRANTIES  |\n");
+       log(" |  WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF          |\n");
+       log(" |  MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR   |\n");
+       log(" |  ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES    |\n");
+       log(" |  WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN     |\n");
+       log(" |  ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF   |\n");
+       log(" |  OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.            |\n");
+       log(" |                                                                            |\n");
+       log(" \\----------------------------------------------------------------------------/\n");
+       log("\n");
+       log(" %s\n", yosys_version_str);
+       log("\n");
+}
+
+int ceil_log2(int x)
+{
+#if defined(__GNUC__)
+        return x > 1 ? (8*sizeof(int)) - __builtin_clz(x-1) : 0;
+#else
+       if (x <= 0)
+               return 0;
+       for (int i = 0; i < 32; i++)
+               if (((x-1) >> i) == 0)
+                       return i;
+       log_abort();
+#endif
+}
+
 std::string stringf(const char *fmt, ...)
 {
        std::string string;
@@ -62,7 +180,7 @@ std::string vstringf(const char *fmt, va_list ap)
        std::string string;
        char *str = NULL;
 
-#ifdef _WIN32
+#if defined(_WIN32 )|| defined(__CYGWIN__)
        int sz = 64, rc;
        while (1) {
                va_list apc;
@@ -87,13 +205,45 @@ std::string vstringf(const char *fmt, va_list ap)
        return string;
 }
 
-std::string next_token(std::string &text, const char *sep)
+int readsome(std::istream &f, char *s, int n)
+{
+       int rc = int(f.readsome(s, n));
+
+       // f.readsome() sometimes returns 0 on a non-empty stream..
+       if (rc == 0) {
+               int c = f.get();
+               if (c != EOF) {
+                       *s = c;
+                       rc = 1;
+               }
+       }
+
+       return rc;
+}
+
+std::string next_token(std::string &text, const char *sep, bool long_strings)
 {
        size_t pos_begin = text.find_first_not_of(sep);
 
        if (pos_begin == std::string::npos)
                pos_begin = text.size();
 
+       if (long_strings && pos_begin != text.size() && text[pos_begin] == '"') {
+               string sep_string = sep;
+               for (size_t i = pos_begin+1; i < text.size(); i++) {
+                       if (text[i] == '"' && (i+1 == text.size() || sep_string.find(text[i+1]) != std::string::npos)) {
+                               std::string token = text.substr(pos_begin, i-pos_begin+1);
+                               text = text.substr(i+1);
+                               return token;
+                       }
+                       if (i+1 < text.size() && text[i] == '"' && text[i+1] == ';' && (i+2 == text.size() || sep_string.find(text[i+2]) != std::string::npos)) {
+                               std::string token = text.substr(pos_begin, i-pos_begin+1);
+                               text = text.substr(i+2);
+                               return token + ";";
+                       }
+               }
+       }
+
        size_t pos_end = text.find_first_of(sep, pos_begin);
 
        if (pos_end == std::string::npos)
@@ -104,6 +254,26 @@ std::string next_token(std::string &text, const char *sep)
        return token;
 }
 
+std::vector<std::string> split_tokens(const std::string &text, const char *sep)
+{
+       std::vector<std::string> tokens;
+       std::string current_token;
+       for (char c : text) {
+               if (strchr(sep, c)) {
+                       if (!current_token.empty()) {
+                               tokens.push_back(current_token);
+                               current_token.clear();
+                       }
+               } else
+                       current_token += c;
+       }
+       if (!current_token.empty()) {
+               tokens.push_back(current_token);
+               current_token.clear();
+       }
+       return tokens;
+}
+
 // this is very similar to fnmatch(). the exact rules used by this
 // function are:
 //
@@ -166,20 +336,166 @@ bool patmatch(const char *pattern, const char *string)
        return false;
 }
 
-int readsome(std::istream &f, char *s, int n)
+int run_command(const std::string &command, std::function<void(const std::string&)> process_line)
 {
-       int rc = f.readsome(s, n);
+       if (!process_line)
+               return system(command.c_str());
+
+       FILE *f = popen(command.c_str(), "r");
+       if (f == nullptr)
+               return -1;
+
+       std::string line;
+       char logbuf[128];
+       while (fgets(logbuf, 128, f) != NULL) {
+               line += logbuf;
+               if (!line.empty() && line.back() == '\n')
+                       process_line(line), line.clear();
+       }
+       if (!line.empty())
+               process_line(line);
 
-       // win32 sometimes returns 0 on a non-empty stream..
-       if (rc == 0) {
-               int c = f.get();
-               if (c != EOF) {
-                       *s = c;
-                       rc = 1;
+       int ret = pclose(f);
+       if (ret < 0)
+               return -1;
+#ifdef _WIN32
+       return ret;
+#else
+       return WEXITSTATUS(ret);
+#endif
+}
+
+std::string make_temp_file(std::string template_str)
+{
+#ifdef _WIN32
+       if (template_str.rfind("/tmp/", 0) == 0) {
+#  ifdef __MINGW32__
+               char longpath[MAX_PATH + 1];
+               char shortpath[MAX_PATH + 1];
+#  else
+               WCHAR longpath[MAX_PATH + 1];
+               TCHAR shortpath[MAX_PATH + 1];
+#  endif
+               if (!GetTempPath(MAX_PATH+1, longpath))
+                       log_error("GetTempPath() failed.\n");
+               if (!GetShortPathName(longpath, shortpath, MAX_PATH + 1))
+                       log_error("GetShortPathName() failed.\n");
+               std::string path;
+               for (int i = 0; shortpath[i]; i++)
+                       path += char(shortpath[i]);
+               template_str = stringf("%s\\%s", path.c_str(), template_str.c_str() + 5);
+       }
+
+       size_t pos = template_str.rfind("XXXXXX");
+       log_assert(pos != std::string::npos);
+
+       while (1) {
+               for (int i = 0; i < 6; i++) {
+                       static std::string y = "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ";
+                       static uint32_t x = 314159265 ^ uint32_t(time(NULL));
+                       x ^= x << 13, x ^= x >> 17, x ^= x << 5;
+                       template_str[pos+i] = y[x % y.size()];
                }
+               if (_access(template_str.c_str(), 0) != 0)
+                       break;
        }
+#else
+       size_t pos = template_str.rfind("XXXXXX");
+       log_assert(pos != std::string::npos);
 
-       return rc;
+       int suffixlen = GetSize(template_str) - pos - 6;
+
+       char *p = strdup(template_str.c_str());
+       close(mkstemps(p, suffixlen));
+       template_str = p;
+       free(p);
+#endif
+
+       return template_str;
+}
+
+std::string make_temp_dir(std::string template_str)
+{
+#ifdef _WIN32
+       template_str = make_temp_file(template_str);
+       mkdir(template_str.c_str());
+       return template_str;
+#else
+#  ifndef NDEBUG
+       size_t pos = template_str.rfind("XXXXXX");
+       log_assert(pos != std::string::npos);
+
+       int suffixlen = GetSize(template_str) - pos - 6;
+       log_assert(suffixlen == 0);
+#  endif
+
+       char *p = strdup(template_str.c_str());
+       p = mkdtemp(p);
+       log_assert(p != NULL);
+       template_str = p;
+       free(p);
+
+       return template_str;
+#endif
+}
+
+#ifdef _WIN32
+bool check_file_exists(std::string filename, bool)
+{
+       return _access(filename.c_str(), 0) == 0;
+}
+#else
+bool check_file_exists(std::string filename, bool is_exec)
+{
+       return access(filename.c_str(), is_exec ? X_OK : F_OK) == 0;
+}
+#endif
+
+bool is_absolute_path(std::string filename)
+{
+#ifdef _WIN32
+       return filename[0] == '/' || filename[0] == '\\' || (filename[0] != 0 && filename[1] == ':');
+#else
+       return filename[0] == '/';
+#endif
+}
+
+void remove_directory(std::string dirname)
+{
+#ifdef _WIN32
+       run_command(stringf("rmdir /s /q \"%s\"", dirname.c_str()));
+#else
+       struct stat stbuf;
+       struct dirent **namelist;
+       int n = scandir(dirname.c_str(), &namelist, nullptr, alphasort);
+       log_assert(n >= 0);
+       for (int i = 0; i < n; i++) {
+               if (strcmp(namelist[i]->d_name, ".") && strcmp(namelist[i]->d_name, "..")) {
+                       std::string buffer = stringf("%s/%s", dirname.c_str(), namelist[i]->d_name);
+                       if (!stat(buffer.c_str(), &stbuf) && S_ISREG(stbuf.st_mode)) {
+                               remove(buffer.c_str());
+                       } else
+                               remove_directory(buffer);
+               }
+               free(namelist[i]);
+       }
+       free(namelist);
+       rmdir(dirname.c_str());
+#endif
+}
+
+std::string escape_filename_spaces(const std::string& filename)
+{
+       std::string out;
+       out.reserve(filename.size());
+       for (auto c : filename)
+       {
+               if (c == ' ')
+                       out += "\\ ";
+               else
+                       out.push_back(c);
+       }
+       return out;
 }
 
 int GetSize(RTLIL::Wire *wire)
@@ -187,15 +503,42 @@ int GetSize(RTLIL::Wire *wire)
        return wire->width;
 }
 
+bool already_setup = false;
+
 void yosys_setup()
 {
+       if(already_setup)
+               return;
+       already_setup = true;
+       // if there are already IdString objects then we have a global initialization order bug
+       IdString empty_id;
+       log_assert(empty_id.index_ == 0);
+       IdString::get_reference(empty_id.index_);
+
+       #ifdef WITH_PYTHON
+               PyImport_AppendInittab((char*)"libyosys", INIT_MODULE);
+               Py_Initialize();
+               PyRun_SimpleString("import sys");
+       #endif
+
        Pass::init_register();
        yosys_design = new RTLIL::Design;
+       yosys_celltypes.setup();
        log_push();
 }
 
+bool yosys_already_setup()
+{
+       return already_setup;
+}
+
+bool already_shutdown = false;
+
 void yosys_shutdown()
 {
+       if(already_shutdown)
+               return;
+       already_shutdown = true;
        log_pop();
 
        delete yosys_design;
@@ -208,6 +551,7 @@ void yosys_shutdown()
        log_files.clear();
 
        Pass::done_register();
+       yosys_celltypes.clear();
 
 #ifdef YOSYS_ENABLE_TCL
        if (yosys_tcl_interp != NULL) {
@@ -220,19 +564,37 @@ void yosys_shutdown()
 #ifdef YOSYS_ENABLE_PLUGINS
        for (auto &it : loaded_plugins)
                dlclose(it.second);
-#endif
 
        loaded_plugins.clear();
+#ifdef WITH_PYTHON
+       loaded_python_plugins.clear();
+#endif
        loaded_plugin_aliases.clear();
+#endif
+
+#ifdef WITH_PYTHON
+       Py_Finalize();
+#endif
+
+       IdString empty_id;
+       IdString::put_reference(empty_id.index_);
 }
 
 RTLIL::IdString new_id(std::string file, int line, std::string func)
 {
-       std::string str = "$auto$";
+#ifdef _WIN32
+       size_t pos = file.find_last_of("/\\");
+#else
        size_t pos = file.find_last_of('/');
-       str += pos != std::string::npos ? file.substr(pos+1) : file;
-       str += stringf(":%d:%s$%d", line, func.c_str(), autoidx++);
-       return str;
+#endif
+       if (pos != std::string::npos)
+               file = file.substr(pos+1);
+
+       pos = func.find_last_of(':');
+       if (pos != std::string::npos)
+               func = func.substr(pos+1);
+
+       return stringf("$auto$%s:%d:%s$%d", file.c_str(), line, func.c_str(), autoidx++);
 }
 
 RTLIL::Design *yosys_get_design()
@@ -260,6 +622,37 @@ const char *create_prompt(RTLIL::Design *design, int recursion_counter)
        return buffer;
 }
 
+std::vector<std::string> glob_filename(const std::string &filename_pattern)
+{
+       std::vector<std::string> results;
+
+#if defined(_WIN32) || !defined(YOSYS_ENABLE_GLOB)
+       results.push_back(filename_pattern);
+#else
+       glob_t globbuf;
+
+       int err = glob(filename_pattern.c_str(), 0, NULL, &globbuf);
+
+       if(err == 0) {
+               for (size_t i = 0; i < globbuf.gl_pathc; i++)
+                       results.push_back(globbuf.gl_pathv[i]);
+               globfree(&globbuf);
+       } else {
+               results.push_back(filename_pattern);
+       }
+#endif
+
+       return results;
+}
+
+void rewrite_filename(std::string &filename)
+{
+       if (filename.substr(0, 1) == "\"" && filename.substr(GetSize(filename)-1) == "\"")
+               filename = filename.substr(1, GetSize(filename)-2);
+       if (filename.substr(0, 2) == "+/")
+               filename = proc_share_dirname() + filename.substr(2);
+}
+
 #ifdef YOSYS_ENABLE_TCL
 static int tcl_yosys_cmd(ClientData, Tcl_Interp *interp, int argc, const char *argv[])
 {
@@ -272,6 +665,8 @@ static int tcl_yosys_cmd(ClientData, Tcl_Interp *interp, int argc, const char *a
                        std::string tcl_command_name = it.first;
                        if (tcl_command_name == "proc")
                                tcl_command_name = "procs";
+                       else if (tcl_command_name == "rename")
+                               tcl_command_name = "renames";
                        Tcl_CmdInfo info;
                        if (Tcl_GetCommandInfo(interp, tcl_command_name.c_str(), &info) != 0) {
                                log("[TCL: yosys -import] Command name collision: found pre-existing command `%s' -> skip.\n", it.first.c_str());
@@ -303,31 +698,42 @@ extern Tcl_Interp *yosys_get_tcl_interp()
 
 struct TclPass : public Pass {
        TclPass() : Pass("tcl", "execute a TCL script file") { }
-       virtual void help() {
+       void help() YS_OVERRIDE {
+               //   |---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|
                log("\n");
-               log("    tcl <filename>\n");
+               log("    tcl <filename> [args]\n");
                log("\n");
                log("This command executes the tcl commands in the specified file.\n");
                log("Use 'yosys cmd' to run the yosys command 'cmd' from tcl.\n");
                log("\n");
                log("The tcl command 'yosys -import' can be used to import all yosys\n");
-               log("commands directly as tcl commands to the tcl shell. The yosys\n");
-               log("command 'proc' is wrapped using the tcl command 'procs' in order\n");
-               log("to avoid a name collision with the tcl builting command 'proc'.\n");
+               log("commands directly as tcl commands to the tcl shell. Yosys commands\n");
+               log("'proc' and 'rename' are wrapped to tcl commands 'procs' and 'renames'\n");
+               log("in order to avoid a name collision with the built in commands.\n");
+               log("\n");
+               log("If any arguments are specified, these arguments are provided to the script via\n");
+               log("the standard $argc and $argv variables.\n");
                log("\n");
        }
-       virtual void execute(std::vector<std::string> args, RTLIL::Design *design) {
+       void execute(std::vector<std::string> args, RTLIL::Design *) YS_OVERRIDE {
                if (args.size() < 2)
                        log_cmd_error("Missing script file.\n");
-               if (args.size() > 2)
-                       extra_args(args, 1, design, false);
-               if (Tcl_EvalFile(yosys_get_tcl_interp(), args[1].c_str()) != TCL_OK)
-                       log_cmd_error("TCL interpreter returned an error: %s\n", Tcl_GetStringResult(yosys_get_tcl_interp()));
+
+               std::vector<Tcl_Obj*> script_args;
+               for (auto it = args.begin() + 2; it != args.end(); ++it)
+                       script_args.push_back(Tcl_NewStringObj((*it).c_str(), (*it).size()));
+
+               Tcl_Interp *interp = yosys_get_tcl_interp();
+               Tcl_ObjSetVar2(interp, Tcl_NewStringObj("argc", 4), NULL, Tcl_NewIntObj(script_args.size()), 0);
+               Tcl_ObjSetVar2(interp, Tcl_NewStringObj("argv", 4), NULL, Tcl_NewListObj(script_args.size(), script_args.data()), 0);
+               Tcl_ObjSetVar2(interp, Tcl_NewStringObj("argv0", 5), NULL, Tcl_NewStringObj(args[1].c_str(), args[1].size()), 0);
+               if (Tcl_EvalFile(interp, args[1].c_str()) != TCL_OK)
+                       log_cmd_error("TCL interpreter returned an error: %s\n", Tcl_GetStringResult(interp));
        }
 } TclPass;
 #endif
 
-#if defined(__linux__)
+#if defined(__linux__) || defined(__CYGWIN__)
 std::string proc_self_dirname()
 {
        char path[PATH_MAX];
@@ -339,8 +745,27 @@ std::string proc_self_dirname()
                buflen--;
        return std::string(path, buflen);
 }
+#elif defined(__FreeBSD__)
+std::string proc_self_dirname()
+{
+       int mib[4] = {CTL_KERN, KERN_PROC, KERN_PROC_PATHNAME, -1};
+       size_t buflen;
+       char *buffer;
+       std::string path;
+       if (sysctl(mib, 4, NULL, &buflen, NULL, 0) != 0)
+               log_error("sysctl failed: %s\n", strerror(errno));
+       buffer = (char*)malloc(buflen);
+       if (buffer == NULL)
+               log_error("malloc failed: %s\n", strerror(errno));
+       if (sysctl(mib, 4, buffer, &buflen, NULL, 0) != 0)
+               log_error("sysctl failed: %s\n", strerror(errno));
+       while (buflen > 0 && buffer[buflen-1] != '/')
+               buflen--;
+       path.assign(buffer, buflen);
+       free(buffer);
+       return path;
+}
 #elif defined(__APPLE__)
-#include <mach-o/dyld.h>
 std::string proc_self_dirname()
 {
        char *path = NULL;
@@ -354,12 +779,26 @@ std::string proc_self_dirname()
 #elif defined(_WIN32)
 std::string proc_self_dirname()
 {
-       char path[MAX_PATH+1];
-       if (!GetModuleFileName(0, path, MAX_PATH+1))
+       int i = 0;
+#  ifdef __MINGW32__
+       char longpath[MAX_PATH + 1];
+       char shortpath[MAX_PATH + 1];
+#  else
+       WCHAR longpath[MAX_PATH + 1];
+       TCHAR shortpath[MAX_PATH + 1];
+#  endif
+       if (!GetModuleFileName(0, longpath, MAX_PATH+1))
                log_error("GetModuleFileName() failed.\n");
-       for (int i = strlen(path)-1; i >= 0 && path[i] != '/' && path[i] != '\\' ; i--)
-               path[i] = 0;
-       return std::string(path);
+       if (!GetShortPathName(longpath, shortpath, MAX_PATH+1))
+               log_error("GetShortPathName() failed.\n");
+       while (shortpath[i] != 0)
+               i++;
+       while (i > 0 && shortpath[i-1] != '/' && shortpath[i-1] != '\\')
+               shortpath[--i] = 0;
+       std::string path;
+       for (i = 0; shortpath[i]; i++)
+               path += char(shortpath[i]);
+       return path;
 }
 #elif defined(EMSCRIPTEN)
 std::string proc_self_dirname()
@@ -367,20 +806,41 @@ std::string proc_self_dirname()
        return "/";
 }
 #else
-       #error Dont know how to determine process executable base path!
+       #error "Don't know how to determine process executable base path!"
 #endif
 
+#ifdef EMSCRIPTEN
+std::string proc_share_dirname()
+{
+       return "/share/";
+}
+#else
 std::string proc_share_dirname()
 {
        std::string proc_self_path = proc_self_dirname();
+#  if defined(_WIN32) && !defined(YOSYS_WIN32_UNIX_DIR)
+       std::string proc_share_path = proc_self_path + "share\\";
+       if (check_file_exists(proc_share_path, true))
+               return proc_share_path;
+       proc_share_path = proc_self_path + "..\\share\\";
+       if (check_file_exists(proc_share_path, true))
+               return proc_share_path;
+#  else
        std::string proc_share_path = proc_self_path + "share/";
-       if (access(proc_share_path.c_str(), X_OK) == 0)
+       if (check_file_exists(proc_share_path, true))
                return proc_share_path;
        proc_share_path = proc_self_path + "../share/yosys/";
-       if (access(proc_share_path.c_str(), X_OK) == 0)
+       if (check_file_exists(proc_share_path, true))
                return proc_share_path;
+#    ifdef YOSYS_DATDIR
+       proc_share_path = YOSYS_DATDIR "/";
+       if (check_file_exists(proc_share_path, true))
+               return proc_share_path;
+#    endif
+#  endif
        log_error("proc_share_dirname: unable to determine share/ directory!\n");
 }
+#endif
 
 bool fgetline(FILE *f, std::string &buffer)
 {
@@ -406,10 +866,13 @@ static void handle_label(std::string &command, bool &from_to_active, const std::
        while (pos < GetSize(command) && (command[pos] == ' ' || command[pos] == '\t'))
                pos++;
 
+       if (pos < GetSize(command) && command[pos] == '#')
+               return;
+
        while (pos < GetSize(command) && command[pos] != ' ' && command[pos] != '\t' && command[pos] != '\r' && command[pos] != '\n')
                label += command[pos++];
 
-       if (label.back() == ':' && GetSize(label) > 1)
+       if (GetSize(label) > 1 && label.back() == ':')
        {
                label = label.substr(0, GetSize(label)-1);
                command = command.substr(pos);
@@ -421,17 +884,30 @@ static void handle_label(std::string &command, bool &from_to_active, const std::
        }
 }
 
-void run_frontend(std::string filename, std::string command, RTLIL::Design *design, std::string *backend_command, std::string *from_to_label)
+void run_frontend(std::string filename, std::string command, std::string *backend_command, std::string *from_to_label, RTLIL::Design *design)
 {
+       if (design == nullptr)
+               design = yosys_design;
+
        if (command == "auto") {
                if (filename.size() > 2 && filename.substr(filename.size()-2) == ".v")
                        command = "verilog";
                else if (filename.size() > 2 && filename.substr(filename.size()-3) == ".sv")
                        command = "verilog -sv";
+               else if (filename.size() > 3 && filename.substr(filename.size()-4) == ".vhd")
+                       command = "vhdl";
+               else if (filename.size() > 4 && filename.substr(filename.size()-5) == ".blif")
+                       command = "blif";
+               else if (filename.size() > 5 && filename.substr(filename.size()-6) == ".eblif")
+                       command = "blif";
+               else if (filename.size() > 4 && filename.substr(filename.size()-5) == ".json")
+                       command = "json";
                else if (filename.size() > 3 && filename.substr(filename.size()-3) == ".il")
                        command = "ilang";
                else if (filename.size() > 3 && filename.substr(filename.size()-3) == ".ys")
                        command = "script";
+               else if (filename.size() > 3 && filename.substr(filename.size()-4) == ".tcl")
+                       command = "tcl";
                else if (filename == "-")
                        command = "script";
                else
@@ -459,8 +935,10 @@ void run_frontend(std::string filename, std::string command, RTLIL::Design *desi
 
                FILE *f = stdin;
 
-               if (filename != "-")
+               if (filename != "-") {
                        f = fopen(filename.c_str(), "r");
+                       yosys_input_files.insert(filename);
+               }
 
                if (f == NULL)
                        log_error("Can't open script file `%s' for reading: %s\n", filename.c_str(), strerror(errno));
@@ -489,9 +967,9 @@ void run_frontend(std::string filename, std::string command, RTLIL::Design *desi
                                        Pass::call(design, command);
                        }
                }
-               catch (log_cmd_error_expection) {
+               catch (...) {
                        Frontend::current_script_file = backup_script_file;
-                       throw log_cmd_error_expection();
+                       throw;
                }
 
                Frontend::current_script_file = backup_script_file;
@@ -511,25 +989,45 @@ void run_frontend(std::string filename, std::string command, RTLIL::Design *desi
                log("\n-- Parsing `%s' using frontend `%s' --\n", filename.c_str(), command.c_str());
        }
 
-       Frontend::frontend_call(design, NULL, filename, command);
+       if (command == "tcl")
+               Pass::call(design, vector<string>({command, filename}));
+       else
+               Frontend::frontend_call(design, NULL, filename, command);
+}
+
+void run_frontend(std::string filename, std::string command, RTLIL::Design *design)
+{
+       run_frontend(filename, command, nullptr, nullptr, design);
 }
 
 void run_pass(std::string command, RTLIL::Design *design)
 {
-       log("\n-- Running pass `%s' --\n", command.c_str());
+       if (design == nullptr)
+               design = yosys_design;
+
+       log("\n-- Running command `%s' --\n", command.c_str());
 
        Pass::call(design, command);
 }
 
 void run_backend(std::string filename, std::string command, RTLIL::Design *design)
 {
+       if (design == nullptr)
+               design = yosys_design;
+
        if (command == "auto") {
                if (filename.size() > 2 && filename.substr(filename.size()-2) == ".v")
                        command = "verilog";
                else if (filename.size() > 3 && filename.substr(filename.size()-3) == ".il")
                        command = "ilang";
+               else if (filename.size() > 4 && filename.substr(filename.size()-4) == ".aig")
+                       command = "aiger";
                else if (filename.size() > 5 && filename.substr(filename.size()-5) == ".blif")
                        command = "blif";
+               else if (filename.size() > 5 && filename.substr(filename.size()-5) == ".edif")
+                       command = "edif";
+               else if (filename.size() > 5 && filename.substr(filename.size()-5) == ".json")
+                       command = "json";
                else if (filename == "-")
                        command = "ilang";
                else if (filename.empty())
@@ -550,7 +1048,7 @@ void run_backend(std::string filename, std::string command, RTLIL::Design *desig
        Backend::backend_call(design, NULL, filename, command);
 }
 
-#ifdef YOSYS_ENABLE_READLINE
+#if defined(YOSYS_ENABLE_READLINE) || defined(YOSYS_ENABLE_EDITLINE)
 static char *readline_cmd_generator(const char *text, int state)
 {
        static std::map<std::string, Pass*>::iterator it;
@@ -637,23 +1135,28 @@ void shell(RTLIL::Design *design)
        recursion_counter++;
        log_cmd_error_throw = true;
 
-#ifdef YOSYS_ENABLE_READLINE
-       rl_readline_name = "yosys";
+#if defined(YOSYS_ENABLE_READLINE) || defined(YOSYS_ENABLE_EDITLINE)
+       rl_readline_name = (char*)"yosys";
        rl_attempted_completion_function = readline_completion;
-       rl_basic_word_break_characters = " \t\n";
+       rl_basic_word_break_characters = (char*)" \t\n";
 #endif
 
        char *command = NULL;
-#ifdef YOSYS_ENABLE_READLINE
+#if defined(YOSYS_ENABLE_READLINE) || defined(YOSYS_ENABLE_EDITLINE)
        while ((command = readline(create_prompt(design, recursion_counter))) != NULL)
+       {
 #else
        char command_buffer[4096];
-       while ((command = fgets(command_buffer, 4096, stdin)) != NULL)
-#endif
+       while (1)
        {
+               fputs(create_prompt(design, recursion_counter), stdout);
+               fflush(stdout);
+               if ((command = fgets(command_buffer, 4096, stdin)) == NULL)
+                       break;
+#endif
                if (command[strspn(command, " \t\r\n")] == 0)
                        continue;
-#ifdef YOSYS_ENABLE_READLINE
+#if defined(YOSYS_ENABLE_READLINE) || defined(YOSYS_ENABLE_EDITLINE)
                add_history(command);
 #endif
 
@@ -668,7 +1171,7 @@ void shell(RTLIL::Design *design)
                try {
                        log_assert(design->selection_stack.size() == 1);
                        Pass::call(design, command);
-               } catch (log_cmd_error_expection) {
+               } catch (log_cmd_error_exception) {
                        while (design->selection_stack.size() > 1)
                                design->selection_stack.pop_back();
                        log_reset_stack();
@@ -683,7 +1186,7 @@ void shell(RTLIL::Design *design)
 
 struct ShellPass : public Pass {
        ShellPass() : Pass("shell", "enter interactive command mode") { }
-       virtual void help() {
+       void help() YS_OVERRIDE {
                log("\n");
                log("    shell\n");
                log("\n");
@@ -715,16 +1218,16 @@ struct ShellPass : public Pass {
                log("Press Ctrl-D or type 'exit' to leave the interactive shell.\n");
                log("\n");
        }
-       virtual void execute(std::vector<std::string> args, RTLIL::Design *design) {
+       void execute(std::vector<std::string> args, RTLIL::Design *design) YS_OVERRIDE {
                extra_args(args, 1, design, false);
                shell(design);
        }
 } ShellPass;
 
-#ifdef YOSYS_ENABLE_READLINE
+#if defined(YOSYS_ENABLE_READLINE) || defined(YOSYS_ENABLE_EDITLINE)
 struct HistoryPass : public Pass {
        HistoryPass() : Pass("history", "show last interactive commands") { }
-       virtual void help() {
+       void help() YS_OVERRIDE {
                log("\n");
                log("    history\n");
                log("\n");
@@ -733,17 +1236,22 @@ struct HistoryPass : public Pass {
                log("from executed scripts.\n");
                log("\n");
        }
-       virtual void execute(std::vector<std::string> args, RTLIL::Design *design) {
+       void execute(std::vector<std::string> args, RTLIL::Design *design) YS_OVERRIDE {
                extra_args(args, 1, design, false);
+#ifdef YOSYS_ENABLE_READLINE
                for(HIST_ENTRY **list = history_list(); *list != NULL; list++)
                        log("%s\n", (*list)->line);
+#else
+               for (int i = where_history(); history_get(i); i++)
+                       log("%s\n", history_get(i)->line);
+#endif
        }
 } HistoryPass;
 #endif
 
-struct ScriptPass : public Pass {
-       ScriptPass() : Pass("script", "execute commands from script file") { }
-       virtual void help() {
+struct ScriptCmdPass : public Pass {
+       ScriptCmdPass() : Pass("script", "execute commands from script file") { }
+       void help() YS_OVERRIDE {
                log("\n");
                log("    script <filename> [<from_label>:<to_label>]\n");
                log("\n");
@@ -758,17 +1266,16 @@ struct ScriptPass : public Pass {
                log("marked with that label (until the next label) is executed.\n");
                log("\n");
        }
-       virtual void execute(std::vector<std::string> args, RTLIL::Design *design) {
+       void execute(std::vector<std::string> args, RTLIL::Design *design) YS_OVERRIDE {
                if (args.size() < 2)
                        log_cmd_error("Missing script file.\n");
                else if (args.size() == 2)
-                       run_frontend(args[1], "script", design, NULL, NULL);
+                       run_frontend(args[1], "script", design);
                else if (args.size() == 3)
-                       run_frontend(args[1], "script", design, NULL, &args[2]);
+                       run_frontend(args[1], "script", NULL, &args[2], design);
                else
                        extra_args(args, 2, design, false);
        }
-} ScriptPass;
+} ScriptCmdPass;
 
 YOSYS_NAMESPACE_END
-