@@ -143,8 +143,8 @@ def update_settings_glue(wasm_file, metadata):
143
143
settings .WEAK_IMPORTS += webassembly .get_weak_imports (wasm_file )
144
144
145
145
settings .WASM_EXPORTS = metadata .all_exports
146
- settings .WASM_GLOBAL_EXPORTS = list (metadata .namedGlobals .keys ())
147
- settings .HAVE_EM_ASM = bool (settings .MAIN_MODULE or len (metadata .asmConsts ) != 0 )
146
+ settings .WASM_GLOBAL_EXPORTS = list (metadata .global_exports .keys ())
147
+ settings .HAVE_EM_ASM = bool (settings .MAIN_MODULE or len (metadata .em_asm_consts ) != 0 )
148
148
149
149
# start with the MVP features, and add any detected features.
150
150
settings .BINARYEN_FEATURES = ['--mvp-features' ] + metadata .features
@@ -163,7 +163,7 @@ def update_settings_glue(wasm_file, metadata):
163
163
164
164
# When using dynamic linking the main function might be in a side module.
165
165
# To be safe assume they do take input parameters.
166
- settings .MAIN_READS_PARAMS = metadata .mainReadsParams or bool (settings .MAIN_MODULE )
166
+ settings .MAIN_READS_PARAMS = metadata .main_reads_params or bool (settings .MAIN_MODULE )
167
167
if settings .MAIN_READS_PARAMS and not settings .STANDALONE_WASM :
168
168
# callMain depends on this library function
169
169
settings .DEFAULT_LIBRARY_FUNCS_TO_INCLUDE += ['$stringToUTF8OnStack' ]
@@ -173,7 +173,7 @@ def update_settings_glue(wasm_file, metadata):
173
173
# exported. In theory it should always be present since its defined in compiler-rt.
174
174
assert 'emscripten_stack_get_end' in metadata .function_exports
175
175
176
- for deps in metadata .jsDeps :
176
+ for deps in metadata .js_deps :
177
177
settings .DEFAULT_LIBRARY_FUNCS_TO_INCLUDE .extend (deps .split (',' ))
178
178
179
179
@@ -290,19 +290,19 @@ def trim_asm_const_body(body):
290
290
return body
291
291
292
292
293
- def create_named_globals (metadata ):
294
- named_globals = []
295
- for k , v in metadata .namedGlobals .items ():
293
+ def create_global_exports (metadata ):
294
+ global_exports = []
295
+ for k , v in metadata .global_exports .items ():
296
296
v = int (v )
297
297
if settings .RELOCATABLE :
298
298
v += settings .GLOBAL_BASE
299
299
mangled = asmjs_mangle (k )
300
300
if settings .MINIMAL_RUNTIME :
301
- named_globals .append ("var %s = %s;" % (mangled , v ))
301
+ global_exports .append ("var %s = %s;" % (mangled , v ))
302
302
else :
303
- named_globals .append ("var %s = Module['%s'] = %s;" % (mangled , mangled , v ))
303
+ global_exports .append ("var %s = Module['%s'] = %s;" % (mangled , mangled , v ))
304
304
305
- return '\n ' .join (named_globals )
305
+ return '\n ' .join (global_exports )
306
306
307
307
308
308
def emscript (in_wasm , out_wasm , outfile_js , js_syms , finalize = True ):
@@ -340,7 +340,7 @@ def emscript(in_wasm, out_wasm, outfile_js, js_syms, finalize=True):
340
340
if finalize :
341
341
update_settings_glue (out_wasm , metadata )
342
342
343
- if not settings .WASM_BIGINT and metadata .emJsFuncs :
343
+ if not settings .WASM_BIGINT and metadata .em_js_funcs :
344
344
import_map = {}
345
345
346
346
with webassembly .Module (in_wasm ) as module :
@@ -349,7 +349,7 @@ def emscript(in_wasm, out_wasm, outfile_js, js_syms, finalize=True):
349
349
if imp .module not in ('GOT.mem' , 'GOT.func' ):
350
350
import_map [imp .field ] = imp
351
351
352
- for em_js_func , raw in metadata .emJsFuncs .items ():
352
+ for em_js_func , raw in metadata .em_js_funcs .items ():
353
353
c_sig = raw .split ('<::>' )[0 ].strip ('()' )
354
354
if not c_sig or c_sig == 'void' :
355
355
c_sig = []
@@ -405,7 +405,7 @@ def emscript(in_wasm, out_wasm, outfile_js, js_syms, finalize=True):
405
405
if settings .ASYNCIFY == 1 :
406
406
metadata .imports += ['__asyncify_state' , '__asyncify_data' ]
407
407
408
- if metadata .invokeFuncs :
408
+ if metadata .invoke_funcs :
409
409
settings .DEFAULT_LIBRARY_FUNCS_TO_INCLUDE += ['$getWasmTableEntry' ]
410
410
411
411
glue , forwarded_data = compile_javascript ()
@@ -674,7 +674,7 @@ def create_tsd(metadata, embind_tsd):
674
674
675
675
def create_asm_consts (metadata ):
676
676
asm_consts = {}
677
- for addr , const in metadata .asmConsts .items ():
677
+ for addr , const in metadata .em_asm_consts .items ():
678
678
body = trim_asm_const_body (const )
679
679
args = []
680
680
max_arity = 16
@@ -735,7 +735,7 @@ def func_type_to_sig(type):
735
735
def create_em_js (metadata ):
736
736
em_js_funcs = []
737
737
separator = '<::>'
738
- for name , raw in metadata .emJsFuncs .items ():
738
+ for name , raw in metadata .em_js_funcs .items ():
739
739
assert separator in raw
740
740
args , body = raw .split (separator , 1 )
741
741
args = args [1 :- 1 ]
@@ -746,8 +746,8 @@ def create_em_js(metadata):
746
746
arg_names = [arg .split ()[- 1 ].replace ('*' , '' ) for arg in args if arg ]
747
747
args = ',' .join (arg_names )
748
748
func = f'function { name } ({ args } ) { body } '
749
- if (settings .MAIN_MODULE or settings .ASYNCIFY == 2 ) and name in metadata .emJsFuncTypes :
750
- sig = func_type_to_sig (metadata .emJsFuncTypes [name ])
749
+ if (settings .MAIN_MODULE or settings .ASYNCIFY == 2 ) and name in metadata .em_js_func_types :
750
+ sig = func_type_to_sig (metadata .em_js_func_types [name ])
751
751
func = func + f'\n { name } .sig = \' { sig } \' ;'
752
752
em_js_funcs .append (func )
753
753
@@ -816,10 +816,10 @@ def create_sending(metadata, library_symbols):
816
816
# Map of wasm imports to mangled/external/JS names
817
817
send_items_map = {}
818
818
819
- for name in metadata .invokeFuncs :
819
+ for name in metadata .invoke_funcs :
820
820
send_items_map [name ] = name
821
821
for name in metadata .imports :
822
- if name in metadata .emJsFuncs :
822
+ if name in metadata .em_js_funcs :
823
823
send_items_map [name ] = name
824
824
else :
825
825
send_items_map [name ] = asmjs_mangle (name )
@@ -951,7 +951,7 @@ def create_receiving(function_exports):
951
951
952
952
953
953
def create_module (receiving , metadata , library_symbols ):
954
- receiving += create_named_globals (metadata )
954
+ receiving += create_global_exports (metadata )
955
955
module = []
956
956
957
957
sending = create_sending (metadata , library_symbols )
@@ -973,7 +973,7 @@ def create_module(receiving, metadata, library_symbols):
973
973
if settings .SUPPORT_LONGJMP == 'emscripten' or not settings .DISABLE_EXCEPTION_CATCHING :
974
974
module .append (create_invoke_wrappers (metadata ))
975
975
else :
976
- assert not metadata .invokeFuncs , "invoke_ functions exported but exceptions and longjmp are both disabled"
976
+ assert not metadata .invoke_funcs , "invoke_ functions exported but exceptions and longjmp are both disabled"
977
977
if settings .MEMORY64 or settings .CAN_ADDRESS_2GB :
978
978
module .append (create_pointer_conversion_wrappers (metadata ))
979
979
return module
@@ -982,7 +982,7 @@ def create_module(receiving, metadata, library_symbols):
982
982
def create_invoke_wrappers (metadata ):
983
983
"""Asm.js-style exception handling: invoke wrapper generation."""
984
984
invoke_wrappers = ''
985
- for invoke in metadata .invokeFuncs :
985
+ for invoke in metadata .invoke_funcs :
986
986
sig = removeprefix (invoke , 'invoke_' )
987
987
invoke_wrappers += '\n ' + js_manipulation .make_invoke (sig ) + '\n '
988
988
return invoke_wrappers
0 commit comments