diff options
| -rw-r--r-- | src/runtime.js | 32 | ||||
| -rw-r--r-- | src/settings.js | 2 |
2 files changed, 20 insertions, 14 deletions
diff --git a/src/runtime.js b/src/runtime.js index 7131bf9c..165ecce6 100644 --- a/src/runtime.js +++ b/src/runtime.js @@ -5,17 +5,19 @@ // itself is as optimized as possible - no unneeded runtime checks). RuntimeGenerator = { - alloc: function(size, type) { + alloc: function(size, type, init) { var ret = type + 'TOP'; if (GUARD_MEMORY) { ret += '; assert(' + size + ' > 0)'; } - var initMemory = 'for (var i = 0; i < ' + size + '; i++) ' + ( - USE_TYPED_ARRAYS ? - 'IHEAP[' + type + 'TOP+i] = FHEAP[' + type + 'TOP+i] = 0' : - 'HEAP[' + type + 'TOP+i] = 0' - ); - ret += '; ' + initMemory; + if (init) { + var initMemory = 'for (var i = 0; i < ' + size + '; i++) ' + ( + USE_TYPED_ARRAYS ? + 'IHEAP[' + type + 'TOP+i] = FHEAP[' + type + 'TOP+i] = 0' : + 'HEAP[' + type + 'TOP+i] = 0' + ); + ret += '; ' + initMemory; + } ret += '; ' + type + 'TOP += ' + size; if (QUANTUM_SIZE > 1) { ret += ';' + RuntimeGenerator.alignMemory(type + 'TOP', QUANTUM_SIZE); @@ -25,7 +27,7 @@ RuntimeGenerator = { // An allocation that lives as long as the current function call stackAlloc: function(size) { - var ret = RuntimeGenerator.alloc(size, 'STACK'); + var ret = RuntimeGenerator.alloc(size, 'STACK', INIT_STACK); if (GUARD_MEMORY) { ret += '; assert(STACKTOP < STACK_ROOT + STACK_MAX)'; } @@ -41,11 +43,13 @@ RuntimeGenerator = { if (GUARD_MEMORY) { ret += '; assert(STACKTOP < STACK_MAX)'; } - var initMemory = 'for (var i = __stackBase__; i < STACKTOP; i++) {' + ( - USE_TYPED_ARRAYS ? - 'IHEAP[i] = FHEAP[i] = 0' : // TODO: Benchmark this. Suboptimal due to type differences? - 'HEAP[i] = 0' - ) + (SAFE_HEAP ? '; SAFE_HEAP_ACCESS(i, null, true)' : '') + ' }'; + if (INIT_STACK) { + var initMemory = 'for (var i = __stackBase__; i < STACKTOP; i++) {' + ( + USE_TYPED_ARRAYS ? + 'IHEAP[i] = FHEAP[i] = 0' : // TODO: Benchmark this. Suboptimal due to type differences? + 'HEAP[i] = 0' + ) + (SAFE_HEAP ? '; SAFE_HEAP_ACCESS(i, null, true)' : '') + ' }'; + } ret += '; ' + initMemory; return ret; }, @@ -61,7 +65,7 @@ RuntimeGenerator = { // An allocation that cannot be free'd staticAlloc: function(size) { - return RuntimeGenerator.alloc(size, 'STATIC'); + return RuntimeGenerator.alloc(size, 'STATIC', INIT_HEAP); }, alignMemory: function(target, quantum) { diff --git a/src/settings.js b/src/settings.js index 0bc6c88d..829d4517 100644 --- a/src/settings.js +++ b/src/settings.js @@ -23,6 +23,8 @@ GUARD_MEMORY = 1; // Whether we should check that each allocation to the stack d // of positive size, etc. INVOKE_RUN = 1; // Whether we will call run(). Disable if you embed the generated // code in your own, and will call run() yourself at the right time +INIT_STACK = 1; // Whether to initialize memory on the stack to 0. +INIT_HEAP = 0; // Whether to initialize memory anywhere other than the stack to 0. // Code embetterments OPTIMIZE = 0; // Optimize llvm operations into js commands |