Update the loader and the cpp example

Hanks10100 · Jun 25, 2019 · dad3d37 · dad3d37
1 parent 78f4fc3
commit dad3d37
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/cpp/math.c b/cpp/math.c
@@ -1,3 +1,6 @@
+#include <emscripten.h>
+
+EMSCRIPTEN_KEEPALIVE
 int square (int x) {
   return x * x;
 }
diff --git a/cpp/math.wasm b/cpp/math.wasm
diff --git a/loader.js b/loader.js
@@ -1,17 +1,19 @@
 function loadWebAssembly(filename, imports = {}) {
   return fetch(filename)
     .then(response => response.arrayBuffer())
-    .then(buffer => WebAssembly.compile(buffer))
-    .then(module => {
+    .then(buffer => {
       imports.env = imports.env || {}
       Object.assign(imports.env, {
         memoryBase: 0,
         tableBase: 0,
+        __memory_base: 0,
+        __table_base: 0,
         memory: new WebAssembly.Memory({ initial: 256, maximum: 256 }),
         table: new WebAssembly.Table({ initial: 0, maximum: 0, element: 'anyfunc' })
       })
-      return new WebAssembly.Instance(module, imports)
+      return WebAssembly.instantiate(buffer, imports)
     })
+    .then(result => result.instance )
 }
 
 function loadJS (url, imports = {}) {