show clear error message instead of 987 when too many setjmp calls

3 files changed, 15 insertions, 3 deletions

diff --git a/src/library.js b/src/library.js
index 939da8b1..91270c38 100644
--- a/src/library.js
+++ b/src/library.js
@@ -6220,6 +6220,7 @@ LibraryManager.library = {
 
   saveSetjmp__asm: true,
   saveSetjmp__sig: 'iii',
+  saveSetjmp__deps: ['putchar'],
   saveSetjmp: function(env, label, table) {
     // Not particularly fast: slow table lookup of setjmpId to label. But setjmp
     // prevents relooping anyhow, so slowness is to be expected. And typical case
@@ -6233,7 +6234,7 @@ LibraryManager.library = {
 #endif
     setjmpId = (setjmpId+1)|0;
     {{{ makeSetValueAsm('env', '0', 'setjmpId', 'i32') }}};
-    while ((i|0) < {{{ MAX_SETJMPS }}}) {
+    while ((i|0) < {{{ 2*MAX_SETJMPS }}}) {
       if ({{{ makeGetValueAsm('table', 'i*4', 'i32') }}} == 0) {
         {{{ makeSetValueAsm('table', 'i*4', 'setjmpId', 'i32') }}};
         {{{ makeSetValueAsm('table', 'i*4+4', 'label', 'i32') }}};
@@ -6243,7 +6244,8 @@ LibraryManager.library = {
       }
       i = (i+2)|0;
     }
-    abort(987); // if you hit this, adjust MAX_SETJMPS
+    {{{ makePrintChars('too many setjmps in a function call, build with a higher value for MAX_SETJMPS') }}};
+    abort(0);
     return 0;
   },
 
diff --git a/src/parseTools.js b/src/parseTools.js
index 2eb456f1..fe21dfd5 100644
--- a/src/parseTools.js
+++ b/src/parseTools.js
@@ -2363,3 +2363,13 @@ function getTypeFromHeap(suffix) {
   }
 }
 
+// Generates code that prints without printf(), but just putchar (so can be directly inline)
+function makePrintChars(s) {
+  var ret = '';
+  for (var i = 0; i < s.length; i++) {
+    ret += '_putchar(' + s.charCodeAt(i) + ');';
+  }
+  ret += '_putchar(10);';
+  return ret;
+}
+
diff --git a/src/settings.js b/src/settings.js
index 7cd0c02e..d30db173 100644
--- a/src/settings.js
+++ b/src/settings.js
@@ -55,7 +55,7 @@ var ALLOW_MEMORY_GROWTH = 0; // If false, we abort with an error if we try to al
                              // that case we must be careful about optimizations, in particular the
                              // eliminator). Note that memory growth is only supported with typed
                              // arrays.
-var MAX_SETJMPS = 10; // size of setjmp table allocated in each function invocation (that has setjmp)
+var MAX_SETJMPS = 20; // size of setjmp table allocated in each function invocation (that has setjmp)
 
 // Code embetterments
 var MICRO_OPTS = 1; // Various micro-optimizations, like nativizing variables