diff options
| author | Alon Zakai <alonzakai@gmail.com> | 2014-02-24 14:33:34 -0800 |
|---|---|---|
| committer | Alon Zakai <alonzakai@gmail.com> | 2014-02-24 14:33:34 -0800 |
| commit | a75d43ec8dfc66a461dbe736692e70352d7dc556 (patch) | |
| tree | 78004f2935a323dc46bb2db83d72c4458e63ed7f /src | |
| parent | d47a30c26ab0f76c74cb53d9eb54cb049ea05d21 (diff) | |
| parent | cd3e0b2ceef728c27745d1e7f5d6b95671bcaf04 (diff) | |
Merge branch 'fastcomp-by-default' into incoming
Diffstat (limited to 'src')
| -rw-r--r-- | src/library_gc.js | 2 | ||||
| -rw-r--r-- | src/preamble.js | 6 | ||||
| -rw-r--r-- | src/settings.js | 2 |
3 files changed, 6 insertions, 4 deletions
diff --git a/src/library_gc.js b/src/library_gc.js index b3dae0e9..d86f2d15 100644 --- a/src/library_gc.js +++ b/src/library_gc.js @@ -1,4 +1,6 @@ +// WARNING: this is deprecated. You should just build Boehm from source, it is much faster than the toy version written in emscripten + if (GC_SUPPORT) { EXPORTED_FUNCTIONS['_calloc'] = 1; EXPORTED_FUNCTIONS['_realloc'] = 1; diff --git a/src/preamble.js b/src/preamble.js index 27a98422..28a1dcbc 100644 --- a/src/preamble.js +++ b/src/preamble.js @@ -194,9 +194,6 @@ function SAFE_HEAP_STORE(dest, value, bytes, isFloat) { } function SAFE_HEAP_LOAD(dest, bytes, isFloat, unsigned) { -#if SAFE_HEAP_LOG - Module.print('SAFE_HEAP load: ' + [dest, bytes, isFloat, unsigned]); -#endif assert(dest > 0, 'segmentation fault'); assert(dest % bytes === 0); assert(dest < Math.max(DYNAMICTOP, STATICTOP)); @@ -204,6 +201,9 @@ function SAFE_HEAP_LOAD(dest, bytes, isFloat, unsigned) { var type = getSafeHeapType(bytes, isFloat); var ret = getValue(dest, type, 1); if (unsigned) ret = unSign(ret, parseInt(type.substr(1)), 1); +#if SAFE_HEAP_LOG + Module.print('SAFE_HEAP load: ' + [dest, ret, bytes, isFloat, unsigned]); +#endif return ret; } diff --git a/src/settings.js b/src/settings.js index c8114059..1c6b998e 100644 --- a/src/settings.js +++ b/src/settings.js @@ -446,7 +446,7 @@ var HEADLESS = 0; // If 1, will include shim code that tries to 'fake' a browser var BENCHMARK = 0; // If 1, will just time how long main() takes to execute, and not // print out anything at all whatsoever. This is useful for benchmarking. -var ASM_JS = 0; // If 1, generate code in asm.js format. If 2, emits the same code except +var ASM_JS = 1; // If 1, generate code in asm.js format. If 2, emits the same code except // for omitting 'use asm' var PGO = 0; // Enables profile-guided optimization in the form of runtime checks for |