Move parts of wasm64 export wrapper generation to build time. NFC

Specifically the metadata about which exports to wrap is now stored in
the compiler rather than the runtime.

Author: sbc100

emscripten.py

@@ -875,6 +875,8 @@ def create_module(sending, receiving, invoke_funcs, metadata):
 
   module.append(receiving)
   module.append(invoke_wrappers)
+  if settings.MEMORY64:
+    module.append(create_wasm64_wrappers(metadata))
   return module
 
 
@@ -929,6 +931,63 @@ def create_invoke_wrappers(invoke_funcs):
   return invoke_wrappers
 
 
+def create_wasm64_wrappers(metadata):
+  # TODO(sbc): Move this into somewhere less static.  Maybe it can become
+  # part of library.js file, even though this metadata relates specifically
+  # to native (non-JS) functions.
+  #
+  # The signature format here is similar to the one used for JS libraries
+  # but with the following as the only valid char:
+  #  '_' - non-pointer argument (pass though unchanged)
+  #  'p' - pointer/int53 argument (convert to/from BigInt)
+  #  'P' - same as above but allow `undefined` to (required extra check)
+  # but any non-pointer arguments should just be ignore as _, and P i
+  mapping = {
+    'sbrk': 'pP',
+    'stackAlloc': 'pp',
+    'emscripten_builtin_malloc': 'pp',
+    'malloc': 'pp',
+    '__getTypeName': 'pp',
+    'setThrew': '_p',
+    'free': '_p',
+    'stackRestore': '_p',
+    '__cxa_is_pointer_type': '_p',
+    'stackSave': 'p',
+    'fflush': '_p',
+    'emscripten_stack_get_end': 'p',
+    'emscripten_stack_get_base': 'p',
+    'pthread_self': 'p',
+    'emscripten_stack_get_current': 'p',
+    '__errno_location': 'p',
+    'emscripten_builtin_memalign': 'ppp',
+    'main': '__PP',
+    'emscripten_stack_set_limits': '_pp',
+    '__set_stack_limits': '_pp',
+    '__cxa_can_catch': '_ppp',
+  }
+
+  wasm64_wrappers = '''
+function instrumentWasmExportsForMemory64(exports) {
+  // First make a copy of the incoming exports object
+  exports = Object.assign({}, exports);'''
+
+  sigs_seen = set()
+  wrap_functions = []
+  for exp in metadata['exports']:
+    sig = mapping.get(exp)
+    if sig:
+      if sig not in sigs_seen:
+        sigs_seen.add(sig)
+        wasm64_wrappers += js_manipulation.make_wasm64_wrapper(sig)
+      wrap_functions.append(exp)
+
+  for f in wrap_functions:
+    sig = mapping[f]
+    wasm64_wrappers += f"\n  exports['{f}'] = _wasm64_wrapper_{sig}(exports['{f}']);"
+  wasm64_wrappers += '\n  return exports\n}'
+  return wasm64_wrappers
+
+
 def normalize_line_endings(text):
   """Normalize to UNIX line endings.
 

src/preamble.js

@@ -50,10 +50,6 @@ if (typeof WebAssembly != 'object') {
 #include "runtime_asan.js"
 #endif
 
-#if MEMORY64
-#include "runtime_wasm64.js"
-#endif
-
 // Wasm globals
 
 var wasmMemory;

src/preamble_minimal.js

@@ -12,10 +12,6 @@
 #include "runtime_asan.js"
 #endif
 
-#if MEMORY64
-#include "runtime_wasm64.js"
-#endif
-
 #if ASSERTIONS || SAFE_HEAP
 /** @type {function(*, string=)} */
 function assert(condition, text) {

src/runtime_wasm64.js

@@ -138,3 +138,30 @@ def make_invoke(sig):
 }''' % (sig, ','.join(args), body, exceptional_ret)
 
   return ret
+
+
+def make_wasm64_wrapper(sig):
+  assert 'p' in sig.lower()
+  n_args = len(sig) - 1
+  args = ['a%d' % i for i in range(n_args)]
+  args_converted = args.copy()
+  for i, arg_type in enumerate(sig[1:]):
+    if arg_type == 'p':
+      args_converted[i] = f'BigInt({args_converted[i]})'
+    elif arg_type == 'P':
+      args_converted[i] = f'BigInt({args_converted[i]} ? {args_converted[i]} : 0)'
+    else:
+      assert arg_type == '_'
+
+  args_in = ', '.join(args)
+  args_out = ', '.join(args_converted)
+  result = f'f({args_out})'
+  if sig[0] == 'p':
+    result = f'Number({result})'
+
+  return f'''
+  function _wasm64_wrapper_{sig}(f) {{
+    return function({args_in}) {{
+      return {result};
+    }};
+  }}'''