.

Author: sbc100

src/library_sdl.js

@@ -873,7 +873,7 @@ var LibrarySDL = {
       if (!SDL.eventHandler) return;
 
       while (SDL.pollEvent(SDL.eventHandlerTemp)) {
-        tableCall(SDL.eventHandler, SDL.eventHandlerContext, SDL.eventHandlerTemp);
+        Module['dynCall_iii'](SDL.eventHandler, SDL.eventHandlerContext, SDL.eventHandlerTemp);
       }
     },
 

src/preamble.js

@@ -44,7 +44,10 @@ if (typeof WebAssembly !== 'object') {
 
 var wasmMemory;
 
-#include "runtime_table.js"
+// In fastcomp asm.js, we don't need a wasm Table at all.
+// In the wasm backend, we polyfill the WebAssembly object,
+// so this creates a (non-native-wasm) table for us.
+#include "runtime_init_table.js"
 
 #if USE_PTHREADS
 // For sending to workers.
@@ -425,7 +428,11 @@ function callRuntimeCallbacks(callbacks) {
     }
     var func = callback.func;
     if (typeof func === 'number') {
-      tableCall(func, callback.arg);
+      if (callback.arg === undefined) {
+        Module['dynCall_v'](func);
+      } else {
+        Module['dynCall_vi'](func, callback.arg);
+      }
     } else {
       func(callback.arg === undefined ? null : callback.arg);
     }

src/preamble_minimal.js

@@ -102,7 +102,7 @@ assert(buffer instanceof SharedArrayBuffer, 'requested a shared WebAssembly.Memo
 #endif
 #endif
 
-#include "runtime_table.js"
+#include "runtime_init_table.js"
 
 #else
 
@@ -211,7 +211,11 @@ function callRuntimeCallbacks(callbacks) {
     }
     var func = callback.func;
     if (typeof func === 'number') {
-      tableCall(func, callback.arg);
+      if (callback.arg === undefined) {
+        dynCall_v(func);
+      } else {
+        dynCall_vi(func, callback.arg);
+      }
     } else {
       func(callback.arg === undefined ? null : callback.arg);
     }

src/runtime_init_table.js

@@ -0,0 +1,9 @@
+#if !STANDALONE_WASM // standalone wasm creates the table in the wasm
+var wasmTable = new WebAssembly.Table({
+  'initial': {{{ getQuoted('WASM_TABLE_SIZE') }}},
+#if !ALLOW_TABLE_GROWTH
+  'maximum': {{{ getQuoted('WASM_TABLE_SIZE') }}},
+#endif
+  'element': 'anyfunc'
+});
+#endif

src/runtime_table.js

@@ -621,10 +621,7 @@ function dynCall(sig, ptr, args) {
   }
 #endif
 
-  // TODO(sbc): Use ...args once ES6 is allowed:
-  // tableCall(ptr, ...args);
-  // https://github.com/emscripten-core/emscripten/issues/11984
-  return tableCall.apply(null, [ptr].concat(args));
+  return wasmTable.get(ptr).apply(null, args)
 }
 
 var tempRet0 = 0;

src/support.js

@@ -1208,25 +1208,26 @@ def make_jscall(sig):
     return ret
 
   @staticmethod
-  def make_dynCall(sig):
-    # Optimize dynCall accesses in the case when not building with dynamic
-    # linking enabled.
-    if not Settings.MAIN_MODULE and not Settings.SIDE_MODULE:
-      return 'dynCall_' + sig
+  def make_dynCall(sig, args):
+    # wasm2c and asyncify are yet compatible with direct wasm table calls
+    if Settings.ASYNCIFY or Settings.WASM2C or not JS.is_legal_sig(sig):
+      args = ','.join(args)
+      if not Settings.MAIN_MODULE and not Settings.SIDE_MODULE:
+        # Optimize dynCall accesses in the case when not building with dynamic
+        # linking enabled.
+        return 'dynCall_%s(%s)' % (sig, join)
+      else:
+        return 'Module["dynCall_%s"](%s)' % (sig, args)
     else:
-      return 'Module["dynCall_' + sig + '"]'
+      return 'wasmTable.get(%s)(%s)' % (args[0], ','.join(args[1:]))
+
 
   @staticmethod
   def make_invoke(sig, named=True):
     legal_sig = JS.legalize_sig(sig) # TODO: do this in extcall, jscall?
-    args = ','.join(['a' + str(i) for i in range(1, len(legal_sig))])
+    args = ['index'] + ['a' + str(i) for i in range(1, len(legal_sig))]
     ret = 'return ' if sig[0] != 'v' else ''
-    args = 'index' + (',' if args else '') + args
-    # wasm2c doesn't yet support for the new `tableCall`
-    if Settings.WASM2C or not JS.is_legal_sig(sig):
-      body = '%s%s(%s);' % (ret, JS.make_dynCall(sig), args)
-    else:
-      body = '%stableCall(%s);' % (ret, args)
+    body = '%s%s;' % (ret, JS.make_dynCall(sig, args))
     # C++ exceptions are numbers, and longjmp is a string 'longjmp'
     if Settings.SUPPORT_LONGJMP:
       rethrow = "if (e !== e+0 && e !== 'longjmp') throw e;"
@@ -1244,7 +1245,7 @@ def make_invoke(sig, named=True):
     %s
     _setThrew(1, 0);
   }
-}''' % (name, args, body, rethrow)
+}''' % (name, ','.join(args), body, rethrow)
 
     return ret