webruby 0.2.5 → 0.2.7

data/modules/emscripten/src/library_glut.js

@@ -126,6 +126,8 @@ var LibraryGLUT = {
         return keycode - 106 + 42; // *,+-./  TODO handle shift?
 
       switch (keycode) {
+        case 9:  // tab key
+        case 13: // return key
         case 27: // escape
         case 32: // space
         case 61: // equal

data/modules/emscripten/src/library_sdl.js

@@ -1059,11 +1059,35 @@ var LibrarySDL = {
       var src = buffer >> 2;
       var dst = 0;
       var isScreen = surf == SDL.screen;
-      var data32 = new Uint32Array(data.buffer);
-      var num = data32.length;
-      while (dst < num) {
-        // HEAP32[src++] is an optimization. Instead, we could do {{{ makeGetValue('buffer', 'dst', 'i32') }}};
-        data32[dst++] = HEAP32[src++] | (isScreen ? 0xff000000 : 0);
+      var num;
+      if (typeof CanvasPixelArray !== 'undefined' && data instanceof CanvasPixelArray) {
+        // IE10/IE11: ImageData objects are backed by the deprecated CanvasPixelArray,
+        // not UInt8ClampedArray. These don't have buffers, so we need to revert
+        // to copying a byte at a time. We do the undefined check because modern
+        // browsers do not define CanvasPixelArray anymore.
+        num = data.length;
+        while (dst < num) {
+          var val = HEAP32[src]; // This is optimized. Instead, we could do {{{ makeGetValue('buffer', 'dst', 'i32') }}};
+          data[dst  ] = val & 0xff;
+          data[dst+1] = (val >> 8) & 0xff;
+          data[dst+2] = (val >> 16) & 0xff;
+          data[dst+3] = isScreen ? 0xff : ((val >> 24) & 0xff);
+          src++;
+          dst += 4;
+        }
+      } else {
+        var data32 = new Uint32Array(data.buffer);
+        num = data32.length;
+        if (isScreen) {
+          while (dst < num) {
+            // HEAP32[src++] is an optimization. Instead, we could do {{{ makeGetValue('buffer', 'dst', 'i32') }}};
+            data32[dst++] = HEAP32[src++] | 0xff000000;
+          }
+        } else {
+          while (dst < num) {
+            data32[dst++] = HEAP32[src++];
+          }
+        }
       }
 #else
       var num = surfData.image.data.length;

data/modules/emscripten/src/library_uuid.js

@@ -0,0 +1,140 @@
+// Implementation of libuuid creating RFC4122 version 4 random UUIDs.
+
+mergeInto(LibraryManager.library, {
+  // Clear a 'compact' UUID.
+  uuid_clear: function(uu) {
+    // void uuid_clear(uuid_t uu);
+    _memset(uu, 0, 16);
+  },
+
+  // Compare whether or not two 'compact' UUIDs are the same.
+  // Returns an integer less than, equal to, or greater than zero if uu1  is found, respectively, to be   
+  // lexigraphically  less  than,  equal, or greater than uu2.
+  uuid_compare__deps: ['memcmp'],
+  uuid_compare: function(uu1, uu2) {
+    // int uuid_compare(const uuid_t uu1, const uuid_t uu2);
+    return _memcmp(uu1, uu2, 16);
+  },
+
+  // Copies the 'compact' UUID variable from src to dst.
+  uuid_copy: function(dst, src) {
+    // void uuid_copy(uuid_t dst, const uuid_t src);
+    _memcpy(dst, src, 16);
+  },
+
+  // Write a RFC4122 version 4 compliant UUID largely based on the method found in
+  // http://stackoverflow.com/questions/105034/how-to-create-a-guid-uuid-in-javascript
+  // tweaked slightly in order to use the 'compact' UUID form used by libuuid.
+  uuid_generate: function(out) {
+    // void uuid_generate(uuid_t out);
+    var uuid = null;
+
+    if (ENVIRONMENT_IS_NODE) {
+      // If Node.js try to use crypto.randomBytes
+      try {
+        var rb = require('crypto').randomBytes;
+        uuid = rb(16);
+      } catch(e) {}
+    } else if (ENVIRONMENT_IS_WEB &&
+               typeof(window.crypto) !== 'undefined' && 
+               typeof(window.crypto.getRandomValues) !== 'undefined') {
+      // If crypto.getRandomValues is available try to use it.
+      uuid = new Uint8Array(16);
+      window.crypto.getRandomValues(uuid);
+    }
+
+    // Fall back to Math.random if a higher quality random number generator is not available.
+    if (!uuid) {
+      uuid = new Array(16);
+      var d = new Date().getTime();
+      for (var i = 0; i < 16; i++) {
+        var r = (d + Math.random()*256)%256 | 0;
+        d = Math.floor(d/256);
+        uuid[i] = r;
+      }
+    }
+
+    uuid[6] = (uuid[6] & 0x0F) | 0x40;
+    uuid[8] = (uuid[8] & 0x7F) | 0x80;
+    writeArrayToMemory(uuid, out);
+  },
+
+  // Compares the value of the supplied 'compact' UUID variable uu to the NULL value.
+  // If the value is equal to the NULL UUID, 1 is returned, otherwise 0 is returned.
+  uuid_is_null: function(uu) {
+    // int uuid_is_null(const uuid_t uu);
+    for (var i = 0; i < 4; i++, uu = (uu+4)|0) {
+      var val = {{{ makeGetValue('uu', 0, 'i32') }}};
+      if (val) {
+        return 0;
+      }
+    }
+    return 1;
+  },
+
+  // converts the UUID string given by inp into the binary representation. The input UUID is a string of
+  // the form "%08x-%04x-%04x-%04x-%012x" 36 bytes plus the trailing '\0'.
+  // Upon successfully parsing the input string, 0 is returned, and the UUID is stored in the location
+  // pointed to by uu, otherwise -1 is returned.
+  uuid_parse: function(inp, uu) {
+    // int uuid_parse(const char *in, uuid_t uu);
+    var inp = Pointer_stringify(inp);
+    if (inp.length === 36) {
+      var i = 0;
+      var uuid = new Array(16);
+      inp.toLowerCase().replace(/[0-9a-f]{2}/g, function(byte) {
+        if (i < 16) {
+          uuid[i++] = parseInt(byte, 16);
+        }
+      });
+
+      if (i < 16) {
+        return -1;
+      } else {
+        writeArrayToMemory(uuid, uu);
+        return 0;
+      }
+    } else {
+      return -1;
+    }
+  },
+ 
+  // Convert a 'compact' form UUID to a string, if the upper parameter is supplied make the string upper case.
+  uuid_unparse: function(uu, out, upper) {
+    // void uuid_unparse(const uuid_t uu, char *out);
+    var i = 0;
+    var uuid = 'xxxx-xx-xx-xx-xxxxxx'.replace(/[x]/g, function(c) {
+      var r = upper ? ({{{ makeGetValue('uu', 'i', 'i8', 0, 1) }}}).toString(16).toUpperCase() :
+                      ({{{ makeGetValue('uu', 'i', 'i8', 0, 1) }}}).toString(16);
+      r = (r.length === 1) ? '0' + r : r; // Zero pad single digit hex values
+      i++;
+      return r;
+    });
+    writeStringToMemory(uuid, out);
+  },
+
+  // Convert a 'compact' form UUID to a lower case string.
+  uuid_unparse_lower__deps: ['uuid_unparse'],
+  uuid_unparse_lower: function(uu, out) {
+    // void uuid_unparse_lower(const uuid_t uu, char *out);
+    _uuid_unparse(uu, out);
+  },
+
+  // Convert a 'compact' form UUID to an upper case string.
+  uuid_unparse_upper__deps: ['uuid_unparse'],
+  uuid_unparse_upper: function(uu, out) {
+    // void uuid_unparse_upper(const uuid_t uu, char *out);
+    _uuid_unparse(uu, out, true);
+  },
+
+  uuid_type: function(uu) {
+    // int uuid_type(const uuid_t uu);
+    return {{{ cDefine('UUID_TYPE_DCE_RANDOM') }}};
+  },
+
+  uuid_variant: function(uu) {
+    // int uuid_variant(const uuid_t uu);
+    return {{{ cDefine('UUID_VARIANT_DCE') }}};
+  }
+});
+

data/modules/emscripten/src/modules.js

@@ -424,7 +424,7 @@ var LibraryManager = {
   load: function() {
     if (this.library) return;
 
-    var libraries = ['library.js', 'library_path.js', 'library_fs.js', 'library_idbfs.js', 'library_memfs.js', 'library_nodefs.js', 'library_sockfs.js', 'library_tty.js', 'library_browser.js', 'library_sdl.js', 'library_gl.js', 'library_glut.js', 'library_xlib.js', 'library_egl.js', 'library_gc.js', 'library_jansson.js', 'library_openal.js', 'library_glfw.js'].concat(additionalLibraries);
+    var libraries = ['library.js', 'library_path.js', 'library_fs.js', 'library_idbfs.js', 'library_memfs.js', 'library_nodefs.js', 'library_sockfs.js', 'library_tty.js', 'library_browser.js', 'library_sdl.js', 'library_gl.js', 'library_glut.js', 'library_xlib.js', 'library_egl.js', 'library_gc.js', 'library_jansson.js', 'library_openal.js', 'library_glfw.js', 'library_uuid.js'].concat(additionalLibraries);
     for (var i = 0; i < libraries.length; i++) {
       eval(processMacros(preprocess(read(libraries[i]))));
     }

data/modules/emscripten/src/parseTools.js

@@ -16,6 +16,7 @@ function processMacros(text) {
 
 // Simple #if/else/endif preprocessing for a file. Checks if the
 // ident checked is true in our global.
+// Also handles #include x.js (similar to C #include <file>)
 function preprocess(text) {
   var lines = text.split('\n');
   var ret = '';
@@ -30,25 +31,30 @@ function preprocess(text) {
         ret += line + '\n';
       }
     } else {
-      if (line[1] && line[1] == 'i') { // if
-        var parts = line.split(' ');
-        var ident = parts[1];
-        var op = parts[2];
-        var value = parts[3];
-        if (op) {
-          if (op === '==') {
-            showStack.push(ident in this && this[ident] == value);
-          } else if (op === '!=') {
-            showStack.push(!(ident in this && this[ident] == value));
+      if (line[1] == 'i') {
+        if (line[2] == 'f') { // if
+          var parts = line.split(' ');
+          var ident = parts[1];
+          var op = parts[2];
+          var value = parts[3];
+          if (op) {
+            if (op === '==') {
+              showStack.push(ident in this && this[ident] == value);
+            } else if (op === '!=') {
+              showStack.push(!(ident in this && this[ident] == value));
+            } else {
+              error('unsupported preprecessor op ' + op);
+            }
           } else {
-            error('unsupported preprecessor op ' + op);
+            showStack.push(ident in this && this[ident] > 0);
           }
-        } else {
-          showStack.push(ident in this && this[ident] > 0);
+        } else if (line[2] == 'n') { // include
+          var included = read(line.substr(line.indexOf(' ')+1));
+          ret += '\n' + preprocess(included) + '\n'
         }
-      } else if (line[2] && line[2] == 'l') { // else
+      } else if (line[2] == 'l') { // else
         showStack.push(!showStack.pop());
-      } else if (line[2] && line[2] == 'n') { // endif
+      } else if (line[2] == 'n') { // endif
         showStack.pop();
       } else {
         throw "Unclear preprocessor command: " + line;
@@ -457,7 +463,7 @@ function parseParamTokens(params) {
       // handle 'byval' and 'byval align X'. We store the alignment in 'byVal'
       byVal = QUANTUM_SIZE;
       segment.splice(1, 1);
-      if (segment[1] && segment[1].text === 'nocapture') {
+      if (segment[1] && (segment[1].text === 'nocapture' || segment[1].text === 'readonly')) {
         segment.splice(1, 1);
       }
       if (segment[1] && segment[1].text === 'align') {
@@ -466,7 +472,7 @@ function parseParamTokens(params) {
         segment.splice(1, 2);
       }
     }
-    if (segment[1] && segment[1].text === 'nocapture') {
+    if (segment[1] && (segment[1].text === 'nocapture' || segment[1].text === 'readonly')) {
       segment.splice(1, 1);
     }
     if (segment.length == 1) {
@@ -622,7 +628,7 @@ function parseLLVMSegment(segment) {
 }
 
 function cleanSegment(segment) {
-  while (segment.length >= 2 && ['noalias', 'sret', 'nocapture', 'nest', 'zeroext', 'signext'].indexOf(segment[1].text) != -1) {
+  while (segment.length >= 2 && ['noalias', 'sret', 'nocapture', 'nest', 'zeroext', 'signext', 'readnone'].indexOf(segment[1].text) != -1) {
     segment.splice(1, 1);
   }
   return segment;
@@ -1634,7 +1640,10 @@ function getFastValue(a, op, b, type) {
 }
 
 function getFastValues(list, op, type) {
-  assert(op == '+');
+  assert(op === '+' && type === 'i32');
+  for (var i = 0; i < list.length; i++) {
+    if (isNumber(list[i])) list[i] = (list[i]|0) + '';
+  }
   var changed = true;
   while (changed) {
     changed = false;
@@ -1642,6 +1651,7 @@ function getFastValues(list, op, type) {
       var fast = getFastValue(list[i], op, list[i+1], type);
       var raw = list[i] + op + list[i+1];
       if (fast.length < raw.length || fast.indexOf(op) < 0) {
+        if (isNumber(fast)) fast = (fast|0) + '';
         list[i] = fast;
         list.splice(i+1, 1);
         i--;

data/modules/emscripten/src/postamble.js

@@ -117,16 +117,15 @@ function run(args) {
 
   preRun();
 
-  if (runDependencies > 0) {
-    // a preRun added a dependency, run will be called later
-    return;
-  }
+  if (runDependencies > 0) return; // a preRun added a dependency, run will be called later
+  if (Module['calledRun']) return; // run may have just been called through dependencies being fulfilled just in this very frame
 
   function doRun() {
     ensureInitRuntime();
 
     preMain();
 
+    assert(!Module['calledRun']);
     Module['calledRun'] = true;
     if (Module['_main'] && shouldRunNow) {
       Module['callMain'](args);

data/modules/emscripten/src/preamble.js

@@ -866,6 +866,21 @@ var TOTAL_STACK = Module['TOTAL_STACK'] || {{{ TOTAL_STACK }}};
 var TOTAL_MEMORY = Module['TOTAL_MEMORY'] || {{{ TOTAL_MEMORY }}};
 var FAST_MEMORY = Module['FAST_MEMORY'] || {{{ FAST_MEMORY }}};
 
+#if ASM_JS
+var totalMemory = 4096;
+while (totalMemory < TOTAL_MEMORY || totalMemory < 2*TOTAL_STACK) {
+  if (totalMemory < 16*1024*1024) {
+    totalMemory *= 2;
+  } else {
+    totalMemory += 16*1024*1024
+  }
+}
+if (totalMemory !== TOTAL_MEMORY) {
+  Module.printErr('increasing TOTAL_MEMORY to ' + totalMemory + ' to be more reasonable');
+  TOTAL_MEMORY = totalMemory;
+}
+#endif
+
 // Initialize the runtime's memory
 #if USE_TYPED_ARRAYS
 // check for full engine support (use string 'subarray' to avoid closure compiler confusion)
@@ -1075,7 +1090,8 @@ Module['writeAsciiToMemory'] = writeAsciiToMemory;
 {{{ reSign }}}
 
 #if PRECISE_I32_MUL
-if (!Math['imul']) Math['imul'] = function imul(a, b) {
+// check for imul support, and also for correctness ( https://bugs.webkit.org/show_bug.cgi?id=126345 )
+if (!Math['imul'] || Math['imul'](0xffffffff, 5) !== -5) Math['imul'] = function imul(a, b) {
   var ah  = a >>> 16;
   var al = a & 0xffff;
   var bh  = b >>> 16;

data/modules/emscripten/src/relooper/Relooper.cpp

@@ -308,7 +308,7 @@ void MultipleShape::Render(bool InLoop) {
   }
   RenderLoopPostfix();
   if (Next) Next->Render(InLoop);
-};
+}
 
 // LoopShape
 
@@ -323,7 +323,7 @@ void LoopShape::Render(bool InLoop) {
   Indenter::Unindent();
   PrintIndented("}\n");
   if (Next) Next->Render(InLoop);
-};
+}
 
 // EmulatedShape
 
@@ -350,7 +350,7 @@ void EmulatedShape::Render(bool InLoop) {
   Indenter::Unindent();
   PrintIndented("}\n");
   if (Next) Next->Render(InLoop);
-};
+}
 
 // Relooper
 
@@ -358,8 +358,8 @@ Relooper::Relooper() : Root(NULL), Emulate(false), BlockIdCounter(1), ShapeIdCou
 }
 
 Relooper::~Relooper() {
-  for (int i = 0; i < Blocks.size(); i++) delete Blocks[i];
-  for (int i = 0; i < Shapes.size(); i++) delete Shapes[i];
+  for (unsigned i = 0; i < Blocks.size(); i++) delete Blocks[i];
+  for (unsigned i = 0; i < Shapes.size(); i++) delete Shapes[i];
 }
 
 void Relooper::AddBlock(Block *New) {
@@ -399,7 +399,7 @@ void Relooper::Calculate(Block *Entry) {
     // RAII cleanup. Without splitting, we will be forced to introduce labelled loops to allow
     // reaching the final block
     void SplitDeadEnds() {
-      int TotalCodeSize = 0;
+      unsigned TotalCodeSize = 0;
       for (BlockSet::iterator iter = Live.begin(); iter != Live.end(); iter++) {
         Block *Curr = *iter;
         TotalCodeSize += strlen(Curr->Code);
@@ -417,7 +417,7 @@ void Relooper::Calculate(Block *Entry) {
         for (BlockSet::iterator iter = Original->BranchesIn.begin(); iter != Original->BranchesIn.end(); iter++) {
           Block *Prior = *iter;
           Block *Split = new Block(Original->Code, Original->BranchVar);
-          Parent->Blocks.push_back(Split);
+          Parent->AddBlock(Split);
           PrintDebug("  to %d\n", Split->Id);
           Split->BranchesIn.insert(Prior);
           Branch *Details = Prior->BranchesOut[Original];
@@ -451,7 +451,7 @@ void Relooper::Calculate(Block *Entry) {
   Pre.FindLive(Entry);
 
   // Add incoming branches from live blocks, ignoring dead code
-  for (int i = 0; i < Blocks.size(); i++) {
+  for (unsigned i = 0; i < Blocks.size(); i++) {
     Block *Curr = Blocks[i];
     if (!contains(Pre.Live, Curr)) continue;
     for (BlockBranchMap::iterator iter = Curr->BranchesOut.begin(); iter != Curr->BranchesOut.end(); iter++) {

data/modules/emscripten/src/relooper/Relooper.h

@@ -89,11 +89,11 @@ struct Block {
 //            setjmp returns, etc.)
 //
 
-class SimpleShape;
-class LabeledShape;
-class MultipleShape;
-class LoopShape;
-class EmulatedShape;
+struct SimpleShape;
+struct LabeledShape;
+struct MultipleShape;
+struct LoopShape;
+struct EmulatedShape;
 
 struct Shape {
   int Id; // A unique identifier. Used to identify loops, labels are Lx where x is the Id. Defined when added to relooper

data/modules/emscripten/src/relooper/test.txt

@@ -91,7 +91,7 @@
   }
   default: {
    var $x_1 = $x_0; 
-   label = -1;
+   label = 8;
    break L1;
   }
   }
@@ -106,7 +106,7 @@
   }
   }
  }
- if (label == -1) {
+ if (label == 8) {
   // code 7
  }
  // code 4