6 files changed, 40 insertions, 10 deletions

diff --git a/kernel/celltypes.h b/kernel/celltypes.h
index 8c2e9a48e..515da25ce 100644
--- a/kernel/celltypes.h
+++ b/kernel/celltypes.h
@@ -108,7 +108,7 @@ struct CellTypes
 		for (auto type : std::vector<RTLIL::IdString>({"$mux", "$pmux"}))
 			setup_type(type, {"\\A", "\\B", "\\S"}, {"\\Y"}, true);
 
-		setup_type("$assert", {"\\A", "\\EN"}, {}, true);
+		setup_type("$assert", {"\\A", "\\EN"}, std::set<RTLIL::IdString>(), true);
 	}
 
 	void setup_internals_mem()
@@ -121,7 +121,7 @@ struct CellTypes
 		setup_type("$dlatchsr", {"\\EN", "\\SET", "\\CLR", "\\D"}, {"\\Q"});
 
 		setup_type("$memrd", {"\\CLK", "\\ADDR"}, {"\\DATA"});
-		setup_type("$memwr", {"\\CLK", "\\EN", "\\ADDR", "\\DATA"}, {});
+		setup_type("$memwr", {"\\CLK", "\\EN", "\\ADDR", "\\DATA"}, std::set<RTLIL::IdString>());
 		setup_type("$mem", {"\\RD_CLK", "\\RD_ADDR", "\\WR_CLK", "\\WR_EN", "\\WR_ADDR", "\\WR_DATA"}, {"\\RD_DATA"});
 
 		setup_type("$fsm", {"\\CLK", "\\ARST", "\\CTRL_IN"}, {"\\CTRL_OUT"});
diff --git a/kernel/compatibility.cc b/kernel/compatibility.cc
index 2ef023eb3..4c4cbd6de 100644
--- a/kernel/compatibility.cc
+++ b/kernel/compatibility.cc
@@ -26,7 +26,7 @@
 #include <string.h>
 #include <errno.h>
 
-#if !(_XOPEN_SOURCE >= 700 || _POSIX_C_SOURCE >= 200809L)
+#if !(_XOPEN_SOURCE >= 700 || _POSIX_C_SOURCE >= 200809L || defined(EMSCRIPTEN))
 
 typedef struct memstream {
 	off_t pos;
diff --git a/kernel/driver.cc b/kernel/driver.cc
index 6bd60d7b5..e778e1389 100644
--- a/kernel/driver.cc
+++ b/kernel/driver.cc
@@ -20,8 +20,10 @@
 #include "kernel/yosys.h"
 #include "libs/sha1/sha1.h"
 
-#include <readline/readline.h>
-#include <readline/history.h>
+#ifdef YOSYS_ENABLE_READLINE
+#  include <readline/readline.h>
+#  include <readline/history.h>
+#endif
 
 #include <stdio.h>
 #include <string.h>
@@ -46,6 +48,7 @@ int main(int argc, char **argv)
 	bool print_stats = true;
 	bool call_abort = false;
 
+#ifdef YOSYS_ENABLE_READLINE
 	int history_offset = 0;
 	std::string history_file;
 	if (getenv("HOME") != NULL) {
@@ -53,6 +56,7 @@ int main(int argc, char **argv)
 		read_history(history_file.c_str());
 		history_offset = where_history();
 	}
+#endif
 
 	int opt;
 	while ((opt = getopt(argc, argv, "AQTVSm:f:Hh:b:o:p:l:qv:ts:c:")) != -1)
@@ -329,6 +333,7 @@ int main(int argc, char **argv)
 	if (call_abort)
 		abort();
 
+#ifdef YOSYS_ENABLE_READLINE
 	if (!history_file.empty()) {
 		if (history_offset > 0) {
 			history_truncate_file(history_file.c_str(), 100);
@@ -341,6 +346,7 @@ int main(int argc, char **argv)
 	HIST_ENTRY **hist_list = history_list();
 	if (hist_list != NULL)
 		free(hist_list);
+#endif
 
 	yosys_shutdown();
 
diff --git a/kernel/rtlil.cc b/kernel/rtlil.cc
index 24cce6b8b..22bff7bdb 100644
--- a/kernel/rtlil.cc
+++ b/kernel/rtlil.cc
@@ -1605,6 +1605,10 @@ RTLIL::Memory::Memory()
 	size = 0;
 }
 
+RTLIL::Cell::Cell() : module(nullptr)
+{
+}
+
 bool RTLIL::Cell::hasPort(RTLIL::IdString portname) const
 {
 	return connections_.count(portname) != 0;
diff --git a/kernel/rtlil.h b/kernel/rtlil.h
index 8b3306f6f..ebfe4ca29 100644
--- a/kernel/rtlil.h
+++ b/kernel/rtlil.h
@@ -77,7 +77,7 @@ namespace RTLIL
 		// the global id string cache
 
 		struct char_ptr_cmp {
-			bool operator()(const char *a, const char *b) {
+			bool operator()(const char *a, const char *b) const {
 				for (int i = 0; a[i] || b[i]; i++)
 					if (a[i] != b[i])
 						return a[i] < b[i];
@@ -815,8 +815,7 @@ struct RTLIL::Cell
 protected:
 	// use module->addCell() and module->remove() to create or destroy cells
 	friend struct RTLIL::Module;
-	Cell() : module(nullptr) { };
-	~Cell() { };
+	Cell();
 
 public:
 	// do not simply copy cells
diff --git a/kernel/yosys.cc b/kernel/yosys.cc
index ce2487314..7b8173b6a 100644
--- a/kernel/yosys.cc
+++ b/kernel/yosys.cc
@@ -19,12 +19,15 @@
 
 #include "kernel/yosys.h"
 
-#include <readline/readline.h>
-#include <readline/history.h>
+#ifdef YOSYS_ENABLE_READLINE
+#  include <readline/readline.h>
+#  include <readline/history.h>
+#endif
 
 #include <dlfcn.h>
 #include <unistd.h>
 #include <limits.h>
+#include <errno.h>
 
 YOSYS_NAMESPACE_BEGIN
 
@@ -232,6 +235,11 @@ std::string proc_self_dirname ()
 		buflen--;
 	return std::string(path, buflen);
 }
+#elif defined(EMSCRIPTEN)
+std::string proc_self_dirname ()
+{
+	return "/";
+}
 #else
 	#error Dont know how to determine process executable base path!
 #endif
@@ -416,6 +424,7 @@ void run_backend(std::string filename, std::string command, RTLIL::Design *desig
 	Backend::backend_call(design, NULL, filename, command);
 }
 
+#ifdef YOSYS_ENABLE_READLINE
 static char *readline_cmd_generator(const char *text, int state)
 {
 	static std::map<std::string, Pass*>::iterator it;
@@ -493,6 +502,7 @@ static char **readline_completion(const char *text, int start, int)
 		return rl_completion_matches(text, readline_obj_generator);
 	return NULL;
 }
+#endif
 
 void shell(RTLIL::Design *design)
 {
@@ -501,16 +511,25 @@ void shell(RTLIL::Design *design)
 	recursion_counter++;
 	log_cmd_error_throw = true;
 
+#ifdef YOSYS_ENABLE_READLINE
 	rl_readline_name = "yosys";
 	rl_attempted_completion_function = readline_completion;
 	rl_basic_word_break_characters = " \t\n";
+#endif
 
 	char *command = NULL;
+#ifdef YOSYS_ENABLE_READLINE
 	while ((command = readline(create_prompt(design, recursion_counter))) != NULL)
+#else
+	char command_buffer[4096];
+	while ((command = fgets(command_buffer, 4096, stdin)) != NULL)
+#endif
 	{
 		if (command[strspn(command, " \t\r\n")] == 0)
 			continue;
+#ifdef YOSYS_ENABLE_READLINE
 		add_history(command);
+#endif
 
 		char *p = command + strspn(command, " \t\r\n");
 		if (!strncmp(p, "exit", 4)) {
@@ -576,6 +595,7 @@ struct ShellPass : public Pass {
 	}
 } ShellPass;
 
+#ifdef YOSYS_ENABLE_READLINE
 struct HistoryPass : public Pass {
 	HistoryPass() : Pass("history", "show last interactive commands") { }
 	virtual void help() {
@@ -593,6 +613,7 @@ struct HistoryPass : public Pass {
 			log("%s\n", (*list)->line);
 	}
 } HistoryPass;
+#endif
 
 struct ScriptPass : public Pass {
 	ScriptPass() : Pass("script", "execute commands from script file") { }