diff options
| author | Alon Zakai <alonzakai@gmail.com> | 2013-07-16 13:41:37 -0700 |
|---|---|---|
| committer | Alon Zakai <alonzakai@gmail.com> | 2013-07-16 13:41:37 -0700 |
| commit | b0d268d121d8868be33d8633b09499b34a4db45f (patch) | |
| tree | d67eaf4f5e200b5b5f57099c46a1413d43cbd287 /src/runtime.js | |
| parent | 6b730836aa53f6b4896f24dd8a4b456669ae4f1a (diff) | |
| parent | 475e72dc5539d9c59fc267927441a502c14a178f (diff) | |
Merge branch 'incoming'
Diffstat (limited to 'src/runtime.js')
| -rw-r--r-- | src/runtime.js | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/runtime.js b/src/runtime.js index e6d5f962..684f11e7 100644 --- a/src/runtime.js +++ b/src/runtime.js @@ -32,7 +32,7 @@ var RuntimeGenerator = { stackEnter: function(initial, force) { if (initial === 0 && SKIP_STACK_IN_SMALL && !force) return ''; - var ret = 'var __stackBase__ = ' + (ASM_JS ? '0; __stackBase__ = ' : '') + 'STACKTOP'; + var ret = 'var sp = ' + (ASM_JS ? '0; sp = ' : '') + 'STACKTOP'; if (initial > 0) ret += '; STACKTOP = (STACKTOP + ' + initial + ')|0'; if (USE_TYPED_ARRAYS == 2) { assert(initial % Runtime.STACK_ALIGN == 0); @@ -44,7 +44,7 @@ var RuntimeGenerator = { ret += '; (assert(' + asmCoercion('(STACKTOP|0) < (STACK_MAX|0)', 'i32') + ')|0)'; } if (false) { - ret += '; _memset(' + asmCoercion('__stackBase__', 'i32') + ', 0, ' + initial + ')'; + ret += '; _memset(' + asmCoercion('sp', 'i32') + ', 0, ' + initial + ')'; } return ret; }, @@ -53,9 +53,9 @@ var RuntimeGenerator = { if (initial === 0 && SKIP_STACK_IN_SMALL && !force) return ''; var ret = ''; if (SAFE_HEAP) { - ret += 'var i = __stackBase__; while ((i|0) < (STACKTOP|0)) { SAFE_HEAP_CLEAR(i|0); i = (i+1)|0 }'; + ret += 'var i = sp; while ((i|0) < (STACKTOP|0)) { SAFE_HEAP_CLEAR(i|0); i = (i+1)|0 }'; } - return ret += 'STACKTOP = __stackBase__'; + return ret += 'STACKTOP = sp'; }, // An allocation that cannot normally be free'd (except through sbrk, which once |