cleanup

Author: sbc100

emscripten.py

@@ -665,15 +665,6 @@ def update_settings_glue(metadata):
   shared.Settings.MAX_GLOBAL_ALIGN = metadata['maxGlobalAlign']
   shared.Settings.IMPLEMENTED_FUNCTIONS = metadata['implementedFunctions']
 
-  # addFunction support for Wasm backend
-  if shared.Settings.WASM_BACKEND and shared.Settings.RESERVED_FUNCTION_POINTERS > 0:
-    start_index = metadata['jsCallStartIndex']
-    # e.g. jsCallFunctionType ['v', 'ii'] -> sig2order{'v': 0, 'ii': 1}
-    sig2order = {sig: i for i, sig in enumerate(metadata['jsCallFuncType'])}
-    # Index in the Wasm function table in which jsCall thunk function starts
-    shared.Settings.JSCALL_START_INDEX = start_index
-    shared.Settings.JSCALL_SIG_ORDER = sig2order
-
   # Extract the list of function signatures that MAIN_THREAD_EM_ASM blocks in
   # the compiled code have, each signature will need a proxy function invoker
   # generated for it.
@@ -2382,8 +2373,6 @@ def load_metadata_wasm(metadata_raw, DEBUG):
     'externs': [],
     'simd': False,
     'maxGlobalAlign': 0,
-    'jsCallStartIndex': 0,
-    'jsCallFuncType': [],
     'staticBump': 0,
     'tableSize': 0,
     'initializers': [],

src/support.js

@@ -602,7 +602,7 @@ Module['registerFunctions'] = registerFunctions;
 #if !WASM_BACKEND && EMULATED_FUNCTION_POINTERS == 0
 var jsCallStartIndex = 1;
 var functionPointers = new Array({{{ RESERVED_FUNCTION_POINTERS }}});
-#endif // EMULATED_FUNCTION_POINTERS == 0
+#endif // !WASM_BACKEND && EMULATED_FUNCTION_POINTERS == 0
 
 #if WASM
 // Wraps a JS function as a wasm function with a given signature.
@@ -671,7 +671,6 @@ function convertJsFunctionToWasm(func, sig) {
 }
 
 // Add a wasm function to the table.
-// Attempting to call this with JS function will cause of table.set() to fail
 function addWasmFunction(func, sig) {
   var table = wasmTable;
   var ret = table.length;
@@ -687,10 +686,12 @@ function addWasmFunction(func, sig) {
 
   // Insert new element
   try {
+    // Attempting to call this with JS function will cause of table.set() to fail
     table.set(ret, func);
   } catch (err) {
     if (!err instanceof TypeError)
       throw err;
+    assert(typeof sig !== 'undefined', 'Missing signature argument to addFunction');
     var wrapped = convertJsFunctionToWasm(func, sig);
     table.set(ret, wrapped);
   }
@@ -709,9 +710,6 @@ function addFunction(func, sig) {
 #endif // ASSERTIONS
 
 #if WASM_BACKEND
-  assert(typeof sig !== 'undefined',
-         'Second argument of addFunction should be a wasm function signature ' +
-         'string');
   return addWasmFunction(func, sig);
 #else
 
@@ -753,13 +751,15 @@ function removeFunction(index) {
 #if EMULATED_FUNCTION_POINTERS == 0
   functionPointers[index-jsCallStartIndex] = null;
 #else
+#if !WASM
   alignFunctionTables(); // XXX we should rely on this being an invariant
   var tables = getFunctionTables();
   for (var sig in tables) {
     tables[sig][index] = null;
   }
 #endif
 #endif
+#endif
 }
 
 var funcWrappers = {};