diff options
| author | Chad Austin <chad@chadaustin.me> | 2014-04-24 00:12:56 -0700 |
|---|---|---|
| committer | Chad Austin <chad@chadaustin.me> | 2014-04-24 00:12:56 -0700 |
| commit | 2ad793ffc9402a09c393a5cc0f6916dc5cb9f7da (patch) | |
| tree | e6972057012081303780f4bd24ff61516319a1b8 | |
| parent | ef5c2dfb219d6fcb0c5604d8cd25732c28a83e29 (diff) | |
Revert "Export FUNCTION_TABLE_xxx entries to the global asm object for direct access. See issue #2249."
This reverts commit 50bcf89f21c098aa54033733b33cb66c6c56d7ce.
It broke asm.js validation.
| -rwxr-xr-x | emscripten.py | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/emscripten.py b/emscripten.py index 3d75335f..c8122cb9 100755 --- a/emscripten.py +++ b/emscripten.py @@ -480,7 +480,6 @@ def emscript(infile, settings, outfile, libraries=[], compiler_engine=None, asm_runtime_funcs = ['stackAlloc', 'stackSave', 'stackRestore', 'setThrew'] + ['setTempRet%d' % i for i in range(10)] # function tables function_tables = ['dynCall_' + table for table in last_forwarded_json['Functions']['tables']] - function_tables_arrays = ['FUNCTION_TABLE_' + table for table in last_forwarded_json['Functions']['tables']] function_tables_impls = [] for sig in last_forwarded_json['Functions']['tables'].iterkeys(): @@ -517,7 +516,7 @@ def emscript(infile, settings, outfile, libraries=[], compiler_engine=None, exported_implemented_functions.append('runPostSets') exports = [] if not simple: - for export in exported_implemented_functions + asm_runtime_funcs + function_tables + function_tables_arrays: + for export in exported_implemented_functions + asm_runtime_funcs + function_tables: exports.append("%s: %s" % (export, export)) exports = '{ ' + ', '.join(exports) + ' }' else: @@ -1060,7 +1059,6 @@ def emscript_fast(infile, settings, outfile, libraries=[], compiler_engine=None, asm_runtime_funcs = ['stackAlloc', 'stackSave', 'stackRestore', 'setThrew'] + ['setTempRet%d' % i for i in range(10)] # function tables function_tables = ['dynCall_' + table for table in last_forwarded_json['Functions']['tables']] - function_tables_arrays = ['FUNCTION_TABLE_' + table for table in last_forwarded_json['Functions']['tables']] function_tables_impls = [] for sig in last_forwarded_json['Functions']['tables'].iterkeys(): @@ -1097,7 +1095,7 @@ def emscript_fast(infile, settings, outfile, libraries=[], compiler_engine=None, exported_implemented_functions.append('runPostSets') exports = [] if not simple: - for export in exported_implemented_functions + asm_runtime_funcs + function_tables + function_tables_arrays: + for export in exported_implemented_functions + asm_runtime_funcs + function_tables: exports.append("%s: %s" % (export, export)) exports = '{ ' + ', '.join(exports) + ' }' else: |