Merge remote-tracking branch 'upstream/master'

Conflicts:
	src/intertyper.js
	tests/runner.py

1 files changed, 10 insertions, 0 deletions

diff --git a/src/settings.js b/src/settings.js
index ed3437b1..ab532e67 100644
--- a/src/settings.js
+++ b/src/settings.js
@@ -34,6 +34,12 @@ INVOKE_RUN = 1; // Whether we will call run(). Disable if you embed the generate
                 // 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.
+FAST_MEMORY = 2*1024*1024; // The amount of memory to initialize to 0. This ensures it will be
+                           // in a flat array. This only matters in non-typed array builds.
+TOTAL_MEMORY = 50*1024*1024; // The total amount of memory to use. This mainly matters in
+                             // typed array builds - accessing memory about this value will
+                             // return undefined values and lead to serious problems, and there
+                             // is currently no warning about that!
 
 // Code embetterments
 OPTIMIZE = 0; // Optimize llvm operations into js commands
@@ -129,6 +135,10 @@ RUNTIME_TYPE_INFO = 0; // Whether to expose type info to the script at run time.
                        // to more easily perform operations from handwritten JS on
                        // objects with structures etc.
 
+FAKE_X86_FP80 = 0; // Replaces x86_fp80 with double. This loses precision. It is better,
+                   // if you can, to get the original source code to build without x86_fp80
+                   // (which is nonportable anyhow).
+
 // Compiler debugging options
 DEBUG_TAGS_SHOWING = [];
   // Some useful items: