From b5da3a60e101a26dbcbd6a8565343c281ba464f8 Mon Sep 17 00:00:00 2001
From: Clifford Wolf <clifford@clifford.at>
Date: Sat, 18 Oct 2014 14:15:05 +0200
Subject: Moved yosys-config.in to misc/

---
 misc/yosys-config.in | 97 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 97 insertions(+)
 create mode 100644 misc/yosys-config.in

(limited to 'misc')

diff --git a/misc/yosys-config.in b/misc/yosys-config.in
new file mode 100644
index 000000000..8f8dd06c6
--- /dev/null
+++ b/misc/yosys-config.in
@@ -0,0 +1,97 @@
+#!/bin/bash
+
+help() {
+	{
+		echo ""
+		echo "Usage: $0 [-exec] [--prefix pf] args.."
+		echo ""
+		echo "Replecement args:"
+		echo "    --cxx         @CXX@"
+		echo "    --cxxflags    $( echo '@CXXFLAGS@' | fmt -w60 | sed ':a;N;$!ba;s/\n/ \\\n                      /g' )"
+		echo "    --ldflags     @LDFLAGS@"
+		echo "    --ldlibs      @LDLIBS@"
+		echo "    --bindir      @BINDIR@"
+		echo "    --datdir      @DATDIR@"
+		echo ""
+		echo "All other args are passed trhough as they are."
+		echo ""
+		echo "Use -exec to call a command instead of generating output. Example usage:"
+		echo ""
+		echo "  yosys-config --exec --cxx --cxxflags --ldflags -o plugin.so -shared plugin.cc --ldlibs"
+		echo ""
+		echo "Use --prefix to change the prefix for the special args from '--' to"
+		echo "something else. Example:"
+		echo ""
+		echo "  yosys-config --prefix @ bindir: @bindir"
+		echo ""
+		echo "The args --bindir and --datdir can be directly followed by a slash and"
+		echo "additional text. Example:"
+		echo ""
+		echo "  yosys-config --datdir/simlib.v"
+		echo ""
+	} >&2
+	exit 1
+}
+
+if [ $# -eq 0 ]; then
+	help
+fi
+
+prefix="--"
+get_prefix=false
+exec_mode=false
+declare -a tokens=()
+
+for opt; do
+	if $get_prefix; then
+		prefix="$opt"
+		get_prefix=false
+		continue
+	fi
+	case "$opt" in
+		"$prefix"cxx)
+			tokens=( "${tokens[@]}"  @CXX@       ) ;;
+		"$prefix"cxxflags)
+			tokens=( "${tokens[@]}"  @CXXFLAGS@  ) ;;
+		"$prefix"ldflags)
+			tokens=( "${tokens[@]}"  @LDFLAGS@   ) ;;
+		"$prefix"ldlibs)
+			tokens=( "${tokens[@]}"  @LDLIBS@    ) ;;
+		"$prefix"bindir)
+			tokens=( "${tokens[@]}" '@BINDIR@'   ) ;;
+		"$prefix"datdir)
+			tokens=( "${tokens[@]}" '@DATDIR@'   ) ;;
+		"$prefix"bindir/*)
+			tokens=( "${tokens[@]}" '@BINDIR@'"${opt#${prefix}bindir}" ) ;;
+		"$prefix"datdir/*)
+			tokens=( "${tokens[@]}" '@DATDIR@'"${opt#${prefix}datdir}" ) ;;
+		--help|-\?|-h)
+			if [ ${#tokens[@]} -eq 0 ]; then
+				help
+			else
+				tokens=( "${tokens[@]}" "$opt" )
+			fi ;;
+		--exec)
+			if [ ${#tokens[@]} -eq 0 ]; then
+				exec_mode=true
+			else
+				tokens=( "${tokens[@]}" "$opt" )
+			fi ;;
+		--prefix)
+			if [ ${#tokens[@]} -eq 0 ]; then
+				get_prefix=true
+			else
+				tokens=( "${tokens[@]}" "$opt" )
+			fi ;;
+		*)
+			tokens=( "${tokens[@]}" "$opt" )
+	esac
+done
+
+if $exec_mode; then
+	exec "${tokens[@]}"
+fi
+
+echo "${tokens[@]}"
+exit 0
+
-- 
cgit v1.2.3


From 85572b05e5359f28c1625b873dc14428f796a454 Mon Sep 17 00:00:00 2001
From: Clifford Wolf <clifford@clifford.at>
Date: Sat, 18 Oct 2014 15:17:33 +0200
Subject: Create vcxsrc in mxe build "make dist"

---
 misc/create_vcxsrc.sh | 39 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 39 insertions(+)
 create mode 100644 misc/create_vcxsrc.sh

(limited to 'misc')

diff --git a/misc/create_vcxsrc.sh b/misc/create_vcxsrc.sh
new file mode 100644
index 000000000..eb2239303
--- /dev/null
+++ b/misc/create_vcxsrc.sh
@@ -0,0 +1,39 @@
+#!/bin/bash
+
+set -ex
+vcxsrc="$1"
+
+rm -rf YosysVS-Tpl-v1.zip YosysVS
+wget http://www.clifford.at/yosys/nogit/YosysVS-Tpl-v1.zip
+
+unzip YosysVS-Tpl-v1.zip
+rm -f YosysVS-Tpl-v1.zip
+mv YosysVS "$vcxsrc"
+
+{
+	n=$(grep -B999 '<ItemGroup>' "$vcxsrc"/YosysVS/YosysVS.vcxproj | wc -l)
+	head -n$n "$vcxsrc"/YosysVS/YosysVS.vcxproj
+	egrep '\.(h|hh|hpp|inc)$' srcfiles.txt | sed 's,.*,<ClInclude Include="../yosys/&" />,'
+	egrep -v '\.(h|hh|hpp|inc)$' srcfiles.txt | sed 's,.*,<ClCompile Include="../yosys/&" />,'
+	tail -n +$((n+1)) "$vcxsrc"/YosysVS/YosysVS.vcxproj
+} > "$vcxsrc"/YosysVS/YosysVS.vcxproj.new
+
+mv "$vcxsrc"/YosysVS/YosysVS.vcxproj.new "$vcxsrc"/YosysVS/YosysVS.vcxproj
+
+mkdir -p "$vcxsrc"/yosys
+tar -cf - -T srcfiles.txt | tar -xf - -C "$vcxsrc"/yosys
+
+cat > "$vcxsrc"/readme-git.txt << EOT
+Using a git working copy for the yosys source code:
+
+Open "Git Bash" in this directory and run:
+
+	mv yosys yosys.bak
+	git clone https://github.com/cliffordwolf/yosys.git yosys
+	cd yosys
+	git checkout -B master $(git rev-parse HEAD | cut -c1-10)
+	unzip ../genfiles.zip
+EOT
+
+sed -i 's/$/\r/; s/\r\r*/\r/g;' "$vcxsrc"/YosysVS/YosysVS.vcxproj "$vcxsrc"/readme-git.txt
+
-- 
cgit v1.2.3


From 0471d158d955804c011338c5c664dfa7a38aed1f Mon Sep 17 00:00:00 2001
From: Clifford Wolf <clifford@clifford.at>
Date: Sat, 18 Oct 2014 19:00:52 +0200
Subject: Various improvements to version reporting on win32

---
 misc/create_vcxsrc.sh | 23 +++++++++++++++++++----
 1 file changed, 19 insertions(+), 4 deletions(-)

(limited to 'misc')

diff --git a/misc/create_vcxsrc.sh b/misc/create_vcxsrc.sh
index eb2239303..215e27c53 100644
--- a/misc/create_vcxsrc.sh
+++ b/misc/create_vcxsrc.sh
@@ -1,7 +1,9 @@
 #!/bin/bash
 
 set -ex
-vcxsrc="$1"
+vcxsrc="$1-$2"
+yosysver="$2"
+gitsha="$3"
 
 rm -rf YosysVS-Tpl-v1.zip YosysVS
 wget http://www.clifford.at/yosys/nogit/YosysVS-Tpl-v1.zip
@@ -15,6 +17,7 @@ mv YosysVS "$vcxsrc"
 	head -n$n "$vcxsrc"/YosysVS/YosysVS.vcxproj
 	egrep '\.(h|hh|hpp|inc)$' srcfiles.txt | sed 's,.*,<ClInclude Include="../yosys/&" />,'
 	egrep -v '\.(h|hh|hpp|inc)$' srcfiles.txt | sed 's,.*,<ClCompile Include="../yosys/&" />,'
+	echo '<ClCompile Include="../yosys/kernel/version.cc" />'
 	tail -n +$((n+1)) "$vcxsrc"/YosysVS/YosysVS.vcxproj
 } > "$vcxsrc"/YosysVS/YosysVS.vcxproj.new
 
@@ -22,10 +25,13 @@ mv "$vcxsrc"/YosysVS/YosysVS.vcxproj.new "$vcxsrc"/YosysVS/YosysVS.vcxproj
 
 mkdir -p "$vcxsrc"/yosys
 tar -cf - -T srcfiles.txt | tar -xf - -C "$vcxsrc"/yosys
+cp -r share "$vcxsrc"/
 
-cat > "$vcxsrc"/readme-git.txt << EOT
-Using a git working copy for the yosys source code:
+echo "namespace Yosys { extern const char *yosys_version_str; const char *yosys_version_str=\"Yosys" \
+		"$yosysver (git sha1 $gitsha, Visual Studio)\"; }" > "$vcxsrc"/yosys/kernel/version.cc
 
+cat > "$vcxsrc"/readme-git.txt << EOT
+Want to use a git working copy for the yosys source code?
 Open "Git Bash" in this directory and run:
 
 	mv yosys yosys.bak
@@ -35,5 +41,14 @@ Open "Git Bash" in this directory and run:
 	unzip ../genfiles.zip
 EOT
 
-sed -i 's/$/\r/; s/\r\r*/\r/g;' "$vcxsrc"/YosysVS/YosysVS.vcxproj "$vcxsrc"/readme-git.txt
+cat > "$vcxsrc"/readme-abc.txt << EOT
+Yosys is using "ABC" for gate-level optimizations and technology
+mapping. Download yosys-win32-mxebin-$yosysver.zip and copy the
+following files from it into this directory:
+
+	pthreadVC2.dll
+	yosys-abc.exe
+EOT
+
+sed -i 's/$/\r/; s/\r\r*/\r/g;' "$vcxsrc"/YosysVS/YosysVS.vcxproj "$vcxsrc"/readme-git.txt "$vcxsrc"/readme-abc.txt
 
-- 
cgit v1.2.3


From 1df81f92ce171ba63cf0e4d10e6f203ca5f7f64e Mon Sep 17 00:00:00 2001
From: Clifford Wolf <clifford@clifford.at>
Date: Sun, 1 Feb 2015 13:38:46 +0100
Subject: Added "make mklibyosys", some minor API changes

---
 misc/example.cc | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 misc/example.cc

(limited to 'misc')

diff --git a/misc/example.cc b/misc/example.cc
new file mode 100644
index 000000000..a8244ac4e
--- /dev/null
+++ b/misc/example.cc
@@ -0,0 +1,21 @@
+// clang -o example -std=c++11 -I/usr/include/tcl8.5 -I include/ example.cc objs/*.o -lstdc++ -lm -lrt -lreadline -lffi -ldl -ltcl8.5
+
+#include <yosys.h>
+
+int main()
+{
+	Yosys::log_streams.push_back(&std::cout);
+	Yosys::log_error_stderr = true;
+
+	Yosys::yosys_setup();
+	Yosys::yosys_banner();
+
+	Yosys::run_pass("read_verilog example.v");
+	Yosys::run_pass("synth -noabc");
+	Yosys::run_pass("clean -purge");
+	Yosys::run_pass("write_blif example.blif");
+
+	Yosys::yosys_shutdown();
+	return 0;
+}
+
-- 
cgit v1.2.3


From bbfc1bd7cf8dfe345a9593fe120648374811b6d3 Mon Sep 17 00:00:00 2001
From: Clifford Wolf <clifford@clifford.at>
Date: Sun, 8 Feb 2015 00:14:07 +0100
Subject: Added "yosys-config --build modname.so cppsources.."

---
 misc/yosys-config.in | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

(limited to 'misc')

diff --git a/misc/yosys-config.in b/misc/yosys-config.in
index 8f8dd06c6..defb09ce7 100644
--- a/misc/yosys-config.in
+++ b/misc/yosys-config.in
@@ -3,7 +3,8 @@
 help() {
 	{
 		echo ""
-		echo "Usage: $0 [-exec] [--prefix pf] args.."
+		echo "Usage: $0 [--exec] [--prefix pf] args.."
+		echo "       $0 --build modname.so cppsources.."
 		echo ""
 		echo "Replecement args:"
 		echo "    --cxx         @CXX@"
@@ -15,10 +16,14 @@ help() {
 		echo ""
 		echo "All other args are passed trhough as they are."
 		echo ""
-		echo "Use -exec to call a command instead of generating output. Example usage:"
+		echo "Use --exec to call a command instead of generating output. Example usage:"
 		echo ""
 		echo "  yosys-config --exec --cxx --cxxflags --ldflags -o plugin.so -shared plugin.cc --ldlibs"
 		echo ""
+		echo "The above command can be abbreviated as:"
+		echo ""
+		echo "  yosys-config --build plugin.so plugin.cc"
+		echo ""
 		echo "Use --prefix to change the prefix for the special args from '--' to"
 		echo "something else. Example:"
 		echo ""
@@ -37,6 +42,11 @@ if [ $# -eq 0 ]; then
 	help
 fi
 
+if [ "$1" == "--build" ]; then
+	modname="$2"; shift 2
+	set -- --exec --cxx --cxxflags --ldflags -o "$modname" -shared "$@" --ldlibs
+fi
+
 prefix="--"
 get_prefix=false
 exec_mode=false
-- 
cgit v1.2.3


From fbb16712f1beeb0f25ddc5b2c56556fe70315597 Mon Sep 17 00:00:00 2001
From: Clifford Wolf <clifford@clifford.at>
Date: Sun, 8 Feb 2015 00:16:59 +0100
Subject: fixed typo

---
 misc/yosys-config.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'misc')

diff --git a/misc/yosys-config.in b/misc/yosys-config.in
index defb09ce7..1473948cf 100644
--- a/misc/yosys-config.in
+++ b/misc/yosys-config.in
@@ -14,7 +14,7 @@ help() {
 		echo "    --bindir      @BINDIR@"
 		echo "    --datdir      @DATDIR@"
 		echo ""
-		echo "All other args are passed trhough as they are."
+		echo "All other args are passed through as they are."
 		echo ""
 		echo "Use --exec to call a command instead of generating output. Example usage:"
 		echo ""
-- 
cgit v1.2.3


From 3216f9420e2f5aed0aa3e38ff89ab616db9b0849 Mon Sep 17 00:00:00 2001
From: Clifford Wolf <clifford@clifford.at>
Date: Sun, 15 Feb 2015 12:09:30 +0100
Subject: More emscripten stuff, Added example app

---
 misc/yosys.html | 60 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 60 insertions(+)
 create mode 100644 misc/yosys.html

(limited to 'misc')

diff --git a/misc/yosys.html b/misc/yosys.html
new file mode 100644
index 000000000..c82bc1871
--- /dev/null
+++ b/misc/yosys.html
@@ -0,0 +1,60 @@
+<html>
+  <head>
+    <title>yosys.js example application</title>
+  </head>
+  <body onload="document.getElementById('command').focus()">
+    <h1>yosys.js example application</h1>
+    <div><textarea id="output" style="width: 100%" rows="30" cols="100">Loading...</textarea></div>
+    <div><form onsubmit="return run_command()"><tt><span id="prompt"><br/>yosys&gt; </span></tt><input id="command" type="text" size="100"></form></div>
+    <script type='text/javascript'>
+      var got_log_messages = false;
+      var Module = {
+        print: (function() {
+          var element = document.getElementById('output');
+          if (element) element.value = ''; // clear browser cache
+          return function(text) {
+	    got_log_messages = true;
+            if (element && typeof(text) != "number") {
+              element.value += text + "\n";
+              element.scrollTop = element.scrollHeight; // focus on bottom
+            }
+          };
+	})(),
+        printErr: (function() {
+          var element = document.getElementById('output');
+          if (element) element.value = ''; // clear browser cache
+          return function(text) {
+            if (element && typeof(text) != "number") {
+	      console.log(text);
+	      if (got_log_messages) {
+                element.value += text + "\n";
+                element.scrollTop = element.scrollHeight; // focus on bottom
+	      }
+            }
+          };
+	})(),
+	command: (function(cmd) {
+	  Module.ccall('run', '', ['string'], [cmd])
+	}),
+	prompt: (function(cmd) {
+	  return Module.ccall('prompt', 'string', [], [])
+	})
+      };
+      function run_command() {
+        var cmd = document.getElementById('command').value;
+	document.getElementById('command').value = '';
+        Module.print(Module.prompt() + cmd);
+	try {
+		Module.command(cmd);
+	} catch (e) {
+		Module.print('Caught JavaScript exception. (see JavaScript console for details.)');
+		console.log(e);
+	}
+	document.getElementById('command').focus();
+	document.getElementById('prompt').innerText = Module.prompt();
+	return false;
+      }
+    </script>
+    <script async type="text/javascript" src="yosys.js"></script>
+  </body>
+</html>
-- 
cgit v1.2.3


From c2cc342e1a3d223caf1059fd2f255b0985ded61c Mon Sep 17 00:00:00 2001
From: Clifford Wolf <clifford@clifford.at>
Date: Sun, 15 Feb 2015 16:16:08 +0100
Subject: Improved yosys.js example

---
 misc/yosys.html | 132 ++++++++++++++++++++++++++++++--------------------------
 1 file changed, 72 insertions(+), 60 deletions(-)

(limited to 'misc')

diff --git a/misc/yosys.html b/misc/yosys.html
index c82bc1871..929d0dd3b 100644
--- a/misc/yosys.html
+++ b/misc/yosys.html
@@ -1,60 +1,72 @@
-<html>
-  <head>
-    <title>yosys.js example application</title>
-  </head>
-  <body onload="document.getElementById('command').focus()">
-    <h1>yosys.js example application</h1>
-    <div><textarea id="output" style="width: 100%" rows="30" cols="100">Loading...</textarea></div>
-    <div><form onsubmit="return run_command()"><tt><span id="prompt"><br/>yosys&gt; </span></tt><input id="command" type="text" size="100"></form></div>
-    <script type='text/javascript'>
-      var got_log_messages = false;
-      var Module = {
-        print: (function() {
-          var element = document.getElementById('output');
-          if (element) element.value = ''; // clear browser cache
-          return function(text) {
-	    got_log_messages = true;
-            if (element && typeof(text) != "number") {
-              element.value += text + "\n";
-              element.scrollTop = element.scrollHeight; // focus on bottom
-            }
-          };
-	})(),
-        printErr: (function() {
-          var element = document.getElementById('output');
-          if (element) element.value = ''; // clear browser cache
-          return function(text) {
-            if (element && typeof(text) != "number") {
-	      console.log(text);
-	      if (got_log_messages) {
-                element.value += text + "\n";
-                element.scrollTop = element.scrollHeight; // focus on bottom
-	      }
-            }
-          };
-	})(),
-	command: (function(cmd) {
-	  Module.ccall('run', '', ['string'], [cmd])
-	}),
-	prompt: (function(cmd) {
-	  return Module.ccall('prompt', 'string', [], [])
-	})
-      };
-      function run_command() {
-        var cmd = document.getElementById('command').value;
-	document.getElementById('command').value = '';
-        Module.print(Module.prompt() + cmd);
-	try {
-		Module.command(cmd);
-	} catch (e) {
-		Module.print('Caught JavaScript exception. (see JavaScript console for details.)');
-		console.log(e);
-	}
-	document.getElementById('command').focus();
-	document.getElementById('prompt').innerText = Module.prompt();
-	return false;
-      }
-    </script>
-    <script async type="text/javascript" src="yosys.js"></script>
-  </body>
-</html>
+<html><head>
+	<title>yosys.js example application</title>
+</head><body onload="document.getElementById('command').focus()">
+	<h1>yosys.js example application</h1>
+	<div><textarea id="output" style="width: 100%" rows="30" cols="100"></textarea></div>
+	<div id="wait" style="display: block"><br/><b><span id="waitmsg">Loading...</span></b></div>
+	<div id="input" style="display: none"><form onsubmit="return run_command()"><tt><span id="prompt"><br/>yosys&gt; </span></tt><input id="command" type="text" size="100"></form></div>
+	<script type='text/javascript'>
+		var got_log_messages = false;
+		var Module = {
+			print: (function() {
+				var element = document.getElementById('output');
+				if (element) element.value = ''; // clear browser cache
+				return function(text) {
+					if (!got_log_messages) {
+						document.getElementById('wait').style.display = 'none';
+						document.getElementById('input').style.display = 'block';
+						document.getElementById('waitmsg').innerText = 'Waiting for yosys.js...';
+						got_log_messages = true;
+					}
+					if (element && typeof(text) != "number") {
+						element.value += text + "\n";
+						element.scrollTop = element.scrollHeight; // focus on bottom
+					}
+				};
+			})(),
+			printErr: (function() {
+				var element = document.getElementById('output');
+				if (element) element.value = ''; // clear browser cache
+				return function(text) {
+					if (element && typeof(text) != "number") {
+						console.log(text);
+						if (got_log_messages) {
+							element.value += text + "\n";
+							element.scrollTop = element.scrollHeight; // focus on bottom
+						}
+					}
+				};
+			})(),
+			command: (function(cmd) {
+				Module.ccall('run', '', ['string'], [cmd])
+			}),
+			prompt: (function(cmd) {
+				return Module.ccall('prompt', 'string', [], [])
+			})
+		};
+		function run_command() {
+			var cmd = document.getElementById('command').value;
+			document.getElementById('command').value = '';
+			Module.print(Module.prompt() + cmd);
+			document.getElementById('wait').style.display = 'block';
+			document.getElementById('input').style.display = 'none';
+
+			function run_command_bh() {
+				try {
+					Module.command(cmd);
+				} catch (e) {
+					Module.print('Caught JavaScript exception. (see JavaScript console for details.)');
+					console.log(e);
+				}
+				document.getElementById('wait').style.display = 'none';
+				document.getElementById('input').style.display = 'block';
+				document.getElementById('prompt').innerText = Module.prompt();
+				document.getElementById('command').focus();
+			}
+
+			window.setTimeout(run_command_bh, 50);
+			return false;
+		}
+	</script>
+	<script async type="text/javascript" src="yosys.js"></script>
+</body></html>
-- 
cgit v1.2.3


From 8d45f81046a159df38e20b00cf0d74b1bb02a073 Mon Sep 17 00:00:00 2001
From: Clifford Wolf <clifford@clifford.at>
Date: Sun, 15 Feb 2015 17:14:09 +0100
Subject: More emcc stuff

---
 misc/yosys.html | 38 +++++++++++++++++++++++++-------------
 1 file changed, 25 insertions(+), 13 deletions(-)

(limited to 'misc')

diff --git a/misc/yosys.html b/misc/yosys.html
index 929d0dd3b..29d89e6fe 100644
--- a/misc/yosys.html
+++ b/misc/yosys.html
@@ -4,18 +4,18 @@
 	<h1>yosys.js example application</h1>
 	<div><textarea id="output" style="width: 100%" rows="30" cols="100"></textarea></div>
 	<div id="wait" style="display: block"><br/><b><span id="waitmsg">Loading...</span></b></div>
-	<div id="input" style="display: none"><form onsubmit="return run_command()"><tt><span id="prompt"><br/>yosys&gt; </span></tt><input id="command" type="text" size="100"></form></div>
+	<div id="input" style="display: none"><form onsubmit="window.setTimeout(run_command); return false"><tt><span id="prompt">
+			</span></tt><input id="command" type="text" style="font-family: monospace; font-weight: bold;" size="100"></form></div>
 	<script type='text/javascript'>
 		var got_log_messages = false;
+
 		var Module = {
 			print: (function() {
 				var element = document.getElementById('output');
 				if (element) element.value = ''; // clear browser cache
 				return function(text) {
 					if (!got_log_messages) {
-						document.getElementById('wait').style.display = 'none';
-						document.getElementById('input').style.display = 'block';
-						document.getElementById('waitmsg').innerText = 'Waiting for yosys.js...';
+						window.setTimeout(startup, 50);
 						got_log_messages = true;
 					}
 					if (element && typeof(text) != "number") {
@@ -37,30 +37,42 @@
 					}
 				};
 			})(),
-			command: (function(cmd) {
-				Module.ccall('run', '', ['string'], [cmd])
-			}),
-			prompt: (function(cmd) {
-				return Module.ccall('prompt', 'string', [], [])
-			})
 		};
+
+		function startup() {
+			document.getElementById('wait').style.display = 'none';
+			document.getElementById('input').style.display = 'block';
+			document.getElementById('waitmsg').innerText = 'Waiting for yosys.js...';
+			document.getElementById('prompt').innerText = yosys_prompt();
+			document.getElementById('command').focus();
+			console.log('yosys.js loaded.');
+		}
+
+		function yosys_command(cmd) {
+			Module.ccall('run', '', ['string'], [cmd])
+		}
+
+		function yosys_prompt() {
+			return Module.ccall('prompt', 'string', [], [])
+		}
+
 		function run_command() {
 			var cmd = document.getElementById('command').value;
 			document.getElementById('command').value = '';
-			Module.print(Module.prompt() + cmd);
+			Module.print(yosys_prompt() + cmd);
 			document.getElementById('wait').style.display = 'block';
 			document.getElementById('input').style.display = 'none';
 
 			function run_command_bh() {
 				try {
-					Module.command(cmd);
+					yosys_command(cmd);
 				} catch (e) {
 					Module.print('Caught JavaScript exception. (see JavaScript console for details.)');
 					console.log(e);
 				}
 				document.getElementById('wait').style.display = 'none';
 				document.getElementById('input').style.display = 'block';
-				document.getElementById('prompt').innerText = Module.prompt();
+				document.getElementById('prompt').innerText = yosys_prompt();
 				document.getElementById('command').focus();
 			}
 
-- 
cgit v1.2.3


From 549d56bd213b95774cd625abfadf411c6561eea8 Mon Sep 17 00:00:00 2001
From: Clifford Wolf <clifford@clifford.at>
Date: Sun, 15 Feb 2015 18:10:54 +0100
Subject: Added yosys.js FS support

---
 misc/yosys.html | 63 +++++++++++++++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 61 insertions(+), 2 deletions(-)

(limited to 'misc')

diff --git a/misc/yosys.html b/misc/yosys.html
index 29d89e6fe..741b88b45 100644
--- a/misc/yosys.html
+++ b/misc/yosys.html
@@ -2,6 +2,7 @@
 	<title>yosys.js example application</title>
 </head><body onload="document.getElementById('command').focus()">
 	<h1>yosys.js example application</h1>
+	<div id="tabs"></div>
 	<div><textarea id="output" style="width: 100%" rows="30" cols="100"></textarea></div>
 	<div id="wait" style="display: block"><br/><b><span id="waitmsg">Loading...</span></b></div>
 	<div id="input" style="display: none"><form onsubmit="window.setTimeout(run_command); return false"><tt><span id="prompt">
@@ -39,12 +40,67 @@
 			})(),
 		};
 
+		var current_file = "";
+		var console_messages = "";
+
+		function update_tabs() {
+			var f, html = "", flist = FS.readdir('.');
+			if (current_file == "") {
+				html += '<tt>[ <b>Console</b>';
+			} else {
+				html += '<tt>[ <span onclick="open_file(\'\')">Console</span>';
+			}
+			for (i in flist) {
+				f = flist[i]
+				if (f == "." || f == "..")
+					continue;
+				if (current_file == f) {
+					html += ' | <b>' + f + '</b>';
+				} else {
+					html += ' | <span onclick="open_file(\'' + f + '\')">' + f + '</span>';
+				}
+			}
+			html += ' | <span onclick="open_file(prompt(\'Filename:\'))">new file</span> ]</tt>';
+			document.getElementById('tabs').innerHTML = html;
+			if (current_file == "") {
+				document.getElementById('output').readOnly = true;
+				document.getElementById('command').focus();
+			} else {
+				document.getElementById('output').readOnly = false;
+				document.getElementById('output').focus();
+			}
+		}
+
+		function open_file(filename)
+		{
+			if (current_file == "")
+				console_messages = document.getElementById('output').value;
+			else
+				FS.writeFile(current_file, document.getElementById('output').value, {encoding: 'utf8'});
+
+			if (filename == "") {
+				document.getElementById('output').value = console_messages;
+			} else {
+				try {
+					document.getElementById('output').value = FS.readFile(filename, {encoding: 'utf8'});
+				} catch (e) {
+					document.getElementById('output').value = "";
+					FS.writeFile(filename, document.getElementById('output').value, {encoding: 'utf8'});
+				}
+			}
+
+			current_file = filename;
+			update_tabs()
+		}
+
 		function startup() {
 			document.getElementById('wait').style.display = 'none';
 			document.getElementById('input').style.display = 'block';
 			document.getElementById('waitmsg').innerText = 'Waiting for yosys.js...';
 			document.getElementById('prompt').innerText = yosys_prompt();
-			document.getElementById('command').focus();
+			FS.mkdir('/work')
+			FS.chdir('/work')
+			update_tabs();
 			console.log('yosys.js loaded.');
 		}
 
@@ -59,7 +115,10 @@
 		function run_command() {
 			var cmd = document.getElementById('command').value;
 			document.getElementById('command').value = '';
+
+			open_file('');
 			Module.print(yosys_prompt() + cmd);
+
 			document.getElementById('wait').style.display = 'block';
 			document.getElementById('input').style.display = 'none';
 
@@ -73,7 +132,7 @@
 				document.getElementById('wait').style.display = 'none';
 				document.getElementById('input').style.display = 'block';
 				document.getElementById('prompt').innerText = yosys_prompt();
-				document.getElementById('command').focus();
+				update_tabs();
 			}
 
 			window.setTimeout(run_command_bh, 50);
-- 
cgit v1.2.3


From 0283703f9e6855226bece8d36567d292bd69b188 Mon Sep 17 00:00:00 2001
From: Clifford Wolf <clifford@clifford.at>
Date: Sun, 15 Feb 2015 22:53:41 +0100
Subject: Added Viz to yosys.js

---
 misc/yosys.html | 81 ++++++++++++++++++++++++++++++++++++++++++++++++++++-----
 1 file changed, 75 insertions(+), 6 deletions(-)

(limited to 'misc')

diff --git a/misc/yosys.html b/misc/yosys.html
index 741b88b45..a5a8b65c9 100644
--- a/misc/yosys.html
+++ b/misc/yosys.html
@@ -2,7 +2,9 @@
 	<title>yosys.js example application</title>
 </head><body onload="document.getElementById('command').focus()">
 	<h1>yosys.js example application</h1>
-	<div id="tabs"></div>
+	<table width="100%"><tr><td><div id="tabs"></div></td><td align="right"><tt>[ <span onclick="load_example()">load example</span> ]</tt></td></tr></table>
+	<iframe id="viz" style="display: none"><script type="text/javascript" src="viz.js"></script></iframe>
+	<svg id="svg" style="display: none; position: absolute; padding: 10px; width: 100%; height: 80%;"></svg>
 	<div><textarea id="output" style="width: 100%" rows="30" cols="100"></textarea></div>
 	<div id="wait" style="display: block"><br/><b><span id="waitmsg">Loading...</span></b></div>
 	<div id="input" style="display: none"><form onsubmit="window.setTimeout(run_command); return false"><tt><span id="prompt">
@@ -42,6 +44,7 @@
 
 		var current_file = "";
 		var console_messages = "";
+		var svg_cache = { };
 
 		function update_tabs() {
 			var f, html = "", flist = FS.readdir('.');
@@ -62,8 +65,10 @@
 			}
 			html += ' | <span onclick="open_file(prompt(\'Filename:\'))">new file</span> ]</tt>';
 			document.getElementById('tabs').innerHTML = html;
-			if (current_file == "") {
-				document.getElementById('output').readOnly = true;
+			if (current_file == "" || /\.dot$/.test(current_file)) {
+				var element = document.getElementById('output');
+				element.readOnly = true;
+				element.scrollTop = element.scrollHeight; // focus on bottom
 				document.getElementById('command').focus();
 			} else {
 				document.getElementById('output').readOnly = false;
@@ -75,7 +80,7 @@
 		{
 			if (current_file == "")
 				console_messages = document.getElementById('output').value;
-			else
+			else if (!/\.dot$/.test(current_file))
 				FS.writeFile(current_file, document.getElementById('output').value, {encoding: 'utf8'});
 
 			if (filename == "") {
@@ -89,21 +94,74 @@
 				}
 			}
 
+			if (/\.dot$/.test(filename)) {
+				dot = document.getElementById('output').value;
+				if (!(dot in svg_cache)) {
+					el = document.getElementById('viz');
+					svg_cache[dot] = el.contentWindow.Viz(dot, "svg");
+				}
+				document.getElementById('svg').innerHTML = svg_cache[dot];
+				document.getElementById('svg').style.display = 'block';
+				document.getElementById('output').value = '';
+			} else {
+				document.getElementById('svg').innerHTML = '';
+				document.getElementById('svg').style.display = 'none';
+			}
+
 			current_file = filename;
 			update_tabs()
 		}
 
 		function startup() {
+			el = document.getElementById('viz');
+			el.contentWindow.document.open();
+			el.contentWindow.document.write('<script type="text/javascript" src="viz.js"></' + 'script>');
+			el.contentWindow.document.close();
+
 			document.getElementById('wait').style.display = 'none';
 			document.getElementById('input').style.display = 'block';
 			document.getElementById('waitmsg').innerText = 'Waiting for yosys.js...';
 			document.getElementById('prompt').innerText = yosys_prompt();
-			FS.mkdir('/work')
-			FS.chdir('/work')
+
+			try { FS.mkdir('/work'); } catch (e) { }
+			FS.chdir('/work');
+
 			update_tabs();
 			console.log('yosys.js loaded.');
 		}
 
+		function load_example() {
+			open_file('')
+
+			var txt = "";
+			txt += "// a simple yosys.js example. run \"script example.ys\".\n";
+			txt += "\n";
+			txt += "module example(input clk, input rst, input inc, output reg [3:0] cnt);\n";
+			txt += "  always @(posedge clk) begin\n";
+			txt += "    if (rst)\n";
+			txt += "      cnt <= 0;\n";
+			txt += "    else if (inc)\n";
+			txt += "      cnt <= cnt + 1;\n";
+			txt += "  end\n";
+			txt += "endmodule\n";
+			txt += "\n";
+			FS.writeFile('example.v', txt, {encoding: 'utf8'});
+
+			var txt = "";
+			txt += "# a simple yosys.js example. run \"script example.ys\".\n";
+			txt += "\n";
+			txt += "design -reset\n";
+			txt += "read_verilog example.v\n";
+			txt += "proc\n";
+			txt += "opt\n";
+			txt += "show\n";
+			txt += "\n";
+			FS.writeFile('example.ys', txt, {encoding: 'utf8'});
+
+			open_file('example.ys')
+			document.getElementById('command').focus();
+		}
+
 		function yosys_command(cmd) {
 			Module.ccall('run', '', ['string'], [cmd])
 		}
@@ -116,6 +174,9 @@
 			var cmd = document.getElementById('command').value;
 			document.getElementById('command').value = '';
 
+			var show_dot_before = "";
+			try { show_dot_before = FS.readFile('show.dot', { encoding: 'utf8' }); } catch (e) { }
+
 			open_file('');
 			Module.print(yosys_prompt() + cmd);
 
@@ -129,9 +190,17 @@
 					Module.print('Caught JavaScript exception. (see JavaScript console for details.)');
 					console.log(e);
 				}
+
 				document.getElementById('wait').style.display = 'none';
 				document.getElementById('input').style.display = 'block';
 				document.getElementById('prompt').innerText = yosys_prompt();
+
+				var show_dot_after = "";
+				try { show_dot_after = FS.readFile('show.dot', { encoding: 'utf8' }); } catch (e) { }
+
+				if (show_dot_before != show_dot_after)
+					open_file('show.dot');
+
 				update_tabs();
 			}
 
-- 
cgit v1.2.3


From 162432a722039734743895b28fae5670ecdd0440 Mon Sep 17 00:00:00 2001
From: Clifford Wolf <clifford@clifford.at>
Date: Mon, 16 Feb 2015 00:11:22 +0100
Subject: More yosys.js improvements

---
 misc/yosys.html | 33 +++++++++++++++++++++++++++++----
 1 file changed, 29 insertions(+), 4 deletions(-)

(limited to 'misc')

diff --git a/misc/yosys.html b/misc/yosys.html
index a5a8b65c9..264a58f96 100644
--- a/misc/yosys.html
+++ b/misc/yosys.html
@@ -8,9 +8,31 @@
 	<div><textarea id="output" style="width: 100%" rows="30" cols="100"></textarea></div>
 	<div id="wait" style="display: block"><br/><b><span id="waitmsg">Loading...</span></b></div>
 	<div id="input" style="display: none"><form onsubmit="window.setTimeout(run_command); return false"><tt><span id="prompt">
-			</span></tt><input id="command" type="text" style="font-family: monospace; font-weight: bold;" size="100"></form></div>
+			</span></tt><input id="command" type="text" onkeydown="history(event)" style="font-family: monospace; font-weight: bold;" size="100"></form></div>
 	<script type='text/javascript'>
 		var got_log_messages = false;
+		var history_log = [];
+		var history_index = 0;
+		var history_bak = "";
+
+		function history(ev) {
+			if (ev.keyCode == 38) {
+				el = document.getElementById('command');
+				if (history_index == history_log.length)
+					history_bak = el.value
+				if (history_index > 0)
+					el.value = history_log[--history_index];
+			}
+			if (ev.keyCode == 40) {
+				if (history_index < history_log.length) {
+					el = document.getElementById('command');
+					if (++history_index < history_log.length)
+						el.value = history_log[history_index];
+					else
+						el.value = history_bak;
+				}
+			}
+		}
 
 		var Module = {
 			print: (function() {
@@ -120,8 +142,8 @@
 
 			document.getElementById('wait').style.display = 'none';
 			document.getElementById('input').style.display = 'block';
-			document.getElementById('waitmsg').innerText = 'Waiting for yosys.js...';
-			document.getElementById('prompt').innerText = yosys_prompt();
+			document.getElementById('waitmsg').textContent = 'Waiting for yosys.js...';
+			document.getElementById('prompt').textContent = yosys_prompt();
 
 			try { FS.mkdir('/work'); } catch (e) { }
 			FS.chdir('/work');
@@ -173,6 +195,9 @@
 		function run_command() {
 			var cmd = document.getElementById('command').value;
 			document.getElementById('command').value = '';
+			if (history_log.length == 0 || history_log[history_log.length-1] != cmd)
+				history_log.push(cmd);
+			history_index = history_log.length;
 
 			var show_dot_before = "";
 			try { show_dot_before = FS.readFile('show.dot', { encoding: 'utf8' }); } catch (e) { }
@@ -193,7 +218,7 @@
 
 				document.getElementById('wait').style.display = 'none';
 				document.getElementById('input').style.display = 'block';
-				document.getElementById('prompt').innerText = yosys_prompt();
+				document.getElementById('prompt').textContent = yosys_prompt();
 
 				var show_dot_after = "";
 				try { show_dot_after = FS.readFile('show.dot', { encoding: 'utf8' }); } catch (e) { }
-- 
cgit v1.2.3


From 33e80b96c7aac6b93e6bee18572abf529f8cc1fa Mon Sep 17 00:00:00 2001
From: Clifford Wolf <clifford@clifford.at>
Date: Mon, 16 Feb 2015 12:41:48 +0100
Subject: Added YosysJS wrapper

---
 misc/yosys.html          | 237 -----------------------------------------------
 misc/yosysjs/demo01.html | 237 +++++++++++++++++++++++++++++++++++++++++++++++
 misc/yosysjs/demo02.html | 102 ++++++++++++++++++++
 misc/yosysjs/yosysjs.js  | 159 +++++++++++++++++++++++++++++++
 4 files changed, 498 insertions(+), 237 deletions(-)
 delete mode 100644 misc/yosys.html
 create mode 100644 misc/yosysjs/demo01.html
 create mode 100644 misc/yosysjs/demo02.html
 create mode 100644 misc/yosysjs/yosysjs.js

(limited to 'misc')

diff --git a/misc/yosys.html b/misc/yosys.html
deleted file mode 100644
index 264a58f96..000000000
--- a/misc/yosys.html
+++ /dev/null
@@ -1,237 +0,0 @@
-<html><head>
-	<title>yosys.js example application</title>
-</head><body onload="document.getElementById('command').focus()">
-	<h1>yosys.js example application</h1>
-	<table width="100%"><tr><td><div id="tabs"></div></td><td align="right"><tt>[ <span onclick="load_example()">load example</span> ]</tt></td></tr></table>
-	<iframe id="viz" style="display: none"><script type="text/javascript" src="viz.js"></script></iframe>
-	<svg id="svg" style="display: none; position: absolute; padding: 10px; width: 100%; height: 80%;"></svg>
-	<div><textarea id="output" style="width: 100%" rows="30" cols="100"></textarea></div>
-	<div id="wait" style="display: block"><br/><b><span id="waitmsg">Loading...</span></b></div>
-	<div id="input" style="display: none"><form onsubmit="window.setTimeout(run_command); return false"><tt><span id="prompt">
-			</span></tt><input id="command" type="text" onkeydown="history(event)" style="font-family: monospace; font-weight: bold;" size="100"></form></div>
-	<script type='text/javascript'>
-		var got_log_messages = false;
-		var history_log = [];
-		var history_index = 0;
-		var history_bak = "";
-
-		function history(ev) {
-			if (ev.keyCode == 38) {
-				el = document.getElementById('command');
-				if (history_index == history_log.length)
-					history_bak = el.value
-				if (history_index > 0)
-					el.value = history_log[--history_index];
-			}
-			if (ev.keyCode == 40) {
-				if (history_index < history_log.length) {
-					el = document.getElementById('command');
-					if (++history_index < history_log.length)
-						el.value = history_log[history_index];
-					else
-						el.value = history_bak;
-				}
-			}
-		}
-
-		var Module = {
-			print: (function() {
-				var element = document.getElementById('output');
-				if (element) element.value = ''; // clear browser cache
-				return function(text) {
-					if (!got_log_messages) {
-						window.setTimeout(startup, 50);
-						got_log_messages = true;
-					}
-					if (element && typeof(text) != "number") {
-						element.value += text + "\n";
-						element.scrollTop = element.scrollHeight; // focus on bottom
-					}
-				};
-			})(),
-			printErr: (function() {
-				var element = document.getElementById('output');
-				if (element) element.value = ''; // clear browser cache
-				return function(text) {
-					if (element && typeof(text) != "number") {
-						console.log(text);
-						if (got_log_messages) {
-							element.value += text + "\n";
-							element.scrollTop = element.scrollHeight; // focus on bottom
-						}
-					}
-				};
-			})(),
-		};
-
-		var current_file = "";
-		var console_messages = "";
-		var svg_cache = { };
-
-		function update_tabs() {
-			var f, html = "", flist = FS.readdir('.');
-			if (current_file == "") {
-				html += '<tt>[ <b>Console</b>';
-			} else {
-				html += '<tt>[ <span onclick="open_file(\'\')">Console</span>';
-			}
-			for (i in flist) {
-				f = flist[i]
-				if (f == "." || f == "..")
-					continue;
-				if (current_file == f) {
-					html += ' | <b>' + f + '</b>';
-				} else {
-					html += ' | <span onclick="open_file(\'' + f + '\')">' + f + '</span>';
-				}
-			}
-			html += ' | <span onclick="open_file(prompt(\'Filename:\'))">new file</span> ]</tt>';
-			document.getElementById('tabs').innerHTML = html;
-			if (current_file == "" || /\.dot$/.test(current_file)) {
-				var element = document.getElementById('output');
-				element.readOnly = true;
-				element.scrollTop = element.scrollHeight; // focus on bottom
-				document.getElementById('command').focus();
-			} else {
-				document.getElementById('output').readOnly = false;
-				document.getElementById('output').focus();
-			}
-		}
-
-		function open_file(filename)
-		{
-			if (current_file == "")
-				console_messages = document.getElementById('output').value;
-			else if (!/\.dot$/.test(current_file))
-				FS.writeFile(current_file, document.getElementById('output').value, {encoding: 'utf8'});
-
-			if (filename == "") {
-				document.getElementById('output').value = console_messages;
-			} else {
-				try {
-					document.getElementById('output').value = FS.readFile(filename, {encoding: 'utf8'});
-				} catch (e) {
-					document.getElementById('output').value = "";
-					FS.writeFile(filename, document.getElementById('output').value, {encoding: 'utf8'});
-				}
-			}
-
-			if (/\.dot$/.test(filename)) {
-				dot = document.getElementById('output').value;
-				if (!(dot in svg_cache)) {
-					el = document.getElementById('viz');
-					svg_cache[dot] = el.contentWindow.Viz(dot, "svg");
-				}
-				document.getElementById('svg').innerHTML = svg_cache[dot];
-				document.getElementById('svg').style.display = 'block';
-				document.getElementById('output').value = '';
-			} else {
-				document.getElementById('svg').innerHTML = '';
-				document.getElementById('svg').style.display = 'none';
-			}
-
-			current_file = filename;
-			update_tabs()
-		}
-
-		function startup() {
-			el = document.getElementById('viz');
-			el.contentWindow.document.open();
-			el.contentWindow.document.write('<script type="text/javascript" src="viz.js"></' + 'script>');
-			el.contentWindow.document.close();
-
-			document.getElementById('wait').style.display = 'none';
-			document.getElementById('input').style.display = 'block';
-			document.getElementById('waitmsg').textContent = 'Waiting for yosys.js...';
-			document.getElementById('prompt').textContent = yosys_prompt();
-
-			try { FS.mkdir('/work'); } catch (e) { }
-			FS.chdir('/work');
-
-			update_tabs();
-			console.log('yosys.js loaded.');
-		}
-
-		function load_example() {
-			open_file('')
-
-			var txt = "";
-			txt += "// a simple yosys.js example. run \"script example.ys\".\n";
-			txt += "\n";
-			txt += "module example(input clk, input rst, input inc, output reg [3:0] cnt);\n";
-			txt += "  always @(posedge clk) begin\n";
-			txt += "    if (rst)\n";
-			txt += "      cnt <= 0;\n";
-			txt += "    else if (inc)\n";
-			txt += "      cnt <= cnt + 1;\n";
-			txt += "  end\n";
-			txt += "endmodule\n";
-			txt += "\n";
-			FS.writeFile('example.v', txt, {encoding: 'utf8'});
-
-			var txt = "";
-			txt += "# a simple yosys.js example. run \"script example.ys\".\n";
-			txt += "\n";
-			txt += "design -reset\n";
-			txt += "read_verilog example.v\n";
-			txt += "proc\n";
-			txt += "opt\n";
-			txt += "show\n";
-			txt += "\n";
-			FS.writeFile('example.ys', txt, {encoding: 'utf8'});
-
-			open_file('example.ys')
-			document.getElementById('command').focus();
-		}
-
-		function yosys_command(cmd) {
-			Module.ccall('run', '', ['string'], [cmd])
-		}
-
-		function yosys_prompt() {
-			return Module.ccall('prompt', 'string', [], [])
-		}
-
-		function run_command() {
-			var cmd = document.getElementById('command').value;
-			document.getElementById('command').value = '';
-			if (history_log.length == 0 || history_log[history_log.length-1] != cmd)
-				history_log.push(cmd);
-			history_index = history_log.length;
-
-			var show_dot_before = "";
-			try { show_dot_before = FS.readFile('show.dot', { encoding: 'utf8' }); } catch (e) { }
-
-			open_file('');
-			Module.print(yosys_prompt() + cmd);
-
-			document.getElementById('wait').style.display = 'block';
-			document.getElementById('input').style.display = 'none';
-
-			function run_command_bh() {
-				try {
-					yosys_command(cmd);
-				} catch (e) {
-					Module.print('Caught JavaScript exception. (see JavaScript console for details.)');
-					console.log(e);
-				}
-
-				document.getElementById('wait').style.display = 'none';
-				document.getElementById('input').style.display = 'block';
-				document.getElementById('prompt').textContent = yosys_prompt();
-
-				var show_dot_after = "";
-				try { show_dot_after = FS.readFile('show.dot', { encoding: 'utf8' }); } catch (e) { }
-
-				if (show_dot_before != show_dot_after)
-					open_file('show.dot');
-
-				update_tabs();
-			}
-
-			window.setTimeout(run_command_bh, 50);
-			return false;
-		}
-	</script>
-	<script async type="text/javascript" src="yosys.js"></script>
-</body></html>
diff --git a/misc/yosysjs/demo01.html b/misc/yosysjs/demo01.html
new file mode 100644
index 000000000..e0ba0248f
--- /dev/null
+++ b/misc/yosysjs/demo01.html
@@ -0,0 +1,237 @@
+<html><head>
+	<title>YosysJS Example Application #01</title>
+</head><body onload="document.getElementById('command').focus()">
+	<h1>YosysJS Example Application #01</h1>
+	<table width="100%"><tr><td><div id="tabs"></div></td><td align="right"><tt>[ <span onclick="load_example()">load example</span> ]</tt></td></tr></table>
+	<iframe id="viz" style="display: none"><script type="text/javascript" src="viz.js"></script></iframe>
+	<svg id="svg" style="display: none; position: absolute; padding: 10px; width: 100%; height: 80%;"></svg>
+	<div><textarea id="output" style="width: 100%" rows="30" cols="100"></textarea></div>
+	<div id="wait" style="display: block"><br/><b><span id="waitmsg">Loading...</span></b></div>
+	<div id="input" style="display: none"><form onsubmit="window.setTimeout(run_command); return false"><tt><span id="prompt">
+			</span></tt><input id="command" type="text" onkeydown="history(event)" style="font-family: monospace; font-weight: bold;" size="100"></form></div>
+	<script type='text/javascript'>
+		var got_log_messages = false;
+		var history_log = [];
+		var history_index = 0;
+		var history_bak = "";
+
+		function history(ev) {
+			if (ev.keyCode == 38) {
+				el = document.getElementById('command');
+				if (history_index == history_log.length)
+					history_bak = el.value
+				if (history_index > 0)
+					el.value = history_log[--history_index];
+			}
+			if (ev.keyCode == 40) {
+				if (history_index < history_log.length) {
+					el = document.getElementById('command');
+					if (++history_index < history_log.length)
+						el.value = history_log[history_index];
+					else
+						el.value = history_bak;
+				}
+			}
+		}
+
+		var Module = {
+			print: (function() {
+				var element = document.getElementById('output');
+				if (element) element.value = ''; // clear browser cache
+				return function(text) {
+					if (!got_log_messages) {
+						window.setTimeout(startup, 50);
+						got_log_messages = true;
+					}
+					if (element && typeof(text) != "number") {
+						element.value += text + "\n";
+						element.scrollTop = element.scrollHeight; // focus on bottom
+					}
+				};
+			})(),
+			printErr: (function() {
+				var element = document.getElementById('output');
+				if (element) element.value = ''; // clear browser cache
+				return function(text) {
+					if (element && typeof(text) != "number") {
+						console.log(text);
+						if (got_log_messages) {
+							element.value += text + "\n";
+							element.scrollTop = element.scrollHeight; // focus on bottom
+						}
+					}
+				};
+			})(),
+		};
+
+		var current_file = "";
+		var console_messages = "";
+		var svg_cache = { };
+
+		function update_tabs() {
+			var f, html = "", flist = FS.readdir('.');
+			if (current_file == "") {
+				html += '<tt>[ <b>Console</b>';
+			} else {
+				html += '<tt>[ <span onclick="open_file(\'\')">Console</span>';
+			}
+			for (i in flist) {
+				f = flist[i]
+				if (f == "." || f == "..")
+					continue;
+				if (current_file == f) {
+					html += ' | <b>' + f + '</b>';
+				} else {
+					html += ' | <span onclick="open_file(\'' + f + '\')">' + f + '</span>';
+				}
+			}
+			html += ' | <span onclick="open_file(prompt(\'Filename:\'))">new file</span> ]</tt>';
+			document.getElementById('tabs').innerHTML = html;
+			if (current_file == "" || /\.dot$/.test(current_file)) {
+				var element = document.getElementById('output');
+				element.readOnly = true;
+				element.scrollTop = element.scrollHeight; // focus on bottom
+				document.getElementById('command').focus();
+			} else {
+				document.getElementById('output').readOnly = false;
+				document.getElementById('output').focus();
+			}
+		}
+
+		function open_file(filename)
+		{
+			if (current_file == "")
+				console_messages = document.getElementById('output').value;
+			else if (!/\.dot$/.test(current_file))
+				FS.writeFile(current_file, document.getElementById('output').value, {encoding: 'utf8'});
+
+			if (filename == "") {
+				document.getElementById('output').value = console_messages;
+			} else {
+				try {
+					document.getElementById('output').value = FS.readFile(filename, {encoding: 'utf8'});
+				} catch (e) {
+					document.getElementById('output').value = "";
+					FS.writeFile(filename, document.getElementById('output').value, {encoding: 'utf8'});
+				}
+			}
+
+			if (/\.dot$/.test(filename)) {
+				dot = document.getElementById('output').value;
+				if (!(dot in svg_cache)) {
+					el = document.getElementById('viz');
+					svg_cache[dot] = el.contentWindow.Viz(dot, "svg");
+				}
+				document.getElementById('svg').innerHTML = svg_cache[dot];
+				document.getElementById('svg').style.display = 'block';
+				document.getElementById('output').value = '';
+			} else {
+				document.getElementById('svg').innerHTML = '';
+				document.getElementById('svg').style.display = 'none';
+			}
+
+			current_file = filename;
+			update_tabs()
+		}
+
+		function startup() {
+			el = document.getElementById('viz');
+			el.contentWindow.document.open();
+			el.contentWindow.document.write('<script type="text/javascript" src="viz.js"></' + 'script>');
+			el.contentWindow.document.close();
+
+			document.getElementById('wait').style.display = 'none';
+			document.getElementById('input').style.display = 'block';
+			document.getElementById('waitmsg').textContent = 'Waiting for yosys.js...';
+			document.getElementById('prompt').textContent = yosys_prompt();
+
+			try { FS.mkdir('/work'); } catch (e) { }
+			FS.chdir('/work');
+
+			update_tabs();
+			console.log('yosys.js loaded.');
+		}
+
+		function load_example() {
+			open_file('')
+
+			var txt = "";
+			txt += "// a simple yosys.js example. run \"script example.ys\".\n";
+			txt += "\n";
+			txt += "module example(input clk, input rst, input inc, output reg [3:0] cnt);\n";
+			txt += "  always @(posedge clk) begin\n";
+			txt += "    if (rst)\n";
+			txt += "      cnt <= 0;\n";
+			txt += "    else if (inc)\n";
+			txt += "      cnt <= cnt + 1;\n";
+			txt += "  end\n";
+			txt += "endmodule\n";
+			txt += "\n";
+			FS.writeFile('example.v', txt, {encoding: 'utf8'});
+
+			var txt = "";
+			txt += "# a simple yosys.js example. run \"script example.ys\".\n";
+			txt += "\n";
+			txt += "design -reset\n";
+			txt += "read_verilog example.v\n";
+			txt += "proc\n";
+			txt += "opt\n";
+			txt += "show\n";
+			txt += "\n";
+			FS.writeFile('example.ys', txt, {encoding: 'utf8'});
+
+			open_file('example.ys')
+			document.getElementById('command').focus();
+		}
+
+		function yosys_command(cmd) {
+			Module.ccall('run', '', ['string'], [cmd])
+		}
+
+		function yosys_prompt() {
+			return Module.ccall('prompt', 'string', [], [])
+		}
+
+		function run_command() {
+			var cmd = document.getElementById('command').value;
+			document.getElementById('command').value = '';
+			if (history_log.length == 0 || history_log[history_log.length-1] != cmd)
+				history_log.push(cmd);
+			history_index = history_log.length;
+
+			var show_dot_before = "";
+			try { show_dot_before = FS.readFile('show.dot', { encoding: 'utf8' }); } catch (e) { }
+
+			open_file('');
+			Module.print(yosys_prompt() + cmd);
+
+			document.getElementById('wait').style.display = 'block';
+			document.getElementById('input').style.display = 'none';
+
+			function run_command_bh() {
+				try {
+					yosys_command(cmd);
+				} catch (e) {
+					Module.print('Caught JavaScript exception. (see JavaScript console for details.)');
+					console.log(e);
+				}
+
+				document.getElementById('wait').style.display = 'none';
+				document.getElementById('input').style.display = 'block';
+				document.getElementById('prompt').textContent = yosys_prompt();
+
+				var show_dot_after = "";
+				try { show_dot_after = FS.readFile('show.dot', { encoding: 'utf8' }); } catch (e) { }
+
+				if (show_dot_before != show_dot_after)
+					open_file('show.dot');
+
+				update_tabs();
+			}
+
+			window.setTimeout(run_command_bh, 50);
+			return false;
+		}
+	</script>
+	<script async type="text/javascript" src="yosys.js"></script>
+</body></html>
diff --git a/misc/yosysjs/demo02.html b/misc/yosysjs/demo02.html
new file mode 100644
index 000000000..ec33198c7
--- /dev/null
+++ b/misc/yosysjs/demo02.html
@@ -0,0 +1,102 @@
+<html><head>
+	<title>YosysJS Example Application #02</title>
+	<script type="text/javascript" src="yosysjs.js"></script>
+</head><body>
+	<div id="popup" style="position: fixed; left: 0; top: 0; width:100%; height:100%; text-align:center; z-index: 1000;"><div
+		style="width:300px; margin: 200px auto; background-color: #88f; border:3px dashed #000;
+		padding:15px; text-align:center;"><span id="popupmsg">Loading...</span></div>
+	</div>
+	<h1>YosysJS Example Application #02</h1>
+	<iframe id="ys" style="width: 800px; height: 100px;"></iframe><p/>
+	<textarea id="code" style="width: 800px; height: 300px;">
+// borrowed with some modifications from
+// http://www.ee.ed.ac.uk/~gerard/Teach/Verilog/manual/Example/lrgeEx2/cooley.html
+module up3down5(clock, data_in, up, down, carry_out, borrow_out, count_out, parity_out);
+
+input [8:0] data_in;
+input clock, up, down;
+
+output reg [8:0] count_out;
+output reg carry_out, borrow_out, parity_out;
+
+reg [9:0] cnt_up, cnt_dn;
+reg [8:0] count_nxt;
+
+always @(posedge clock)
+begin
+	cnt_dn = count_out - 3'b 101;
+	cnt_up = count_out + 2'b 11;
+
+	case ({up,down})
+		2'b 00 : count_nxt = data_in;
+		2'b 01 : count_nxt = cnt_dn;
+		2'b 10 : count_nxt = cnt_up;
+		2'b 11 : count_nxt = count_out;
+		default : count_nxt = 9'bX;
+	endcase
+
+	parity_out  &lt;= ^count_nxt;
+	carry_out   &lt;= up &amp; cnt_up[9];
+	borrow_out  &lt;= down &amp; cnt_dn[9];
+	count_out   &lt;= count_nxt;
+end
+
+endmodule
+	</textarea><p/>
+	<input type="button" value="Before Behavioral Synth" onclick="synth1()">
+	<input type="button" value="After Behavioral Synth" onclick="synth2()">
+	<input type="button" value="After RTL Synth" onclick="synth3()">
+	<input type="button" value="After Gate-Level Synth" onclick="synth4()"><p/>
+	<svg id="svg" width="800"></svg>
+	</td></tr></table>
+	<script type="text/javascript">
+		YosysJS.load_viz();
+		function on_ys_ready() {
+			document.getElementById('popup').style.visibility = 'hidden';
+			document.getElementById('popupmsg').textContent = 'Please wait..';
+		}
+		function synth1() {
+			function work() {
+				ys.write_file("input.v", document.getElementById('code').value);
+				ys.run('design -reset; read_verilog input.v; show -stretch');
+				YosysJS.dot_into_svg(ys.read_file('show.dot'), document.getElementById('svg'));
+				document.getElementById('popup').style.visibility = 'hidden';
+			}
+			document.getElementById('popup').style.visibility = 'visible';
+			window.setTimeout(work, 100);
+		}
+		function synth2() {
+			function work() {
+				ys.write_file("input.v", document.getElementById('code').value);
+				ys.run('design -reset; read_verilog input.v; proc; opt_clean; show -stretch');
+				YosysJS.dot_into_svg(ys.read_file('show.dot'), document.getElementById('svg'));
+				document.getElementById('popup').style.visibility = 'hidden';
+			}
+			document.getElementById('popup').style.visibility = 'visible';
+			window.setTimeout(work, 100);
+		}
+		function synth3() {
+			function work() {
+				ys.write_file("input.v", document.getElementById('code').value);
+				ys.run('design -reset; read_verilog input.v; synth -run coarse; show -stretch');
+				YosysJS.dot_into_svg(ys.read_file('show.dot'), document.getElementById('svg'));
+				document.getElementById('popup').style.visibility = 'hidden';
+			}
+			document.getElementById('popup').style.visibility = 'visible';
+			window.setTimeout(work, 100);
+		}
+		function synth4() {
+			function work() {
+				ys.write_file("input.v", document.getElementById('code').value);
+				ys.run('design -reset; read_verilog input.v; synth -run coarse; synth -run fine; show -stretch');
+				YosysJS.dot_into_svg(ys.read_file('show.dot'), document.getElementById('svg'));
+				document.getElementById('popup').style.visibility = 'hidden';
+			}
+			document.getElementById('popup').style.visibility = 'visible';
+			window.setTimeout(work, 100);
+		}
+		var ys = YosysJS.create('ys', on_ys_ready);
+		ys.verbose = true;
+		ys.echo = true;
+	</script>
+</body></html>
diff --git a/misc/yosysjs/yosysjs.js b/misc/yosysjs/yosysjs.js
new file mode 100644
index 000000000..ad6df348b
--- /dev/null
+++ b/misc/yosysjs/yosysjs.js
@@ -0,0 +1,159 @@
+var YosysJS = new function() {
+	this.script_element = document.currentScript;
+	this.viz_element = undefined;
+
+	this.url_prefix = this.script_element.src.replace(/[^/]+$/, '')
+
+	this.load_viz = function() {
+		if (this.viz_element)
+			return;
+
+		this.viz_element = document.createElement('iframe')
+		this.viz_element.style.display = 'none'
+		document.body.appendChild(this.viz_element);
+
+		this.viz_element.contentWindow.document.open()
+		this.viz_element.contentWindow.document.write('<script type="text/javascript" src="' + this.url_prefix + 'viz.js"></' + 'script>');
+		this.viz_element.contentWindow.document.close()
+	}
+
+	this.dot_to_svg = function(dot_text) {
+		return this.viz_element.contentWindow.Viz(dot_text, "svg");
+	}
+
+	this.dot_into_svg = function(dot_text, svg_element) {
+		svg_element.innerHTML = this.dot_to_svg(dot_text);
+		c = svg_element.firstChild;
+		while (c) {
+			if (c.tagName == 'svg') {
+				while (c.firstChild)
+					svg_element.appendChild(c.firstChild);
+				svg_element.setAttribute('viewBox', c.getAttribute('viewBox'));
+				// svg_element.removeChild(c);
+				break;
+			}
+			c = c.nextSibling;
+		}
+	}
+
+	this.create = function(reference_element, on_ready) {
+		var ys = new Object();
+		ys.init_script = "";
+		ys.ready = false;
+		ys.verbose = false;
+		ys.echo = false;
+
+		if (typeof(reference_element) == 'string')
+			reference_element = document.getElementById(reference_element);
+
+		if (reference_element) {
+			if (reference_element.tagName == 'textarea')
+				ys.init_script = reference_element.value;
+		
+			if (reference_element.tagName == 'iframe') {
+				ys.iframe_element = reference_element;
+			} else {
+				ys.iframe_element = document.createElement('iframe');
+				ys.iframe_element.id = reference_element.id;
+				for (i in reference_element.style)
+					ys.iframe_element.style[i] = reference_element.style[i];
+				reference_element.parentNode.insertBefore(ys.iframe_element, reference_element);
+				reference_element.parentNode.removeChild(reference_element);
+			}
+		} else {
+			ys.iframe_element = document.createElement('iframe');
+			document.body.appendChild(ys.iframe_element);
+		}
+
+		var return_buffer = "";
+		var last_line_empty = false;
+
+		var win = ys.iframe_element.contentWindow;
+		var doc = ys.iframe_element.contentWindow.document;
+		var mod = ys.iframe_element.contentWindow.Module = {
+			print: function(text) {
+				return_buffer += text + "\n";
+				if (ys.verbose) {
+					last_line_empty = text == "";
+					span = doc.createElement('span');
+					span.textContent = text + "\n";
+					span.style.fontFamily = 'monospace';
+					span.style.whiteSpace = 'pre';
+					doc.body.appendChild(span);
+					win.scrollTo(0, doc.body.scrollHeight)
+				}
+				ys.ready = true;
+			},
+			printErr: function(text) {
+				return_buffer += text + "\n";
+				last_line_empty = text == "";
+				span = doc.createElement('span');
+				span.textContent = text + "\n";
+				span.style.fontFamily = 'monospace';
+				span.style.whiteSpace = 'pre';
+				span.style.color = 'red';
+				doc.body.appendChild(span);
+				win.scrollTo(0, doc.body.scrollHeight)
+			},
+		};
+
+		ys.write = function(text) {
+			last_line_empty = text == "";
+			span = doc.createElement('span');
+			span.textContent = text + "\n";
+			span.style.fontFamily = 'monospace';
+			span.style.whiteSpace = 'pre';
+			doc.body.appendChild(span);
+			win.scrollTo(0, doc.body.scrollHeight)
+		}
+
+		ys.prompt = function() {
+			return mod.ccall('prompt', 'string', [], [])
+		}
+
+		ys.run = function(cmd) {
+			return_buffer = "";
+			if (ys.echo) {
+				if (!last_line_empty)
+					ys.write("");
+				ys.write(ys.prompt() + cmd);
+			}
+			mod.ccall('run', '', ['string'], [cmd]);
+			return return_buffer;
+		}
+
+		ys.read_file = function(filename) {
+			return win.FS.readFile(filename, {encoding: 'utf8'});
+		}
+
+		ys.write_file = function(filename, text) {
+			return win.FS.writeFile(filename, text, {encoding: 'utf8'});
+		}
+
+		ys.read_dir = function(dirname) {
+			return win.FS.readdir(dirname);
+		}
+
+		el = doc.createElement('script');
+		el.type = 'text/javascript';
+		el.src = this.url_prefix + 'yosys.js';
+		doc.head.appendChild(el);
+
+		if (on_ready || ys.init_script) {
+			function check_ready() {
+				if (ys.ready) {
+					if (ys.init_script) {
+						ys.write_file("/script.ys", ys.init_script);
+						ys.run("script /script.ys");
+					}
+					if (on_ready)
+						on_ready(ys);
+				} else
+					window.setTimeout(check_ready, 100);
+			}
+			window.setTimeout(check_ready, 100);
+		}
+
+		return ys;
+	}
+}
-- 
cgit v1.2.3


From 3e5e9a38895b0ce45c185916fa946dec38ffbab3 Mon Sep 17 00:00:00 2001
From: Clifford Wolf <clifford@clifford.at>
Date: Mon, 16 Feb 2015 13:23:54 +0100
Subject: More YosysJS stuff

---
 misc/yosysjs/demo01.html | 110 +++++++++++++++--------------------------------
 misc/yosysjs/demo02.html |   8 ++--
 misc/yosysjs/yosysjs.js  |  64 ++++++++++++++++-----------
 3 files changed, 78 insertions(+), 104 deletions(-)

(limited to 'misc')

diff --git a/misc/yosysjs/demo01.html b/misc/yosysjs/demo01.html
index e0ba0248f..1bcd99e6b 100644
--- a/misc/yosysjs/demo01.html
+++ b/misc/yosysjs/demo01.html
@@ -1,16 +1,34 @@
 <html><head>
 	<title>YosysJS Example Application #01</title>
+	<script type="text/javascript" src="yosysjs.js"></script>
 </head><body onload="document.getElementById('command').focus()">
 	<h1>YosysJS Example Application #01</h1>
 	<table width="100%"><tr><td><div id="tabs"></div></td><td align="right"><tt>[ <span onclick="load_example()">load example</span> ]</tt></td></tr></table>
-	<iframe id="viz" style="display: none"><script type="text/javascript" src="viz.js"></script></iframe>
-	<svg id="svg" style="display: none; position: absolute; padding: 10px; width: 100%; height: 80%;"></svg>
+	<svg id="svg" style="display: none; position: absolute; padding: 10px; width: calc(100% - 40px);"></svg>
 	<div><textarea id="output" style="width: 100%" rows="30" cols="100"></textarea></div>
 	<div id="wait" style="display: block"><br/><b><span id="waitmsg">Loading...</span></b></div>
-	<div id="input" style="display: none"><form onsubmit="window.setTimeout(run_command); return false"><tt><span id="prompt">
+	<div id="input" style="display: none"><form onsubmit="window.setTimeout(run_command); return false"><br/><tt><span id="prompt">
 			</span></tt><input id="command" type="text" onkeydown="history(event)" style="font-family: monospace; font-weight: bold;" size="100"></form></div>
 	<script type='text/javascript'>
-		var got_log_messages = false;
+		function print_output(text) {
+			var el = document.getElementById('output');
+			el.value += text + "\n";
+		}
+
+		YosysJS.load_viz();
+		var ys = YosysJS.create("", function() {
+			print_output(ys.print_buffer);
+
+			document.getElementById('wait').style.display = 'none';
+			document.getElementById('input').style.display = 'block';
+			document.getElementById('waitmsg').textContent = 'Waiting for yosys.js...';
+			document.getElementById('prompt').textContent = ys.prompt();
+
+			update_tabs();
+		});
+
+		ys.echo = true;
+
 		var history_log = [];
 		var history_index = 0;
 		var history_bak = "";
@@ -34,42 +52,12 @@
 			}
 		}
 
-		var Module = {
-			print: (function() {
-				var element = document.getElementById('output');
-				if (element) element.value = ''; // clear browser cache
-				return function(text) {
-					if (!got_log_messages) {
-						window.setTimeout(startup, 50);
-						got_log_messages = true;
-					}
-					if (element && typeof(text) != "number") {
-						element.value += text + "\n";
-						element.scrollTop = element.scrollHeight; // focus on bottom
-					}
-				};
-			})(),
-			printErr: (function() {
-				var element = document.getElementById('output');
-				if (element) element.value = ''; // clear browser cache
-				return function(text) {
-					if (element && typeof(text) != "number") {
-						console.log(text);
-						if (got_log_messages) {
-							element.value += text + "\n";
-							element.scrollTop = element.scrollHeight; // focus on bottom
-						}
-					}
-				};
-			})(),
-		};
-
 		var current_file = "";
 		var console_messages = "";
 		var svg_cache = { };
 
 		function update_tabs() {
-			var f, html = "", flist = FS.readdir('.');
+			var f, html = "", flist = ys.read_dir('.');
 			if (current_file == "") {
 				html += '<tt>[ <b>Console</b>';
 			} else {
@@ -103,26 +91,22 @@
 			if (current_file == "")
 				console_messages = document.getElementById('output').value;
 			else if (!/\.dot$/.test(current_file))
-				FS.writeFile(current_file, document.getElementById('output').value, {encoding: 'utf8'});
+				ys.write_file(current_file, document.getElementById('output').value);
 
 			if (filename == "") {
 				document.getElementById('output').value = console_messages;
 			} else {
 				try {
-					document.getElementById('output').value = FS.readFile(filename, {encoding: 'utf8'});
+					document.getElementById('output').value = ys.read_file(filename);
 				} catch (e) {
 					document.getElementById('output').value = "";
-					FS.writeFile(filename, document.getElementById('output').value, {encoding: 'utf8'});
+					ys.write_file(filename, document.getElementById('output').value);
 				}
 			}
 
 			if (/\.dot$/.test(filename)) {
 				dot = document.getElementById('output').value;
-				if (!(dot in svg_cache)) {
-					el = document.getElementById('viz');
-					svg_cache[dot] = el.contentWindow.Viz(dot, "svg");
-				}
-				document.getElementById('svg').innerHTML = svg_cache[dot];
+				YosysJS.dot_into_svg(dot, 'svg');
 				document.getElementById('svg').style.display = 'block';
 				document.getElementById('output').value = '';
 			} else {
@@ -135,21 +119,6 @@
 		}
 
 		function startup() {
-			el = document.getElementById('viz');
-			el.contentWindow.document.open();
-			el.contentWindow.document.write('<script type="text/javascript" src="viz.js"></' + 'script>');
-			el.contentWindow.document.close();
-
-			document.getElementById('wait').style.display = 'none';
-			document.getElementById('input').style.display = 'block';
-			document.getElementById('waitmsg').textContent = 'Waiting for yosys.js...';
-			document.getElementById('prompt').textContent = yosys_prompt();
-
-			try { FS.mkdir('/work'); } catch (e) { }
-			FS.chdir('/work');
-
-			update_tabs();
-			console.log('yosys.js loaded.');
 		}
 
 		function load_example() {
@@ -167,7 +136,7 @@
 			txt += "  end\n";
 			txt += "endmodule\n";
 			txt += "\n";
-			FS.writeFile('example.v', txt, {encoding: 'utf8'});
+			ys.write_file('example.v', txt);
 
 			var txt = "";
 			txt += "# a simple yosys.js example. run \"script example.ys\".\n";
@@ -178,20 +147,12 @@
 			txt += "opt\n";
 			txt += "show\n";
 			txt += "\n";
-			FS.writeFile('example.ys', txt, {encoding: 'utf8'});
+			ys.write_file('example.ys', txt);
 
 			open_file('example.ys')
 			document.getElementById('command').focus();
 		}
 
-		function yosys_command(cmd) {
-			Module.ccall('run', '', ['string'], [cmd])
-		}
-
-		function yosys_prompt() {
-			return Module.ccall('prompt', 'string', [], [])
-		}
-
 		function run_command() {
 			var cmd = document.getElementById('command').value;
 			document.getElementById('command').value = '';
@@ -200,28 +161,28 @@
 			history_index = history_log.length;
 
 			var show_dot_before = "";
-			try { show_dot_before = FS.readFile('show.dot', { encoding: 'utf8' }); } catch (e) { }
+			try { show_dot_before = ys.read_file('show.dot'); } catch (e) { }
 
 			open_file('');
-			Module.print(yosys_prompt() + cmd);
 
 			document.getElementById('wait').style.display = 'block';
 			document.getElementById('input').style.display = 'none';
 
 			function run_command_bh() {
 				try {
-					yosys_command(cmd);
+					ys.run(cmd);
 				} catch (e) {
-					Module.print('Caught JavaScript exception. (see JavaScript console for details.)');
+					ys.write('Caught JavaScript exception. (see JavaScript console for details.)');
 					console.log(e);
 				}
+				print_output(ys.print_buffer);
 
 				document.getElementById('wait').style.display = 'none';
 				document.getElementById('input').style.display = 'block';
-				document.getElementById('prompt').textContent = yosys_prompt();
+				document.getElementById('prompt').textContent = ys.prompt();
 
 				var show_dot_after = "";
-				try { show_dot_after = FS.readFile('show.dot', { encoding: 'utf8' }); } catch (e) { }
+				try { show_dot_after = ys.read_file('show.dot'); } catch (e) { }
 
 				if (show_dot_before != show_dot_after)
 					open_file('show.dot');
@@ -233,5 +194,4 @@
 			return false;
 		}
 	</script>
-	<script async type="text/javascript" src="yosys.js"></script>
 </body></html>
diff --git a/misc/yosysjs/demo02.html b/misc/yosysjs/demo02.html
index ec33198c7..d36e223c9 100644
--- a/misc/yosysjs/demo02.html
+++ b/misc/yosysjs/demo02.html
@@ -59,7 +59,7 @@ endmodule
 			function work() {
 				ys.write_file("input.v", document.getElementById('code').value);
 				ys.run('design -reset; read_verilog input.v; show -stretch');
-				YosysJS.dot_into_svg(ys.read_file('show.dot'), document.getElementById('svg'));
+				YosysJS.dot_into_svg(ys.read_file('show.dot'), 'svg');
 				document.getElementById('popup').style.visibility = 'hidden';
 			}
 			document.getElementById('popup').style.visibility = 'visible';
@@ -69,7 +69,7 @@ endmodule
 			function work() {
 				ys.write_file("input.v", document.getElementById('code').value);
 				ys.run('design -reset; read_verilog input.v; proc; opt_clean; show -stretch');
-				YosysJS.dot_into_svg(ys.read_file('show.dot'), document.getElementById('svg'));
+				YosysJS.dot_into_svg(ys.read_file('show.dot'), 'svg');
 				document.getElementById('popup').style.visibility = 'hidden';
 			}
 			document.getElementById('popup').style.visibility = 'visible';
@@ -79,7 +79,7 @@ endmodule
 			function work() {
 				ys.write_file("input.v", document.getElementById('code').value);
 				ys.run('design -reset; read_verilog input.v; synth -run coarse; show -stretch');
-				YosysJS.dot_into_svg(ys.read_file('show.dot'), document.getElementById('svg'));
+				YosysJS.dot_into_svg(ys.read_file('show.dot'), 'svg');
 				document.getElementById('popup').style.visibility = 'hidden';
 			}
 			document.getElementById('popup').style.visibility = 'visible';
@@ -89,7 +89,7 @@ endmodule
 			function work() {
 				ys.write_file("input.v", document.getElementById('code').value);
 				ys.run('design -reset; read_verilog input.v; synth -run coarse; synth -run fine; show -stretch');
-				YosysJS.dot_into_svg(ys.read_file('show.dot'), document.getElementById('svg'));
+				YosysJS.dot_into_svg(ys.read_file('show.dot'), 'svg');
 				document.getElementById('popup').style.visibility = 'hidden';
 			}
 			document.getElementById('popup').style.visibility = 'visible';
diff --git a/misc/yosysjs/yosysjs.js b/misc/yosysjs/yosysjs.js
index ad6df348b..7c41078eb 100644
--- a/misc/yosysjs/yosysjs.js
+++ b/misc/yosysjs/yosysjs.js
@@ -22,6 +22,8 @@ var YosysJS = new function() {
 	}
 
 	this.dot_into_svg = function(dot_text, svg_element) {
+		if (typeof(svg_element) == 'string')
+			svg_element = document.getElementById(svg_element);
 		svg_element.innerHTML = this.dot_to_svg(dot_text);
 		c = svg_element.firstChild;
 		while (c) {
@@ -62,49 +64,61 @@ var YosysJS = new function() {
 			}
 		} else {
 			ys.iframe_element = document.createElement('iframe');
+			ys.iframe_element.style.display = 'none';
 			document.body.appendChild(ys.iframe_element);
 		}
 
-		var return_buffer = "";
-		var last_line_empty = false;
+		ys.print_buffer = "";
+		ys.last_line_empty = false;
+		ys.got_normal_log_message = false;
+		ys.window = ys.iframe_element.contentWindow;
 
-		var win = ys.iframe_element.contentWindow;
-		var doc = ys.iframe_element.contentWindow.document;
-		var mod = ys.iframe_element.contentWindow.Module = {
+		var doc = ys.window.document;
+		var mod = ys.window.Module = {
 			print: function(text) {
-				return_buffer += text + "\n";
+				if (typeof(text) == 'number')
+					return;
+				ys.print_buffer += text + "\n";
+				ys.got_normal_log_message = true;
 				if (ys.verbose) {
-					last_line_empty = text == "";
+					ys.last_line_empty = text == "";
 					span = doc.createElement('span');
 					span.textContent = text + "\n";
 					span.style.fontFamily = 'monospace';
 					span.style.whiteSpace = 'pre';
 					doc.body.appendChild(span);
-					win.scrollTo(0, doc.body.scrollHeight)
+					ys.window.scrollTo(0, doc.body.scrollHeight)
 				}
 				ys.ready = true;
 			},
 			printErr: function(text) {
-				return_buffer += text + "\n";
-				last_line_empty = text == "";
-				span = doc.createElement('span');
-				span.textContent = text + "\n";
-				span.style.fontFamily = 'monospace';
-				span.style.whiteSpace = 'pre';
-				span.style.color = 'red';
-				doc.body.appendChild(span);
-				win.scrollTo(0, doc.body.scrollHeight)
+				if (typeof(text) == 'number')
+					return;
+				if (ys.got_normal_log_message) {
+					ys.print_buffer += text + "\n";
+					ys.last_line_empty = text == "";
+					span = doc.createElement('span');
+					span.textContent = text + "\n";
+					span.style.fontFamily = 'monospace';
+					span.style.whiteSpace = 'pre';
+					span.style.color = 'red';
+					doc.body.appendChild(span);
+					ys.window.scrollTo(0, doc.body.scrollHeight)
+				} else {
+					console.log(text);
+				}
 			},
 		};
 
 		ys.write = function(text) {
-			last_line_empty = text == "";
+			ys.print_buffer += text + "\n";
+			ys.last_line_empty = text == "";
 			span = doc.createElement('span');
 			span.textContent = text + "\n";
 			span.style.fontFamily = 'monospace';
 			span.style.whiteSpace = 'pre';
 			doc.body.appendChild(span);
-			win.scrollTo(0, doc.body.scrollHeight)
+			ys.window.scrollTo(0, doc.body.scrollHeight)
 		}
 
 		ys.prompt = function() {
@@ -112,26 +126,26 @@ var YosysJS = new function() {
 		}
 
 		ys.run = function(cmd) {
-			return_buffer = "";
+			ys.print_buffer = "";
 			if (ys.echo) {
-				if (!last_line_empty)
+				if (!ys.last_line_empty)
 					ys.write("");
 				ys.write(ys.prompt() + cmd);
 			}
 			mod.ccall('run', '', ['string'], [cmd]);
-			return return_buffer;
+			return ys.print_buffer;
 		}
 
 		ys.read_file = function(filename) {
-			return win.FS.readFile(filename, {encoding: 'utf8'});
+			return ys.window.FS.readFile(filename, {encoding: 'utf8'});
 		}
 
 		ys.write_file = function(filename, text) {
-			return win.FS.writeFile(filename, text, {encoding: 'utf8'});
+			return ys.window.FS.writeFile(filename, text, {encoding: 'utf8'});
 		}
 
 		ys.read_dir = function(dirname) {
-			return win.FS.readdir(dirname);
+			return ys.window.FS.readdir(dirname);
 		}
 
 		el = doc.createElement('script');
-- 
cgit v1.2.3


From 4c22195c38753265c91d2406ba5d8c39e84a0749 Mon Sep 17 00:00:00 2001
From: Clifford Wolf <clifford@clifford.at>
Date: Mon, 16 Feb 2015 14:10:00 +0100
Subject: YosysJS fixes for firefox

---
 misc/yosysjs/demo01.html |  4 ++--
 misc/yosysjs/yosysjs.js  | 60 +++++++++++++++++++++++++++++++-----------------
 2 files changed, 41 insertions(+), 23 deletions(-)

(limited to 'misc')

diff --git a/misc/yosysjs/demo01.html b/misc/yosysjs/demo01.html
index 1bcd99e6b..3f9f737e9 100644
--- a/misc/yosysjs/demo01.html
+++ b/misc/yosysjs/demo01.html
@@ -4,8 +4,8 @@
 </head><body onload="document.getElementById('command').focus()">
 	<h1>YosysJS Example Application #01</h1>
 	<table width="100%"><tr><td><div id="tabs"></div></td><td align="right"><tt>[ <span onclick="load_example()">load example</span> ]</tt></td></tr></table>
-	<svg id="svg" style="display: none; position: absolute; padding: 10px; width: calc(100% - 40px);"></svg>
-	<div><textarea id="output" style="width: 100%" rows="30" cols="100"></textarea></div>
+	<svg id="svg" style="display: none; position: absolute; padding: 10px; width: calc(100% - 40px); height: 480px;"></svg>
+	<div><textarea id="output" style="width: 100%; height: 500px"></textarea></div>
 	<div id="wait" style="display: block"><br/><b><span id="waitmsg">Loading...</span></b></div>
 	<div id="input" style="display: none"><form onsubmit="window.setTimeout(run_command); return false"><br/><tt><span id="prompt">
 			</span></tt><input id="command" type="text" onkeydown="history(event)" style="font-family: monospace; font-weight: bold;" size="100"></form></div>
diff --git a/misc/yosysjs/yosysjs.js b/misc/yosysjs/yosysjs.js
index 7c41078eb..87c951183 100644
--- a/misc/yosysjs/yosysjs.js
+++ b/misc/yosysjs/yosysjs.js
@@ -22,7 +22,7 @@ var YosysJS = new function() {
 	}
 
 	this.dot_into_svg = function(dot_text, svg_element) {
-		if (typeof(svg_element) == 'string')
+		if (typeof(svg_element) == 'string' && svg_element != "")
 			svg_element = document.getElementById(svg_element);
 		svg_element.innerHTML = this.dot_to_svg(dot_text);
 		c = svg_element.firstChild;
@@ -43,9 +43,10 @@ var YosysJS = new function() {
 		ys.init_script = "";
 		ys.ready = false;
 		ys.verbose = false;
+		ys.logprint = false;
 		ys.echo = false;
 
-		if (typeof(reference_element) == 'string')
+		if (typeof(reference_element) == 'string' && reference_element != "")
 			reference_element = document.getElementById(reference_element);
 
 		if (reference_element) {
@@ -80,33 +81,51 @@ var YosysJS = new function() {
 					return;
 				ys.print_buffer += text + "\n";
 				ys.got_normal_log_message = true;
+				if (ys.logprint)
+					console.log(text);
 				if (ys.verbose) {
 					ys.last_line_empty = text == "";
-					span = doc.createElement('span');
-					span.textContent = text + "\n";
-					span.style.fontFamily = 'monospace';
-					span.style.whiteSpace = 'pre';
-					doc.body.appendChild(span);
-					ys.window.scrollTo(0, doc.body.scrollHeight)
+					if (text == "") {
+						span = doc.createElement('br');
+					} else {
+						span = doc.createElement('span');
+						span.textContent = text + "\n";
+						span.style.fontFamily = 'monospace';
+						span.style.whiteSpace = 'pre';
+					}
+					doc.firstChild.appendChild(span);
+					if (doc.body)
+						ys.window.scrollTo(0, doc.body.scrollHeight);
+					else
+						ys.window.scrollBy(0, 100);
 				}
 				ys.ready = true;
 			},
 			printErr: function(text) {
 				if (typeof(text) == 'number')
 					return;
+				if (ys.logprint)
+					console.log(text);
 				if (ys.got_normal_log_message) {
 					ys.print_buffer += text + "\n";
 					ys.last_line_empty = text == "";
-					span = doc.createElement('span');
-					span.textContent = text + "\n";
-					span.style.fontFamily = 'monospace';
-					span.style.whiteSpace = 'pre';
-					span.style.color = 'red';
-					doc.body.appendChild(span);
-					ys.window.scrollTo(0, doc.body.scrollHeight)
-				} else {
+					if (text == "") {
+						span = doc.createElement('br');
+					} else {
+						span = doc.createElement('span');
+						span.textContent = text + "\n";
+						span.style.fontFamily = 'monospace';
+						span.style.whiteSpace = 'pre';
+						span.style.color = 'red';
+					}
+					doc.firstChild.appendChild(span);
+					if (doc.body)
+						ys.window.scrollTo(0, doc.body.scrollHeight);
+					else
+						ys.window.scrollBy(0, 100);
+				} else
+				if (!ys.logprint)
 					console.log(text);
-				}
 			},
 		};
 
@@ -148,10 +167,9 @@ var YosysJS = new function() {
 			return ys.window.FS.readdir(dirname);
 		}
 
-		el = doc.createElement('script');
-		el.type = 'text/javascript';
-		el.src = this.url_prefix + 'yosys.js';
-		doc.head.appendChild(el);
+		doc.open()
+		doc.write('<script type="text/javascript" src="' + this.url_prefix + 'yosys.js"></' + 'script>');
+		doc.close()
 
 		if (on_ready || ys.init_script) {
 			function check_ready() {
-- 
cgit v1.2.3


From e0e6d130cd083a8285ea2991629e0049023da234 Mon Sep 17 00:00:00 2001
From: Clifford Wolf <clifford@clifford.at>
Date: Thu, 19 Feb 2015 13:36:54 +0100
Subject: YosysJS stuff

---
 misc/yosysjs/demo03.html | 103 +++++++++++++++++++++++++++++++++++++++++++++++
 misc/yosysjs/yosysjs.js  |  19 ++++++++-
 2 files changed, 120 insertions(+), 2 deletions(-)
 create mode 100644 misc/yosysjs/demo03.html

(limited to 'misc')

diff --git a/misc/yosysjs/demo03.html b/misc/yosysjs/demo03.html
new file mode 100644
index 000000000..720b82e90
--- /dev/null
+++ b/misc/yosysjs/demo03.html
@@ -0,0 +1,103 @@
+<html><head>
+<title>YosysJS Example Application #02</title>
+<script type="text/javascript" src="yosysjs.js"></script>
+<script src="http://wavedrom.com/skins/default.js" type="text/javascript"></script>
+<script src="http://wavedrom.com/WaveDrom.js" type="text/javascript"></script>
+<style type="text/css">
+.noedit { color: #666; }
+</style>
+<script id="golden_verilog" type="text/plain">
+module ref(input clk, reset, input [7:0] A, output reg [7:0] Y);
+	always @(posedge clk) begin
+		if (reset)
+			Y <= 0;
+		else
+			Y <= ((Y << 5) + Y) ^ A;
+	end
+endmodule
+</script>
+</head><body>
+	<div id="popup" style="position: fixed; left: 0; top: 0; width:100%; height:100%; text-align:center; z-index: 1000;
+		background-color: rgba(100, 100, 100, 0.5);"><div style="width:300px; margin: 200px auto; background-color: #88f;
+		border:3px dashed #000; padding:15px; text-align:center;"><span id="popupmsg">Loading...</span></div>
+	</div>
+	<h1>YosysJS Example Application #03</h1>
+	<b>Your mission:</b> Create a behavioral Verilog model for the following circuit:
+	<p/>
+	<svg id="schem" width="800"></svg>
+	<p/>
+	<pre id="code" style="width: 800px; border:2px solid #000; padding: 0.5em;"><span class="noedit">module top(input clk, reset, input [7:0] A, output reg [7:0] Y);
+  always @(posedge clock) begin</span><span class="edit" contenteditable="true">
+    Y &lt;= A | {4{reset}};
+  </span><span class="noedit">end
+endmodule</span></pre><p/>
+	<input type="button" value="Check Model" onclick="check_model()"> <span id="checkmessage"></span>
+	<p/>
+	<p id="wave">&nbsp;</p>
+	<script type="text/javascript">
+		function on_ys_ready() {
+			ys.write_file('golden.v', document.getElementById('golden_verilog').textContent);
+			ys.run('echo on; read_verilog golden.v; proc;;');
+			ys.run('show -notitle -width -stretch');
+			YosysJS.dot_into_svg(ys.read_file('show.dot'), 'schem');
+			document.getElementById('popup').style.visibility = 'hidden';
+			document.getElementById('popupmsg').textContent = 'Please wait..';
+		}
+		function check_model() {
+			function work() {
+				ys.remove_file('wave.json');
+				ys.write_file('code.v', document.getElementById('code').textContent);
+				ys.errmsg = '';
+				ys.run('design -reset; read_verilog code.v; hierarchy -top top; proc; opt; flatten; hierarchy; ' +
+					'read_verilog golden.v; proc; miter -equiv -ignore_gold_x -make_outputs -flatten ref top miter; ' +
+					'hierarchy -top miter; clean -purge; sat -set-init-undef -seq 8 -dump_json wave.json -show-ports ' +
+					'-max_undef -prove trigger 0 miter');
+				w = document.getElementById('wave')
+				if (ys.errmsg) {
+					w.innerHTML = '<b><pre>ERROR: ' + ys.errmsg.replace('&', '&amp;').replace('<', '&lt;').replace('>', '&gt;') + '</pre></b>';
+				} else {
+					wdata = ys.read_file('wave.json');
+					if (wdata) {
+						console.log(wdata)
+						wdata = JSON.parse(wdata);
+						function wsignal(signame, newname) {
+							for (i = 0; i < wdata["signal"].length; i++)
+								if (wdata["signal"][i].name == signame) {
+									if (newname)
+										wdata["signal"][i].name = newname;
+									return wdata["signal"][i];
+								}
+							return {};
+						}
+						wdata2 = {
+							"signal" : [
+								{ name: 'clk', wave: 'P........' },
+								wsignal("trigger"),
+								{},
+								[ "Inputs", wsignal("in_reset", "reset"), wsignal("in_A", "A") ],
+								{},
+								[ "Y Output", wsignal("gold_Y", "Ref"), wsignal("gate_Y", "UUT") ],
+							],
+							"config" : wdata["config"]
+						};
+						wdata2 = JSON.stringify(wdata2)
+						console.log(wdata2)
+						w.innerHTML = '<b>The model did not pass verification:</b><p/>' +
+								'<script type="WaveDrom">' + wdata2 + '<\/script>';
+						WaveDrom.ProcessAll();
+					} else {
+						w.innerHTML = '<b>Congratulations! The model did pass verification.</b><p/>';
+					}
+				}
+				document.getElementById('popup').style.visibility = 'hidden';
+			}
+			document.getElementById('popup').style.visibility = 'visible';
+			window.setTimeout(work, 100);
+		}
+
+		YosysJS.load_viz();
+		var ys = YosysJS.create('', on_ys_ready);
+		ys.logprint = true;
+		ys.echo = true;
+	</script>
+</body></html>
diff --git a/misc/yosysjs/yosysjs.js b/misc/yosysjs/yosysjs.js
index 87c951183..a1181493e 100644
--- a/misc/yosysjs/yosysjs.js
+++ b/misc/yosysjs/yosysjs.js
@@ -45,6 +45,7 @@ var YosysJS = new function() {
 		ys.verbose = false;
 		ys.logprint = false;
 		ys.echo = false;
+		ys.errmsg = "";
 
 		if (typeof(reference_element) == 'string' && reference_element != "")
 			reference_element = document.getElementById(reference_element);
@@ -151,12 +152,20 @@ var YosysJS = new function() {
 					ys.write("");
 				ys.write(ys.prompt() + cmd);
 			}
-			mod.ccall('run', '', ['string'], [cmd]);
+			try {
+				mod.ccall('run', '', ['string'], [cmd]);
+			} catch (e) {
+				ys.errmsg = mod.ccall('errmsg', 'string', [], []);;
+			}
 			return ys.print_buffer;
 		}
 
 		ys.read_file = function(filename) {
-			return ys.window.FS.readFile(filename, {encoding: 'utf8'});
+			try {
+				return ys.window.FS.readFile(filename, {encoding: 'utf8'});
+			} catch (e) {
+				return "";
+			}
 		}
 
 		ys.write_file = function(filename, text) {
@@ -167,6 +176,12 @@ var YosysJS = new function() {
 			return ys.window.FS.readdir(dirname);
 		}
 
+		ys.remove_file = function(filename) {
+			try {
+				ys.window.FS.unlink(filename);
+			} catch (e) { }
+		}
+
 		doc.open()
 		doc.write('<script type="text/javascript" src="' + this.url_prefix + 'yosys.js"></' + 'script>');
 		doc.close()
-- 
cgit v1.2.3


From 78b991d760d52311c09287a2e20270c83c069b6c Mon Sep 17 00:00:00 2001
From: Clifford Wolf <clifford@clifford.at>
Date: Thu, 19 Feb 2015 13:55:36 +0100
Subject: YosysJS firefox fixes

---
 misc/yosysjs/demo03.html | 3 ---
 misc/yosysjs/yosysjs.js  | 7 +++++--
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'misc')

diff --git a/misc/yosysjs/demo03.html b/misc/yosysjs/demo03.html
index 720b82e90..36cc6cf4a 100644
--- a/misc/yosysjs/demo03.html
+++ b/misc/yosysjs/demo03.html
@@ -58,7 +58,6 @@ endmodule</span></pre><p/>
 				} else {
 					wdata = ys.read_file('wave.json');
 					if (wdata) {
-						console.log(wdata)
 						wdata = JSON.parse(wdata);
 						function wsignal(signame, newname) {
 							for (i = 0; i < wdata["signal"].length; i++)
@@ -81,7 +80,6 @@ endmodule</span></pre><p/>
 							"config" : wdata["config"]
 						};
 						wdata2 = JSON.stringify(wdata2)
-						console.log(wdata2)
 						w.innerHTML = '<b>The model did not pass verification:</b><p/>' +
 								'<script type="WaveDrom">' + wdata2 + '<\/script>';
 						WaveDrom.ProcessAll();
@@ -98,6 +96,5 @@ endmodule</span></pre><p/>
 		YosysJS.load_viz();
 		var ys = YosysJS.create('', on_ys_ready);
 		ys.logprint = true;
-		ys.echo = true;
 	</script>
 </body></html>
diff --git a/misc/yosysjs/yosysjs.js b/misc/yosysjs/yosysjs.js
index a1181493e..b0205bf61 100644
--- a/misc/yosysjs/yosysjs.js
+++ b/misc/yosysjs/yosysjs.js
@@ -137,8 +137,11 @@ var YosysJS = new function() {
 			span.textContent = text + "\n";
 			span.style.fontFamily = 'monospace';
 			span.style.whiteSpace = 'pre';
-			doc.body.appendChild(span);
-			ys.window.scrollTo(0, doc.body.scrollHeight)
+			doc.firstChild.appendChild(span);
+			if (doc.body)
+				ys.window.scrollTo(0, doc.body.scrollHeight);
+			else
+				ys.window.scrollBy(0, 100);
 		}
 
 		ys.prompt = function() {
-- 
cgit v1.2.3


From 1fe15a5973bcd7b5d07ea82fd85545a6e73a20f0 Mon Sep 17 00:00:00 2001
From: Clifford Wolf <clifford@clifford.at>
Date: Sat, 21 Feb 2015 14:25:34 +0100
Subject: YosysJS: Wait for Viz to load

---
 misc/yosysjs/demo03.html | 23 +++++++++++++----------
 misc/yosysjs/yosysjs.js  | 26 ++++++++++++++++++++------
 2 files changed, 33 insertions(+), 16 deletions(-)

(limited to 'misc')

diff --git a/misc/yosysjs/demo03.html b/misc/yosysjs/demo03.html
index 36cc6cf4a..c9386aee8 100644
--- a/misc/yosysjs/demo03.html
+++ b/misc/yosysjs/demo03.html
@@ -24,16 +24,18 @@ endmodule
 	<h1>YosysJS Example Application #03</h1>
 	<b>Your mission:</b> Create a behavioral Verilog model for the following circuit:
 	<p/>
-	<svg id="schem" width="800"></svg>
-	<p/>
-	<pre id="code" style="width: 800px; border:2px solid #000; padding: 0.5em;"><span class="noedit">module top(input clk, reset, input [7:0] A, output reg [7:0] Y);
-  always @(posedge clock) begin</span><span class="edit" contenteditable="true">
-    Y &lt;= A | {4{reset}};
-  </span><span class="noedit">end
-endmodule</span></pre><p/>
-	<input type="button" value="Check Model" onclick="check_model()"> <span id="checkmessage"></span>
-	<p/>
-	<p id="wave">&nbsp;</p>
+	<div id="main" style="visibility: hidden">
+		<svg id="schem" width="800"></svg>
+		<p/>
+		<pre id="code" style="width: 800px; border:2px solid #000; padding: 0.5em;"><span class="noedit">module top(input clk, reset, input [7:0] A, output reg [7:0] Y);
+	  always @(posedge clock) begin</span><span class="edit" contenteditable="true">
+	    Y &lt;= A | {4{reset}};
+	  </span><span class="noedit">end
+	endmodule</span></pre><p/>
+		<input type="button" value="Check Model" onclick="check_model()"> <span id="checkmessage"></span>
+		<p/>
+		<p id="wave">&nbsp;</p>
+	</div>
 	<script type="text/javascript">
 		function on_ys_ready() {
 			ys.write_file('golden.v', document.getElementById('golden_verilog').textContent);
@@ -42,6 +44,7 @@ endmodule</span></pre><p/>
 			YosysJS.dot_into_svg(ys.read_file('show.dot'), 'schem');
 			document.getElementById('popup').style.visibility = 'hidden';
 			document.getElementById('popupmsg').textContent = 'Please wait..';
+			document.getElementById('main').style.visibility = 'visible';
 		}
 		function check_model() {
 			function work() {
diff --git a/misc/yosysjs/yosysjs.js b/misc/yosysjs/yosysjs.js
index b0205bf61..2c78451d2 100644
--- a/misc/yosysjs/yosysjs.js
+++ b/misc/yosysjs/yosysjs.js
@@ -1,6 +1,7 @@
 var YosysJS = new function() {
 	this.script_element = document.currentScript;
 	this.viz_element = undefined;
+	this.viz_ready = true;
 
 	this.url_prefix = this.script_element.src.replace(/[^/]+$/, '')
 
@@ -12,9 +13,21 @@ var YosysJS = new function() {
 		this.viz_element.style.display = 'none'
 		document.body.appendChild(this.viz_element);
 
-		this.viz_element.contentWindow.document.open()
-		this.viz_element.contentWindow.document.write('<script type="text/javascript" src="' + this.url_prefix + 'viz.js"></' + 'script>');
-		this.viz_element.contentWindow.document.close()
+		this.viz_element.contentWindow.document.open();
+		this.viz_element.contentWindow.document.write('<script type="text/javascript" onload="viz_ready = true;" src="' + this.url_prefix + 'viz.js"></' + 'script>');
+		this.viz_element.contentWindow.document.close();
+
+		var that = this;
+		function check_viz_ready() {
+			if (that.viz_element.contentWindow.viz_ready) {
+				console.log("YosysJS: Successfully loaded Viz.");
+				that.viz_ready = true;
+			} else
+				window.setTimeout(check_viz_ready, 100);
+		}
+
+		this.viz_ready = false;
+		window.setTimeout(check_viz_ready, 100);
 	}
 
 	this.dot_to_svg = function(dot_text) {
@@ -40,6 +53,7 @@ var YosysJS = new function() {
 
 	this.create = function(reference_element, on_ready) {
 		var ys = new Object();
+		ys.YosysJS = this;
 		ys.init_script = "";
 		ys.ready = false;
 		ys.verbose = false;
@@ -185,13 +199,13 @@ var YosysJS = new function() {
 			} catch (e) { }
 		}
 
-		doc.open()
+		doc.open();
 		doc.write('<script type="text/javascript" src="' + this.url_prefix + 'yosys.js"></' + 'script>');
-		doc.close()
+		doc.close();
 
 		if (on_ready || ys.init_script) {
 			function check_ready() {
-				if (ys.ready) {
+				if (ys.ready && ys.YosysJS.viz_ready) {
 					if (ys.init_script) {
 						ys.write_file("/script.ys", ys.init_script);
 						ys.run("script /script.ys");
-- 
cgit v1.2.3


From 1f6737f08f812f01e3917389e1fee5a37bd446b6 Mon Sep 17 00:00:00 2001
From: Clifford Wolf <clifford@clifford.at>
Date: Sat, 21 Feb 2015 14:31:02 +0100
Subject: Hotfix for yosysjs/demo03.html

---
 misc/yosysjs/demo03.html | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'misc')

diff --git a/misc/yosysjs/demo03.html b/misc/yosysjs/demo03.html
index c9386aee8..3dc465cbf 100644
--- a/misc/yosysjs/demo03.html
+++ b/misc/yosysjs/demo03.html
@@ -28,10 +28,10 @@ endmodule
 		<svg id="schem" width="800"></svg>
 		<p/>
 		<pre id="code" style="width: 800px; border:2px solid #000; padding: 0.5em;"><span class="noedit">module top(input clk, reset, input [7:0] A, output reg [7:0] Y);
-	  always @(posedge clock) begin</span><span class="edit" contenteditable="true">
-	    Y &lt;= A | {4{reset}};
-	  </span><span class="noedit">end
-	endmodule</span></pre><p/>
+  always @(posedge clock) begin</span><span class="edit" contenteditable="true">
+    Y &lt;= A | {4{reset}};
+  </span><span class="noedit">end
+endmodule</span></pre><p/>
 		<input type="button" value="Check Model" onclick="check_model()"> <span id="checkmessage"></span>
 		<p/>
 		<p id="wave">&nbsp;</p>
-- 
cgit v1.2.3