webruby 0.2.7 → 0.9.1

data/modules/emscripten/src/experimental/multiple_heaps.diff

@@ -1,175 +0,0 @@
-diff -r e90280547f0d enzymatic/parser.js
---- a/enzymatic/parser.js	Mon Aug 16 20:31:28 2010 -0700
-+++ b/enzymatic/parser.js	Tue Aug 17 21:00:45 2010 -0700
-@@ -1250,20 +1250,22 @@
- 
-   function makePointer(slab, pos) {
- // XXX hardcoded ptr impl
-+    if (slab == 'HEAP') return pos;
-+    return 'Pointer_make(' + slab + ', ' + (pos ? pos : 0) + ')';
- //    return '{ slab: ' + slab + ', pos: ' + (pos ? pos : 0) + ' }';
--    return '[' + slab + ', ' + (pos ? pos : 0) + ']';
-+//    return '[' + slab + ', ' + (pos ? pos : 0) + ']';
-   }
- 
-   function makeGetSlab(ptr) {
- // XXX hardcoded ptr impl
- //    return ptr + '.slab';
--    return ptr + '[0]';
-+    return 'HEAP';
-   }
- 
-   function makeGetPos(ptr) {
- // XXX hardcoded ptr impl
- //    return ptr + '.pos';
--    return ptr + '[1]';
-+    return ptr;
-   }
- 
-   function makeGetValue(ptr, pos, noNeedFirst) {
-@@ -1275,14 +1277,13 @@
-   }
- 
-   function makeEmptyStruct(type) {
--//    print('// ???? ' + type + ' : ' + (new Error().stack) + dump(TYPES));
--    return TYPES[type].fields.map(function(field) {
--      if (isPointerType(field)) {
--        return makePointer('null');
--      } else {
--        return 0;
--      }
--    });
-+//    print('// ???? ' + type + ' : ' + dump(TYPES));
-+// XXX hardcoded ptr impl
-+    var ret = [];
-+    for (var i = 0; i < TYPES[type].flatSize; i++) {
-+      ret.push(0);
-+    }
-+    return ret;
-   }
- 
-   // globalVariable
-diff -r e90280547f0d enzymatic/postamble.js
---- a/enzymatic/postamble.js	Mon Aug 16 20:31:28 2010 -0700
-+++ b/enzymatic/postamble.js	Tue Aug 17 21:00:45 2010 -0700
-@@ -3,7 +3,7 @@
- 
- function run(args) {
-   var argc = args.length+1;
--  var argv = [intArrayFromString("/bin/this.program") ];
-+  var argv = [Pointer_make(intArrayFromString("/bin/this.program")) ];
-   for (var i = 0; i < argc-1; i = i + 1) {
-     argv.push(Pointer_make(intArrayFromString(args[i])));
-   }
-diff -r e90280547f0d enzymatic/preamble.js
---- a/enzymatic/preamble.js	Mon Aug 16 20:31:28 2010 -0700
-+++ b/enzymatic/preamble.js	Tue Aug 17 21:00:45 2010 -0700
-@@ -6,6 +6,9 @@
- 
- UNDEFINED = null; // None in python; good for pypy
- 
-+HEAP = [];
-+HEAPTOP = 0;
-+
- function abort(text) {
-   text = "ABORT: " + text;
-   print(text + "\n");
-@@ -15,16 +18,24 @@
- }
- 
- function Pointer_niceify(ptr) {
--  if (!ptr.slab)
--    return { slab: ptr[0], pos: ptr[1] };
--  else
--    return ptr;
-+// XXX hardcoded ptr impl
-+  return { slab: HEAP, pos: ptr };
-+//  if (!ptr.slab)
-+//    return { slab: ptr[0], pos: ptr[1] };
-+//  else
-+//    return ptr;
- }
- 
- function Pointer_make(slab, pos) {
-+  pos = pos ? pos : 0;
- // XXX hardcoded ptr impl
-+  if (slab === HEAP) return pos;
-+  var ret = _malloc(Math.max(slab.length - pos, 1));
-+  for (var i = 0; i < slab.length - pos; i++) {
-+    HEAP[ret + i] = slab[pos + i];
-+  }
-+  return ret;
- //  return { slab: slab, pos: pos ? pos : 0 };
--  return [slab, pos ? pos : 0];
- }
- 
- function Pointer_stringify(ptr) {
-@@ -47,20 +58,24 @@
- NULL = Pointer_make([]);
- 
- function _malloc(size) {
-+// XXX hardcoded ptr impl
-+  var ret = HEAPTOP;
-+  HEAPTOP += size;
-+  return ret;
-   // We don't actually do new Array(size) - memory is uninitialized anyhow
--  return Pointer_make([]);
-+//  return Pointer_make([]);
- }
- 
- __Znwj = _malloc; // Mangled "new"
- __Znaj = _malloc; // Mangled "new"
- 
- function _free(ptr) {
-+// XXX hardcoded ptr impl
-   // Nothing needs to be done! But we mark the pointer
-   // as invalid. Note that we should do it for all other
-   // pointers of this slab too.
--// XXX hardcoded ptr impl
- //  ptr.slab = null;
--  ptr[0] = null;
-+//  ptr[0] = null;
- }
- 
- __ZdlPv = _free; // Mangled "delete"
-@@ -90,8 +105,12 @@
- }
- 
- function _strlen(p) {
--  p = Pointer_niceify(p);
--  return p.slab.length; // XXX might want to find the null terminator...
-+// XXX hardcoded ptr impl
-+  var q = p;
-+  while (HEAP[q] != 0) q++;
-+  return q - p;
-+//  p = Pointer_niceify(p);
-+//  return p.slab.length; // XXX might want to find the null terminator...
- }
- 
- // stdlib.h
-@@ -102,9 +121,13 @@
- }
- 
- function _llvm_memcpy_i32(dest, src, num, idunno) {
--  dest = Pointer_niceify(dest);
--  src = Pointer_niceify(src);
--  dest.slab = src.slab.slice(src.pos);
-+// XXX hardcoded ptr impl
-+  for (var i = 0; i < num; i++) {
-+    HEAP[dest + i] = HEAP[src + i];
-+  }
-+//  dest = Pointer_niceify(dest);
-+//  src = Pointer_niceify(src);
-+//  dest.slab = src.slab.slice(src.pos);
- }
- 
- // Tools
-@@ -131,6 +154,7 @@
-     ret.push(stringy.charCodeAt(i));
-     i = i + 1;
-   }
-+  ret.push(0);
-   return ret;
- }
- 
-

data/modules/emscripten/src/experimental/noncallgraphprofiling.diff

@@ -1,197 +0,0 @@
-diff --git a/src/jsifier.js b/src/jsifier.js
-index da8c4db..2d606be 100644
---- a/src/jsifier.js
-+++ b/src/jsifier.js
-@@ -432,12 +432,16 @@ function JSify(data, functionsOnly, givenFunctions, givenGlobalVariables) {
-       func.JS = '\nfunction ' + func.ident + '(' + func.paramIdents.join(', ') + ') {\n';
- 
-       if (PROFILE) {
--        func.JS += '  if (PROFILING) { '
--                +      'var __parentProfilingNode__ = PROFILING_NODE; PROFILING_NODE = PROFILING_NODE.children["' + func.ident + '"]; '
--                +      'if (!PROFILING_NODE) __parentProfilingNode__.children["' + func.ident + '"] = PROFILING_NODE = { time: 0, children: {}, calls: 0 };'
--                +      'PROFILING_NODE.calls++; '
--                +      'var __profilingStartTime__ = Date.now() '
--                +    '}\n';
-+        if (PROFILE_CALLGRAPH) {
-+          func.JS += '  if (PROFILING) { '
-+                  +      'var __parentProfilingNode__ = PROFILING_NODE; PROFILING_NODE = PROFILING_NODE.children["' + func.ident + '"]; '
-+                  +      'if (!PROFILING_NODE) __parentProfilingNode__.children["' + func.ident + '"] = PROFILING_NODE = { time: 0, children: {}, calls: 0 };'
-+                  +      'PROFILING_NODE.calls++; '
-+                  +      'var __profilingStartTime__ = Date.now() '
-+                  +    '}\n';
-+        } else {
-+          func.JS += '  PROFILING_DATA[' + Profiling.getIndex(func.ident) + '] -= Date.now();';
-+        }
-       }
- 
-       func.JS += '  ' + RuntimeGenerator.stackEnter(func.initialStack) + ';\n';
-@@ -733,10 +737,14 @@ function JSify(data, functionsOnly, givenFunctions, givenGlobalVariables) {
-   makeFuncLineActor('return', function(item) {
-     var ret = RuntimeGenerator.stackExit(item.funcData.initialStack) + ';\n';
-     if (PROFILE) {
--      ret += 'if (PROFILING) { '
--          +    'PROFILING_NODE.time += Date.now() - __profilingStartTime__; '
--          +    'PROFILING_NODE = __parentProfilingNode__ '
--          +  '}\n';
-+      if (PROFILE_CALLGRAPH) {
-+        ret += 'if (PROFILING) { '
-+            +    'PROFILING_NODE.time += Date.now() - __profilingStartTime__; '
-+            +    'PROFILING_NODE = __parentProfilingNode__ '
-+            +  '}\n';
-+      } else {
-+        ret += 'PROFILING_DATA[' + Profiling.getIndex(item.funcData.ident) + '] += Date.now();'
-+      }
-     }
-     if (LABEL_DEBUG) {
-       ret += "print(INDENT + 'Exiting: " + item.funcData.ident + "');\n"
-@@ -945,6 +953,9 @@ function JSify(data, functionsOnly, givenFunctions, givenGlobalVariables) {
-     print(shellParts[0]);
-       var preFile = BUILD_AS_SHARED_LIB ? 'preamble_sharedlib.js' : 'preamble.js';
-       var pre = processMacros(preprocess(read(preFile).replace('{{RUNTIME}}', getRuntime()), CONSTANTS));
-+      if (PROFILE && !PROFILE_CALLGRAPH) {
-+        pre = pre.replace('{{PROFILING_DATA}}', Profiling.generateIndexing());
-+      }
-       print(pre);
-       print('Runtime.QUANTUM_SIZE = ' + QUANTUM_SIZE);
-       if (RUNTIME_TYPE_INFO) {
-diff --git a/src/modules.js b/src/modules.js
-index 20f42f9..624c5ae 100644
---- a/src/modules.js
-+++ b/src/modules.js
-@@ -226,13 +226,15 @@ var Functions = {
- 
-   indexedFunctions: [0, 0], // Start at a non-0 (even, see below) value
- 
-+  skip: true,
-+
-   // Mark a function as needing indexing, and returns the index
-   getIndex: function(ident) {
-     var key = this.indexedFunctions.indexOf(ident);
-     if (key < 0) {
-       key = this.indexedFunctions.length;
-       this.indexedFunctions[key] = ident;
--      this.indexedFunctions[key+1] = 0; // Need to have keys be even numbers, see |polymorph| test
-+      if (this.skip) this.indexedFunctions[key+1] = 0; // Need to have keys be even numbers, see |polymorph| test
-     }
-     return key.toString();
-   },
-@@ -281,3 +283,19 @@ var LibraryManager = {
-   }
- };
- 
-+var Profiling = { // We use the same principle of function hashing as in Functions
-+  currFunctions: [],
-+  implementedFunctions: null,
-+  indexedFunctions: [],
-+  getIndex: Functions.getIndex,
-+
-+  generateIndexing: function() {
-+    var ret = 'var PROFILING_DATA = new Array(' + this.indexedFunctions.length + ');\n'
-+            + 'for (var i = 0; i < ' + this.indexedFunctions.length + '; i++) {\n'
-+            + '  PROFILING_DATA[i] = 0;\n'
-+            + '}\n'
-+            + 'var PROFILING_NAMES = ' + JSON.stringify(this.indexedFunctions) + ';\n';
-+    return ret;
-+  }
-+};
-+
-diff --git a/src/preamble.js b/src/preamble.js
-index 1c1ec91..1bda448 100644
---- a/src/preamble.js
-+++ b/src/preamble.js
-@@ -276,22 +276,26 @@ var START_TIME = Date.now();
- 
- #if PROFILE
- var PROFILING = 0;
-+
-+#if PROFILE_CALLGRAPH
- var PROFILING_ROOT = { time: 0, children: {}, calls: 0 };
- var PROFILING_NODE;
--
- function startProfiling() {
-   PROFILING_NODE = PROFILING_ROOT;
-   PROFILING = 1;
- }
- Module['startProfiling'] = startProfiling;
--
- function stopProfiling() {
-   PROFILING = 0;
-   assert(PROFILING_NODE === PROFILING_ROOT, 'Must have popped all the profiling call stack');
- }
- Module['stopProfiling'] = stopProfiling;
-+#else
-+{{PROFILING_DATA}}
-+#endif
- 
- function printProfiling() {
-+#if PROFILE_CALLGRAPH
-   function dumpData(name_, node, indent) {
-     print(indent + ('________' + node.time).substr(-8) + ': ' + name_ + ' (' + node.calls + ')');
-     var children = [];
-@@ -303,9 +307,20 @@ function printProfiling() {
-     children.forEach(function(child) { dumpData(child.name_, child, indent + '  ') });
-   }
-   dumpData('root', PROFILING_ROOT, ' ');
-+#else
-+  var items = [];
-+  for (var i = 0; i < PROFILING_NAMES.length; i++) {
-+    items.push({ name_: PROFILING_NAMES[i], time: PROFILING_DATA[i] });
-+  }
-+  items.sort(function(x, y) { return y.time - x.time });
-+  items.forEach(function(item) {
-+    print(('________' + item.time).substr(-8) + ': ' + item.name_);
-+  });
-+#endif
- }
- Module['printProfiling'] = printProfiling;
- 
-+#if PROFILE_CALLGRAPH
- function printXULProfiling() {
-   function dumpData(name_, node, indent) {
-     var children = [];
-@@ -357,6 +372,7 @@ function printXULProfiling() {
- }
- Module['printXULProfiling'] = printXULProfiling;
- #endif
-+#endif
- 
- //========================================
- // Runtime essentials
-diff --git a/src/settings.js b/src/settings.js
-index ef8b399..749468b 100644
---- a/src/settings.js
-+++ b/src/settings.js
-@@ -114,7 +114,8 @@ AUTO_OPTIMIZE = 0; // When run with the CHECK_* options, will not fail on errors
-                    // checking enabled and which do not, that is, this is a way to automate the
-                    // generation of line data for CORRECT_*_LINES options
- 
--PROFILE = 0; // Enables runtime profiling. See test_profiling for a usage example.
-+PROFILE = 1; // Enables runtime profiling. As lightweight as possible.
-+PROFILE_CALLGRAPH = 0; // Much heavier profiling, of entire callgraphs.
- 
- EXPORTED_FUNCTIONS = ['_main']; // Functions that are explicitly exported, so they are guaranteed to
-                                 // be accessible outside of the generated code.
-diff --git a/tests/runner.py b/tests/runner.py
-index f7ae9b0..3caedad 100644
---- a/tests/runner.py
-+++ b/tests/runner.py
-@@ -3525,16 +3525,16 @@ if 'benchmark' not in str(sys.argv):
-       def post(filename):
-         src = open(filename, 'a')
-         src.write('''
--          startProfiling();
-+          //startProfiling();
-           run();
--          stopProfiling();
-+          //stopProfiling();
-           printProfiling();
-           print('*ok*');
-         ''')
-         src.close()
- 
-       # Using build_ll_hook forces a recompile, which leads to DFE being done even without opts
--      self.do_test(src, ': __Z6inner1i (5000)\n*ok*', post_build=post)
-+      self.do_test(src, ': __Z6inner2i\n*ok*', post_build=post)
- 
-     ### Integration tests
- 

data/modules/emscripten/src/experimental/optimize_memcpy_for_ta1.diff

@@ -1,124 +0,0 @@
-diff --git a/src/analyzer.js b/src/analyzer.js
-index 526d024..a5074e1 100644
---- a/src/analyzer.js
-+++ b/src/analyzer.js
-@@ -462,15 +462,17 @@ function analyzer(data) {
-   //
-   // See settings.js for the meaning of QUANTUM_SIZE. The issue we fix here is,
-   // to correct the .ll assembly code so that things work with QUANTUM_SIZE=1.
-   //
-   substrate.addActor('QuantumFixer', {
-     processItem: function(item) {
-       this.forwardItem(item, 'LabelAnalyzer');
-+dprint('cheez qf!');
-       if (QUANTUM_SIZE !== 1) return;
-+dprint('cheez qf 2!');
- 
-       // ptrs: the indexes of parameters that are pointers, whose originalType is what we want
-       // bytes: the index of the 'bytes' parameter
-       // TODO: malloc, realloc?
-       var FIXABLE_CALLS = {
-         'memcpy': { ptrs: [0,1], bytes: 2 },
-         'memmove': { ptrs: [0,1], bytes: 2 },
-@@ -495,16 +497,22 @@ function analyzer(data) {
-         return [0];
-       }
- 
-       item.functions.forEach(function(func) {
-         function getOriginalType(param) {
-           function get() {
-             if (param.intertype === 'value' && !isNumber(param.ident)) {
--              if (func.variables[param.ident]) {
--                return func.variables[param.ident].originalType || null;
-+              var varData = func.variables[param.ident];
-+              if (varData) {
-+                if (varData.origin == 'load') {
-+                  return varData.type; // we can trust this
-+                }
-+// To continue, we need proper type data inside getelementptr, by using type data. not a one liner.
-+// TESTING: this makes a difference in fasta
-+                return varData.originalType || null;
-               } else {
-                 return item.globalVariables[param.ident].originalType;
-               }
-             } else if (param.intertype === 'bitcast') {
-               return param.params[0].type;
-             } else if (param.intertype === 'getelementptr') {
-               if (param.params[0].type[0] === '[') return param.params[0].type;
-@@ -527,18 +535,21 @@ function analyzer(data) {
-             var fixData = FIXABLE_CALLS[funcIdent];
-             if (!fixData) return;
-             var ptrs = fixData.ptrs.map(function(ptr) { return line.params[ptr] });
-             var bytes = line.params[fixData.bytes].ident;
- 
-             // Only consider original types. This assumes memcpy always has pointers bitcast to i8*
-             var originalTypes = ptrs.map(getOriginalType);
-+dprint('cheez qf 2! ' + dump(func.variables) + ' :: ' + funcIdent + ',' + line.lineNum + ' : ' + dump(ptrs) + ' ==> ' + dump(originalTypes));
-             for (var i = 0; i < originalTypes.length; i++) {
-               if (!originalTypes[i]) return;
-             }
-+dprint('cheez qf 3!');
-             originalTypes = originalTypes.map(function(type) { return removePointing(type) });
-+dprint('zz cheez ' + [funcIdent, originalTypes]);
-             var sizes = originalTypes.map(function(type) { return getSize(Types.types, type) });
-             var fatSizes = originalTypes.map(function(type) { return getSize(Types.fatTypes, type, true) });
-             // The sizes may not be identical, if we copy a descendant class into a parent class. We use
-             // the smaller size in that case. However, this may also be a bug, it is hard to tell, hence a warning
-             warn(dedup(sizes).length === 1, 'All sizes should probably be identical here: ' + dump(originalTypes) + ':' + dump(sizes) + ':' +
-                  line.lineNum);
-             warn(dedup(fatSizes).length === 1, 'All fat sizes should probably be identical here: ' + dump(originalTypes) + ':' + dump(sizes) + ':' +
-diff --git a/src/parseTools.js b/src/parseTools.js
-index 024026c..a15b89f 100644
---- a/src/parseTools.js
-+++ b/src/parseTools.js
-@@ -1078,14 +1078,29 @@ function makeSetValues(ptr, pos, value, type, num) {
-       '}'
-   }
- }
- 
- var TYPED_ARRAY_SET_MIN = Infinity; // .set() as memcpy seems to just slow us down
- 
- function makeCopyValues(dest, src, num, type, modifier) {
-+  return '/* zz1 */ ' + makeCopyValuesX(dest, src, num, type, modifier) + ';' +
-+         makeCopyValuesX(dest, src, num, type, modifier) + ';' +
-+         makeCopyValuesX(dest, src, num, type, modifier) + ';' +
-+         makeCopyValuesX(dest, src, num, type, modifier) + ';' +
-+         makeCopyValuesX(dest, src, num, type, modifier) + ';' +
-+         makeCopyValuesX(dest, src, num, type, modifier) + ';' +
-+         makeCopyValuesX(dest, src, num, type, modifier) + ';' +
-+         makeCopyValuesX(dest, src, num, type, modifier) + ';' +
-+         makeCopyValuesX(dest, src, num, type, modifier) + ';' +
-+         makeCopyValuesX(dest, src, num, type, modifier) + ';' +
-+         makeCopyValuesX(dest, src, num, type, modifier) + ';' +
-+         makeCopyValuesX(dest, src, num, type, modifier) + '; /* zz2*/';
-+}
-+
-+function makeCopyValuesX(dest, src, num, type, modifier) {
-   function safety(to, from) {
-     to = to || (dest + '+' + 'mcpi');
-     from = from || (src + '+' + 'mcpi');
-     return (SAFE_HEAP ? 'SAFE_HEAP_COPY_HISTORY(' + to + ', ' + from + ')' : '');
-   }
-   if (USE_TYPED_ARRAYS <= 1) {
-     if (isNumber(num)) {
-diff --git a/src/utility.js b/src/utility.js
-index 1ebbe52..1724c62 100644
---- a/src/utility.js
-+++ b/src/utility.js
-@@ -15,15 +15,15 @@ function dump(item) {
-     while (text.length > 80) {
-       ret += '// ' + text.substr(0,80) + '\n';
-       text = text.substr(80);
-     }
-     return ret + '// ' + text;
-   }
-   try {
--    return lineify(JSON.stringify(item).substr(0, 80*25));
-+    return lineify(JSON.stringify(item).substr(0, 800*25));
-   } catch(e) {
-     var ret = [];
-     for (var i in item) {
-       var j = item[i];
-       if (typeof j === 'string' || typeof j === 'number') {
-         ret.push(i + ': ' + j);
-       } else {

data/modules/emscripten/src/experimental/remove__label__s.diff

@@ -1,140 +0,0 @@
-diff --git a/src/analyzer.js b/src/analyzer.js
-index d0c3cb7..bbeceed 100644
---- a/src/analyzer.js
-+++ b/src/analyzer.js
-@@ -768,18 +768,19 @@ function analyzer(data) {
-     }
- 
-     operateOnLabels(line, function process(item, id) {
-+dprint('zz consider replacing: ' + [item[id], ' ^^^^ ', wildcardParts]);
-       if (item[id] in labelIds || (wildcard && wildcardCheck(item[id]))) {
-         ret.push(item[id]);
--        dprint('relooping', 'zz ' + id + ' replace ' + item[id] + ' with ' + toLabelId);
-         if (toLabelId) {
-           // replace wildcards in new value with old parts
-           var oldParts = item[id].split('|');
-           var newParts = toLabelId.split('|');
--          for (var i = 1; i < 3; i++) {
-+          for (var i = 0; i < 3; i++) {
-             if (newParts[i] === '*') newParts[i] = oldParts[i];
-           }
-           item[id] = newParts.join('|') + '|' + item[id];
-         }
-+        dprint('relooping', 'zz ' + id + ' replace ' + ret[ret.length-1] + ' with ' + toLabelId + ' ==> ' + item[id]);
-       }
-     });
-     return ret;
-@@ -1204,8 +1205,6 @@ function analyzer(data) {
- 
-       // Checks whether we actually need labels. We return whether we have a loop nested inside us.
-       function optimizeOutUnneededLabels(block) {
--        if (!block) return false;
--
-         dprint('relooping', "//    optimizing (2) block: " + block.type + ' : ' + block.entries);
- 
-         var containLoop = sum(recurseBlock(block, optimizeOutUnneededLabels)) > 0;
-@@ -1227,12 +1226,39 @@ function analyzer(data) {
-         return assert(false);
-       }
- 
--      // TODO: Parallelize
-+      // If a label ID is never in a multiple, then there is never a need to set it
-+      function removeUneededLabelSettings(block, allLabels) {
-+        // Find needed labels to be set
-+        var needed = {};
-+        recurseBlock(block, function noteNeeded(block) {
-+dprint('zz reccc ' + [block.type, block.entries]);
-+          if (block.type == 'multiple') {
-+            block.entryLabels.forEach(function(entryLabel) {
-+dprint('zz seen one needed! ' + dump(entryLabel));
-+              needed[entryLabel.ident] = 1;
-+            });
-+          }
-+          recurseBlock(block, noteNeeded);
-+        });
-+        var all = {};
-+        allLabels.forEach(function(label) { all[label.ident] = 1 });
-+        var unneeded = setSub(all, needed);
-+dprint('zz all, unneeded: ' + keys(all) + '   ||   ' + keys(needed) + '   >>   ' + keys(unneeded) + ' : ' + [keys(all).length, keys(needed).length, keys(unneeded).length]);
-+        keys(unneeded).forEach(function(un) {
-+dprint('zz trying to remoof ' + un);
-+          replaceLabelLabels(allLabels, set('BJSET|*|' + un), 'BNOPP|||');
-+          replaceLabelLabels(allLabels, set('*|*|' + un), '*|*|||');
-+        });
-+      }
-+
-       item.functions.forEach(function(func) {
-         dprint('relooping', "// loopOptimizing function: " + func.ident);
--        exploreBlockEndings(func.block);
--        optimizeBlockEndings(func.block);
--        optimizeOutUnneededLabels(func.block);
-+
-+        //exploreBlockEndings(func.block);
-+        //optimizeBlockEndings(func.block);
-+        //optimizeOutUnneededLabels(func.block);
-+
-+        removeUneededLabelSettings(func.block, func.labels);
-       });
-       return finish();
-     }
-diff --git a/src/parseTools.js b/src/parseTools.js
-index 03a529a..e49acd4 100644
---- a/src/parseTools.js
-+++ b/src/parseTools.js
-@@ -782,11 +782,11 @@ function generateStructTypes(type) {
- function recurseBlock(block, func) {
-   var ret = [];
-   if (block.type == 'reloop') {
--    ret.push(func(block.inner));
-+    if (block.inner) ret.push(func(block.inner));
-   } else if (block.type == 'multiple') {
-     block.entryLabels.forEach(function(entryLabel) { ret.push(func(entryLabel.block)) });
-   }
--  ret.push(func(block.next));
-+  if (block.next) ret.push(func(block.next));
-   return ret;
- }
- 
-diff --git a/src/settings.js b/src/settings.js
-index acdb8c1..e3babd9 100644
---- a/src/settings.js
-+++ b/src/settings.js
-@@ -177,7 +177,7 @@ FAKE_X86_FP80 = 0; // Replaces x86_fp80 with double. This loses precision. It is
-                    // (which is nonportable anyhow).
- 
- // Compiler debugging options
--DEBUG_TAGS_SHOWING = [];
-+DEBUG_TAGS_SHOWING = ['relooping'];
-   // Some useful items:
-   //    framework
-   //    frameworkLines
-diff --git a/src/utility.js b/src/utility.js
-index 91c4abe..ba97a39 100644
---- a/src/utility.js
-+++ b/src/utility.js
-@@ -248,10 +248,10 @@ function set() {
- }
- 
- function setSub(x, y) {
--  var ret = set(values(x));
-+  var ret = set(keys(x));
-   for (yy in y) {
-     if (yy in ret) {
--      delete ret.yy;
-+      delete ret[yy];
-     }
-   }
-   return ret;
-diff --git a/tests/runner.py b/tests/runner.py
-index 8c09820..48c5d9a 100644
---- a/tests/runner.py
-+++ b/tests/runner.py
-@@ -31,7 +31,7 @@ except:
- # Core test runner class, shared between normal tests and benchmarks
- 
- class RunnerCore(unittest.TestCase):
--  save_dir = 0
-+  save_dir = 1
-   save_JS = 0
- 
-   def setUp(self):