Skip to content

clean up wasm/js integration, put the integration code alongside its … #4853

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kripken merged 1 commit into from
Jan 11, 2017
Merged

clean up wasm/js integration, put the integration code alongside its … #4853

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 8 additions & 11 deletions emcc.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -437,8 +437,9 @@ def log_time(name):
default_cxx_std = '-std=c++03' # Enforce a consistent C++ standard when compiling .cpp files, if user does not specify one on the cmdline.
use_closure_compiler = None
js_transform = None
pre_js = ''
post_js = ''
pre_js = '' # before all js
post_module = '' # in js, after Module exists
post_js = '' # after all js
preload_files = []
embed_files = []
exclude_files = []
Expand Down Expand Up @@ -1695,12 +1696,15 @@ def save_intermediate(name=None, suffix='js'):
else:
wasm_js_glue = wasm_js_glue.replace('{{{ wasmJSMethod }}}', 'null')
wasm_js_glue = wasm_js_glue.replace('{{{ WASM_BACKEND }}}', str(shared.Settings.WASM_BACKEND)) # if wasm backend, wasm contains memory segments
pre_js = wasm_js_glue + '\n' + pre_js
wasm_js_glue += '\nintegrateWasmJS(Module);\n' # add a call
post_module += wasm_js_glue # we can set up the glue once we have the module

# Apply pre and postjs files
if pre_js or post_js:
if pre_js or post_module or post_js:
logging.debug('applying pre/postjses')
src = open(final).read()
if post_module:
src = src.replace('// {{PREAMBLE_ADDITIONS}}', post_module + '\n// {{PREAMBLE_ADDITIONS}}')
final += '.pp.js'
if WINDOWS: # Avoid duplicating \r\n to \r\r\n when writing out.
if pre_js: pre_js = pre_js.replace('\r\n', '\n')
Expand Down Expand Up @@ -1779,13 +1783,6 @@ def repl(m):
if shared.Settings.FETCH and shared.Settings.USE_PTHREADS:
shared.make_fetch_worker(final, os.path.join(os.path.dirname(os.path.abspath(target)), 'fetch-worker.js'))

if shared.Settings.BINARYEN:
# Insert a call to integrate with wasm.js
js = open(final).read()
js = js.replace('// {{PREAMBLE_ADDITIONS}}', 'integrateWasmJS(Module);\n// {{PREAMBLE_ADDITIONS}}')
final += '.binaryen.js'
open(final, 'w').write(js)

# exit block 'memory initializer'
log_time('memory initializer')

Expand Down