diff options
| author | Jez Ng <me@jezng.com> | 2013-06-22 22:14:31 -0700 |
|---|---|---|
| committer | Jez Ng <me@jezng.com> | 2013-06-22 23:46:31 -0700 |
| commit | 7ff0dde7802ca3596457d3b15ece6949ed380a15 (patch) | |
| tree | e783289f86dca3b2c8970108773175ee97a67173 /emscripten.py | |
| parent | 2b54c4f9164df8e7aced49930926589f7524de42 (diff) | |
| parent | c001e260ef766875fba65ae1f9848cfe6add90c7 (diff) | |
Merge remote-tracking branch 'upstream/incoming' into source-maps
Conflicts:
emcc
tools/js-optimizer.js
tools/js_optimizer.py
Diffstat (limited to 'emscripten.py')
| -rwxr-xr-x | emscripten.py | 20 |
1 files changed, 19 insertions, 1 deletions
diff --git a/emscripten.py b/emscripten.py index c9a5eb59..56f59273 100755 --- a/emscripten.py +++ b/emscripten.py @@ -407,7 +407,7 @@ def emscript(infile, settings, outfile, libraries=[], compiler_engine=None, math_envs = ['Math.min'] # TODO: move min to maths asm_setup += '\n'.join(['var %s = %s;' % (f.replace('.', '_'), f) for f in math_envs]) - basic_funcs = ['abort', 'assert', 'asmPrintInt', 'asmPrintFloat', 'copyTempDouble', 'copyTempFloat'] + [m.replace('.', '_') for m in math_envs] + basic_funcs = ['abort', 'assert', 'asmPrintInt', 'asmPrintFloat'] + [m.replace('.', '_') for m in math_envs] if settings['RESERVED_FUNCTION_POINTERS'] > 0: basic_funcs.append('jsCall') if settings['SAFE_HEAP']: basic_funcs += ['SAFE_HEAP_LOAD', 'SAFE_HEAP_STORE', 'SAFE_HEAP_CLEAR'] if settings['CHECK_HEAP_ALIGN']: basic_funcs += ['CHECK_ALIGN_2', 'CHECK_ALIGN_4', 'CHECK_ALIGN_8'] @@ -555,6 +555,24 @@ var asm = (function(global, env, buffer) { threwValue = value; } } + function copyTempFloat(ptr) { + ptr = ptr|0; + HEAP8[tempDoublePtr] = HEAP8[ptr]; + HEAP8[tempDoublePtr+1|0] = HEAP8[ptr+1|0]; + HEAP8[tempDoublePtr+2|0] = HEAP8[ptr+2|0]; + HEAP8[tempDoublePtr+3|0] = HEAP8[ptr+3|0]; + } + function copyTempDouble(ptr) { + ptr = ptr|0; + HEAP8[tempDoublePtr] = HEAP8[ptr]; + HEAP8[tempDoublePtr+1|0] = HEAP8[ptr+1|0]; + HEAP8[tempDoublePtr+2|0] = HEAP8[ptr+2|0]; + HEAP8[tempDoublePtr+3|0] = HEAP8[ptr+3|0]; + HEAP8[tempDoublePtr+4|0] = HEAP8[ptr+4|0]; + HEAP8[tempDoublePtr+5|0] = HEAP8[ptr+5|0]; + HEAP8[tempDoublePtr+6|0] = HEAP8[ptr+6|0]; + HEAP8[tempDoublePtr+7|0] = HEAP8[ptr+7|0]; + } ''' + ''.join([''' function setTempRet%d(value) { value = value|0; |