Skip to content

Commit

Permalink
Format NAMED_GLOBALS in generated JS. NFC. (emscripten-core#8432)
Browse files Browse the repository at this point in the history
Also fix misnamed `func` variable (it actually holds and i32 address)
  • Loading branch information
sbc100 authored and VirtualTim committed May 21, 2019
1 parent 8725504 commit 12a5ae5
Showing 1 changed file with 6 additions and 4 deletions.
10 changes: 6 additions & 4 deletions emscripten.py
Original file line number Diff line number Diff line change
Expand Up @@ -1750,12 +1750,14 @@ def create_named_globals(metadata):
return ''

named_globals = '''
var NAMED_GLOBALS = { %s };
var NAMED_GLOBALS = {
%s
};
for (var named in NAMED_GLOBALS) {
Module['_' + named] = gb + NAMED_GLOBALS[named];
}
Module['NAMED_GLOBALS'] = NAMED_GLOBALS;
''' % ', '.join('"' + k + '": ' + str(v) for k, v in metadata['namedGlobals'].items())
''' % ',\n '.join('"' + k + '": ' + str(v) for k, v in metadata['namedGlobals'].items())

if shared.Settings.WASM:
# wasm side modules are pure wasm, and cannot create their g$..() methods, so we help them out
Expand All @@ -1765,8 +1767,8 @@ def create_named_globals(metadata):
named_globals += '''
for (var named in NAMED_GLOBALS) {
(function(named) {
var func = Module['_' + named];
Module['g$_' + named] = function() { return func };
var addr = Module['_' + named];
Module['g$_' + named] = function() { return addr };
})(named);
}
'''
Expand Down

0 comments on commit 12a5ae5

Please sign in to comment.