Fix #14

dynCall_vii is no longer supported on newer versions of Emscripten. I replaced it with my own implementation.

libhalfix.js

@@ -381,12 +381,15 @@
     // Emscripten support code
     // ========================================================================
 
+    var dynCall_vii;
     var cycles, now;
     function run_wrapper2() {
         wrap("emscripten_init")();
 
         now = new Date().getTime();
         cycles = wrap("emscripten_get_cycles");
+        get_now = wrap("emscripten_get_now");
+        dynCall_vii = wrap("emscripten_dyncall_vii");
         run = wrap("emscripten_run");
 
         wrap("emscripten_set_fast")(_halfix.fast);
@@ -891,7 +894,7 @@
      * @param {number} arg2 The second argument
      */
     function fptr_vii(cb, cb_ptr, arg2) {
-        Module["dynCall_vii"](cb, cb_ptr, arg2);
+        dynCall_vii(cb, cb_ptr, arg2);
     }
     /**
      * Copy a string into JavaScript

makefile.js

@@ -189,8 +189,10 @@ if (!result) result = "halfix";
 
 if (build_type === "emscripten") {
     end_flags.push("-s", "WASM=" + wasm);
-    end_flags.push(
-        "-s", "\"EXTRA_EXPORTED_RUNTIME_METHODS=['dynCall_vii']\"");
+    // Emscripten no longer supports dynCall, apparently. 
+    // Should've known better than to rely on an internal, undocumented method. 
+    //end_flags.push(
+    //    "-s", "\"EXTRA_EXPORTED_RUNTIME_METHODS=['dynCall_vii']\"");
     console.log(end_flags);
 }
 

src/emscripten/emscripten.c

@@ -85,13 +85,23 @@ EMSCRIPTEN_KEEPALIVE
 double emscripten_get_cycles(void){
     return (double)cpu_get_cycles();
 }
+EMSCRIPTEN_KEEPALIVE
+double emscripten_get_now(void){
+    return (double)get_now(); 
+}
 
 void pc_set_fast(int yes);
 EMSCRIPTEN_KEEPALIVE
 void emscripten_set_fast(int val){
     pc_set_fast(val);
 }
 
+EMSCRIPTEN_KEEPALIVE
+void emscripten_dyncall_vii(void* func, void* a, int b){
+    // All *_cb() functions have the following signature: void (void*, int)
+    ((void(*)(void*, int))func)(a, b);
+}
+
 // does nothing
 int main()
 {