summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlon Zakai <alonzakai@gmail.com>2015-10-31 12:14:04 -0700
committerAlon Zakai <alonzakai@gmail.com>2015-10-31 12:14:04 -0700
commitb39e36e0b3cc74de46d62f7448058942240555c5 (patch)
treee6851aa81d6ed9a5322fc31c05dc4104f83215bf
parent3dd389f52b556530ec0514fac67277a41a21b47e (diff)
downloadbinaryen-b39e36e0b3cc74de46d62f7448058942240555c5.tar.gz
binaryen-b39e36e0b3cc74de46d62f7448058942240555c5.tar.bz2
binaryen-b39e36e0b3cc74de46d62f7448058942240555c5.zip
start to build interpreter/js
-rwxr-xr-xbuild.sh3
-rw-r--r--src/wasm-interpreter.h (renamed from src/wasm-interpreter.cpp)5
-rw-r--r--src/wasm-js.cpp4
3 files changed, 9 insertions, 3 deletions
diff --git a/build.sh b/build.sh
index fab6e26a6..37e345972 100755
--- a/build.sh
+++ b/build.sh
@@ -1,2 +1,5 @@
+echo "building asm2wasm"
g++ -std=c++11 src/asm2wasm-main.cpp src/parser.cpp src/simple_ast.cpp src/optimizer-shared.cpp -g -o bin/asm2wasm
+echo "building interpreter/js"
+em++ -std=c++11 src/wasm-js.cpp -o bin/wasm.js
diff --git a/src/wasm-interpreter.cpp b/src/wasm-interpreter.h
index d4451d55c..ede2f00df 100644
--- a/src/wasm-interpreter.cpp
+++ b/src/wasm-interpreter.h
@@ -4,11 +4,10 @@
#include "wasm.h"
-using namespace cashew;
-using namespace wasm;
-
namespace wasm {
+using namespace cashew;
+
//
// An instance of a WebAssembly module, which can execute it via AST interpretation
//
diff --git a/src/wasm-js.cpp b/src/wasm-js.cpp
new file mode 100644
index 000000000..ccc589485
--- /dev/null
+++ b/src/wasm-js.cpp
@@ -0,0 +1,4 @@
+
+#include "wasm-interpreter.h"
+
+