1 files changed, 470 insertions, 628 deletions

diff --git a/test/wasm2js/i64-lowering.2asm.js b/test/wasm2js/i64-lowering.2asm.js
index 6c676d7f8..dd30f6b91 100644
--- a/test/wasm2js/i64-lowering.2asm.js
+++ b/test/wasm2js/i64-lowering.2asm.js
@@ -21,212 +21,144 @@ function asmFunc(global, env, buffer) {
  var abort = env.abort;
  var nan = global.NaN;
  var infinity = global.Infinity;
- function $1($0, $0$hi, $1_1, $1$hi) {
+ function $1($0, $1_1, $2_1, $3_1) {
   $0 = $0 | 0;
-  $0$hi = $0$hi | 0;
   $1_1 = $1_1 | 0;
-  $1$hi = $1$hi | 0;
-  var i64toi32_i32$0 = 0;
-  i64toi32_i32$0 = $0$hi;
-  i64toi32_i32$0 = $1$hi;
-  i64toi32_i32$0 = $0$hi;
-  return ($0 | 0) == ($1_1 | 0) & (i64toi32_i32$0 | 0) == ($1$hi | 0) | 0 | 0;
+  $2_1 = $2_1 | 0;
+  $3_1 = $3_1 | 0;
+  return ($0 | 0) == ($2_1 | 0) & ($1_1 | 0) == ($3_1 | 0) | 0 | 0;
  }
  
- function $2($0, $0$hi, $1_1, $1$hi) {
+ function $2($0, $1_1, $2_1, $3_1) {
   $0 = $0 | 0;
-  $0$hi = $0$hi | 0;
   $1_1 = $1_1 | 0;
-  $1$hi = $1$hi | 0;
-  var i64toi32_i32$0 = 0;
-  i64toi32_i32$0 = $0$hi;
-  i64toi32_i32$0 = $1$hi;
-  i64toi32_i32$0 = $0$hi;
-  return ($0 | 0) != ($1_1 | 0) | (i64toi32_i32$0 | 0) != ($1$hi | 0) | 0 | 0;
+  $2_1 = $2_1 | 0;
+  $3_1 = $3_1 | 0;
+  return ($0 | 0) != ($2_1 | 0) | ($1_1 | 0) != ($3_1 | 0) | 0 | 0;
  }
  
- function $3($0, $0$hi, $1_1, $1$hi) {
+ function $3($0, $1_1, $2_1, $3_1) {
   $0 = $0 | 0;
-  $0$hi = $0$hi | 0;
   $1_1 = $1_1 | 0;
-  $1$hi = $1$hi | 0;
-  var i64toi32_i32$0 = 0, $8_1 = 0, $9_1 = 0, $10_1 = 0, i64toi32_i32$2 = 0, i64toi32_i32$1 = 0, i64toi32_i32$3 = 0;
-  i64toi32_i32$0 = $0$hi;
-  i64toi32_i32$0 = $1$hi;
-  i64toi32_i32$0 = $0$hi;
-  i64toi32_i32$2 = $0;
-  i64toi32_i32$1 = $1$hi;
-  i64toi32_i32$3 = $1_1;
-  if ((i64toi32_i32$0 | 0) > ($1$hi | 0)) {
-   $8_1 = 1
+  $2_1 = $2_1 | 0;
+  $3_1 = $3_1 | 0;
+  var $4_1 = 0;
+  $4_1 = $3_1;
+  if (($1_1 | 0) > ($3_1 | 0)) {
+   $0 = 1
   } else {
-   {
-    if ((i64toi32_i32$0 | 0) >= (i64toi32_i32$1 | 0)) {
-     {
-      if (i64toi32_i32$2 >>> 0 < i64toi32_i32$3 >>> 0) {
-       $9_1 = 0
-      } else {
-       $9_1 = 1
-      }
-      $10_1 = $9_1;
-     }
+   if (($1_1 | 0) >= ($4_1 | 0)) {
+    if ($0 >>> 0 < $2_1 >>> 0) {
+     $0 = 0
     } else {
-     $10_1 = 0
+     $0 = 1
     }
-    $8_1 = $10_1;
+   } else {
+    $0 = 0
    }
   }
-  return $8_1 | 0;
+  return $0 | 0;
  }
  
- function $4($0, $0$hi, $1_1, $1$hi) {
+ function $4($0, $1_1, $2_1, $3_1) {
   $0 = $0 | 0;
-  $0$hi = $0$hi | 0;
   $1_1 = $1_1 | 0;
-  $1$hi = $1$hi | 0;
-  var i64toi32_i32$0 = 0, $8_1 = 0, $9_1 = 0, $10_1 = 0, i64toi32_i32$2 = 0, i64toi32_i32$1 = 0, i64toi32_i32$3 = 0;
-  i64toi32_i32$0 = $0$hi;
-  i64toi32_i32$0 = $1$hi;
-  i64toi32_i32$0 = $0$hi;
-  i64toi32_i32$2 = $0;
-  i64toi32_i32$1 = $1$hi;
-  i64toi32_i32$3 = $1_1;
-  if ((i64toi32_i32$0 | 0) > ($1$hi | 0)) {
-   $8_1 = 1
+  $2_1 = $2_1 | 0;
+  $3_1 = $3_1 | 0;
+  var $4_1 = 0;
+  $4_1 = $3_1;
+  if (($1_1 | 0) > ($3_1 | 0)) {
+   $0 = 1
   } else {
-   {
-    if ((i64toi32_i32$0 | 0) >= (i64toi32_i32$1 | 0)) {
-     {
-      if (i64toi32_i32$2 >>> 0 <= i64toi32_i32$3 >>> 0) {
-       $9_1 = 0
-      } else {
-       $9_1 = 1
-      }
-      $10_1 = $9_1;
-     }
+   if (($1_1 | 0) >= ($4_1 | 0)) {
+    if ($0 >>> 0 <= $2_1 >>> 0) {
+     $0 = 0
     } else {
-     $10_1 = 0
+     $0 = 1
     }
-    $8_1 = $10_1;
+   } else {
+    $0 = 0
    }
   }
-  return $8_1 | 0;
+  return $0 | 0;
  }
  
- function $5($0, $0$hi, $1_1, $1$hi) {
+ function $5($0, $1_1, $2_1, $3_1) {
   $0 = $0 | 0;
-  $0$hi = $0$hi | 0;
   $1_1 = $1_1 | 0;
-  $1$hi = $1$hi | 0;
-  var i64toi32_i32$0 = 0, $8_1 = 0, $9_1 = 0, $10_1 = 0, i64toi32_i32$2 = 0, i64toi32_i32$1 = 0, i64toi32_i32$3 = 0;
-  i64toi32_i32$0 = $0$hi;
-  i64toi32_i32$0 = $1$hi;
-  i64toi32_i32$0 = $0$hi;
-  i64toi32_i32$2 = $0;
-  i64toi32_i32$1 = $1$hi;
-  i64toi32_i32$3 = $1_1;
-  if ((i64toi32_i32$0 | 0) < ($1$hi | 0)) {
-   $8_1 = 1
+  $2_1 = $2_1 | 0;
+  $3_1 = $3_1 | 0;
+  var $4_1 = 0;
+  $4_1 = $3_1;
+  if (($1_1 | 0) < ($3_1 | 0)) {
+   $0 = 1
   } else {
-   {
-    if ((i64toi32_i32$0 | 0) <= (i64toi32_i32$1 | 0)) {
-     {
-      if (i64toi32_i32$2 >>> 0 > i64toi32_i32$3 >>> 0) {
-       $9_1 = 0
-      } else {
-       $9_1 = 1
-      }
-      $10_1 = $9_1;
-     }
+   if (($1_1 | 0) <= ($4_1 | 0)) {
+    if ($0 >>> 0 > $2_1 >>> 0) {
+     $0 = 0
     } else {
-     $10_1 = 0
+     $0 = 1
     }
-    $8_1 = $10_1;
+   } else {
+    $0 = 0
    }
   }
-  return $8_1 | 0;
+  return $0 | 0;
  }
  
- function $6($0, $0$hi, $1_1, $1$hi) {
+ function $6($0, $1_1, $2_1, $3_1) {
   $0 = $0 | 0;
-  $0$hi = $0$hi | 0;
   $1_1 = $1_1 | 0;
-  $1$hi = $1$hi | 0;
-  var i64toi32_i32$0 = 0, $8_1 = 0, $9_1 = 0, $10_1 = 0, i64toi32_i32$2 = 0, i64toi32_i32$1 = 0, i64toi32_i32$3 = 0;
-  i64toi32_i32$0 = $0$hi;
-  i64toi32_i32$0 = $1$hi;
-  i64toi32_i32$0 = $0$hi;
-  i64toi32_i32$2 = $0;
-  i64toi32_i32$1 = $1$hi;
-  i64toi32_i32$3 = $1_1;
-  if ((i64toi32_i32$0 | 0) < ($1$hi | 0)) {
-   $8_1 = 1
+  $2_1 = $2_1 | 0;
+  $3_1 = $3_1 | 0;
+  var $4_1 = 0;
+  $4_1 = $3_1;
+  if (($1_1 | 0) < ($3_1 | 0)) {
+   $0 = 1
   } else {
-   {
-    if ((i64toi32_i32$0 | 0) <= (i64toi32_i32$1 | 0)) {
-     {
-      if (i64toi32_i32$2 >>> 0 >= i64toi32_i32$3 >>> 0) {
-       $9_1 = 0
-      } else {
-       $9_1 = 1
-      }
-      $10_1 = $9_1;
-     }
+   if (($1_1 | 0) <= ($4_1 | 0)) {
+    if ($0 >>> 0 >= $2_1 >>> 0) {
+     $0 = 0
     } else {
-     $10_1 = 0
+     $0 = 1
     }
-    $8_1 = $10_1;
+   } else {
+    $0 = 0
    }
   }
-  return $8_1 | 0;
+  return $0 | 0;
  }
  
- function $7($0, $0$hi, $1_1, $1$hi) {
+ function $7($0, $1_1, $2_1, $3_1) {
   $0 = $0 | 0;
-  $0$hi = $0$hi | 0;
   $1_1 = $1_1 | 0;
-  $1$hi = $1$hi | 0;
-  var i64toi32_i32$0 = 0;
-  i64toi32_i32$0 = $0$hi;
-  i64toi32_i32$0 = $1$hi;
-  i64toi32_i32$0 = $0$hi;
-  return i64toi32_i32$0 >>> 0 > $1$hi >>> 0 | ((i64toi32_i32$0 | 0) == ($1$hi | 0) & $0 >>> 0 >= $1_1 >>> 0 | 0) | 0 | 0;
+  $2_1 = $2_1 | 0;
+  $3_1 = $3_1 | 0;
+  return $1_1 >>> 0 > $3_1 >>> 0 | (($1_1 | 0) == ($3_1 | 0) & $0 >>> 0 >= $2_1 >>> 0 | 0) | 0 | 0;
  }
  
- function $8($0, $0$hi, $1_1, $1$hi) {
+ function $8($0, $1_1, $2_1, $3_1) {
   $0 = $0 | 0;
-  $0$hi = $0$hi | 0;
   $1_1 = $1_1 | 0;
-  $1$hi = $1$hi | 0;
-  var i64toi32_i32$0 = 0;
-  i64toi32_i32$0 = $0$hi;
-  i64toi32_i32$0 = $1$hi;
-  i64toi32_i32$0 = $0$hi;
-  return i64toi32_i32$0 >>> 0 > $1$hi >>> 0 | ((i64toi32_i32$0 | 0) == ($1$hi | 0) & $0 >>> 0 > $1_1 >>> 0 | 0) | 0 | 0;
+  $2_1 = $2_1 | 0;
+  $3_1 = $3_1 | 0;
+  return $1_1 >>> 0 > $3_1 >>> 0 | (($1_1 | 0) == ($3_1 | 0) & $0 >>> 0 > $2_1 >>> 0 | 0) | 0 | 0;
  }
  
- function $9($0, $0$hi, $1_1, $1$hi) {
+ function $9($0, $1_1, $2_1, $3_1) {
   $0 = $0 | 0;
-  $0$hi = $0$hi | 0;
   $1_1 = $1_1 | 0;
-  $1$hi = $1$hi | 0;
-  var i64toi32_i32$0 = 0;
-  i64toi32_i32$0 = $0$hi;
-  i64toi32_i32$0 = $1$hi;
-  i64toi32_i32$0 = $0$hi;
-  return i64toi32_i32$0 >>> 0 < $1$hi >>> 0 | ((i64toi32_i32$0 | 0) == ($1$hi | 0) & $0 >>> 0 <= $1_1 >>> 0 | 0) | 0 | 0;
+  $2_1 = $2_1 | 0;
+  $3_1 = $3_1 | 0;
+  return $1_1 >>> 0 < $3_1 >>> 0 | (($1_1 | 0) == ($3_1 | 0) & $0 >>> 0 <= $2_1 >>> 0 | 0) | 0 | 0;
  }
  
- function $10($0, $0$hi, $1_1, $1$hi) {
+ function $10($0, $1_1, $2_1, $3_1) {
   $0 = $0 | 0;
-  $0$hi = $0$hi | 0;
   $1_1 = $1_1 | 0;
-  $1$hi = $1$hi | 0;
-  var i64toi32_i32$0 = 0;
-  i64toi32_i32$0 = $0$hi;
-  i64toi32_i32$0 = $1$hi;
-  i64toi32_i32$0 = $0$hi;
-  return i64toi32_i32$0 >>> 0 < $1$hi >>> 0 | ((i64toi32_i32$0 | 0) == ($1$hi | 0) & $0 >>> 0 < $1_1 >>> 0 | 0) | 0 | 0;
+  $2_1 = $2_1 | 0;
+  $3_1 = $3_1 | 0;
+  return $1_1 >>> 0 < $3_1 >>> 0 | (($1_1 | 0) == ($3_1 | 0) & $0 >>> 0 < $2_1 >>> 0 | 0) | 0 | 0;
  }
  
  function legalstub$1($0, $1_1, $2_1, $3_1) {
@@ -234,64 +166,55 @@ function asmFunc(global, env, buffer) {
   $1_1 = $1_1 | 0;
   $2_1 = $2_1 | 0;
   $3_1 = $3_1 | 0;
-  var i64toi32_i32$2 = 0, i64toi32_i32$1 = 0, i64toi32_i32$0 = 0, i64toi32_i32$4 = 0, i64toi32_i32$3 = 0, $19 = 0, $20 = 0, $5_1 = 0, $5$hi = 0, $8$hi = 0, $9_1 = 0, $9$hi = 0, $11 = 0, $11$hi = 0, $14$hi = 0, $15 = 0, $15$hi = 0;
-  i64toi32_i32$0 = 0;
-  $5_1 = $0;
-  $5$hi = i64toi32_i32$0;
-  i64toi32_i32$0 = 0;
-  i64toi32_i32$2 = $1_1;
-  i64toi32_i32$1 = 0;
-  i64toi32_i32$3 = 32;
-  i64toi32_i32$4 = i64toi32_i32$3 & 31 | 0;
-  if (32 >>> 0 <= (i64toi32_i32$3 & 63 | 0) >>> 0) {
-   {
-    i64toi32_i32$1 = i64toi32_i32$2 << i64toi32_i32$4 | 0;
-    $19 = 0;
+  var $4_1 = 0, $5_1 = 0, $6_1 = 0, $7_1 = 0, $8_1 = 0, $9_1 = 0;
+  $6_1 = 0;
+  $7_1 = $0;
+  $8_1 = $6_1;
+  $6_1 = 0;
+  $4_1 = 32;
+  $5_1 = $4_1 & 31 | 0;
+  if (32 >>> 0 <= ($4_1 & 63 | 0) >>> 0) {
+   {
+    $0 = $1_1 << $5_1 | 0;
+    $4_1 = 0;
    }
   } else {
    {
-    i64toi32_i32$1 = ((1 << i64toi32_i32$4 | 0) - 1 | 0) & (i64toi32_i32$2 >>> (32 - i64toi32_i32$4 | 0) | 0) | 0 | (i64toi32_i32$0 << i64toi32_i32$4 | 0) | 0;
-    $19 = i64toi32_i32$2 << i64toi32_i32$4 | 0;
+    $0 = ((1 << $5_1 | 0) - 1 | 0) & ($1_1 >>> (32 - $5_1 | 0) | 0) | 0 | ($6_1 << $5_1 | 0) | 0;
+    $4_1 = $1_1 << $5_1 | 0;
    }
   }
-  $8$hi = i64toi32_i32$1;
-  i64toi32_i32$1 = $5$hi;
-  i64toi32_i32$0 = $5_1;
-  i64toi32_i32$2 = $8$hi;
-  i64toi32_i32$3 = $19;
-  i64toi32_i32$2 = i64toi32_i32$1 | i64toi32_i32$2 | 0;
-  $9_1 = i64toi32_i32$0 | i64toi32_i32$3 | 0;
-  $9$hi = i64toi32_i32$2;
-  i64toi32_i32$2 = 0;
-  $11 = $2_1;
-  $11$hi = i64toi32_i32$2;
-  i64toi32_i32$2 = 0;
-  i64toi32_i32$1 = $3_1;
-  i64toi32_i32$0 = 0;
-  i64toi32_i32$3 = 32;
-  i64toi32_i32$4 = i64toi32_i32$3 & 31 | 0;
-  if (32 >>> 0 <= (i64toi32_i32$3 & 63 | 0) >>> 0) {
-   {
-    i64toi32_i32$0 = i64toi32_i32$1 << i64toi32_i32$4 | 0;
-    $20 = 0;
+  $1_1 = $0;
+  $0 = $8_1;
+  $6_1 = $7_1;
+  $1_1 = $0 | $1_1 | 0;
+  $9_1 = $6_1 | $4_1 | 0;
+  $7_1 = $1_1;
+  $1_1 = 0;
+  $8_1 = $1_1;
+  $1_1 = 0;
+  $0 = $3_1;
+  $4_1 = 32;
+  $5_1 = $4_1 & 31 | 0;
+  if (32 >>> 0 <= ($4_1 & 63 | 0) >>> 0) {
+   {
+    $6_1 = $0 << $5_1 | 0;
+    $4_1 = 0;
    }
   } else {
    {
-    i64toi32_i32$0 = ((1 << i64toi32_i32$4 | 0) - 1 | 0) & (i64toi32_i32$1 >>> (32 - i64toi32_i32$4 | 0) | 0) | 0 | (i64toi32_i32$2 << i64toi32_i32$4 | 0) | 0;
-    $20 = i64toi32_i32$1 << i64toi32_i32$4 | 0;
+    $6_1 = ((1 << $5_1 | 0) - 1 | 0) & ($0 >>> (32 - $5_1 | 0) | 0) | 0 | ($1_1 << $5_1 | 0) | 0;
+    $4_1 = $0 << $5_1 | 0;
    }
   }
-  $14$hi = i64toi32_i32$0;
-  i64toi32_i32$0 = $11$hi;
-  i64toi32_i32$2 = $11;
-  i64toi32_i32$1 = $14$hi;
-  i64toi32_i32$3 = $20;
-  i64toi32_i32$1 = i64toi32_i32$0 | i64toi32_i32$1 | 0;
-  $15 = i64toi32_i32$2 | i64toi32_i32$3 | 0;
-  $15$hi = i64toi32_i32$1;
-  i64toi32_i32$1 = $9$hi;
-  i64toi32_i32$2 = $15$hi;
-  return $1($9_1 | 0, i64toi32_i32$1 | 0, $15 | 0, i64toi32_i32$2 | 0) | 0 | 0;
+  $0 = $6_1;
+  $6_1 = $8_1;
+  $1_1 = $2_1;
+  $0 = $6_1 | $0 | 0;
+  $2_1 = $1_1 | $4_1 | 0;
+  $1_1 = $0;
+  $0 = $7_1;
+  return $1($9_1 | 0, $0 | 0, $2_1 | 0, $1_1 | 0) | 0 | 0;
  }
  
  function legalstub$2($0, $1_1, $2_1, $3_1) {
@@ -299,64 +222,55 @@ function asmFunc(global, env, buffer) {
   $1_1 = $1_1 | 0;
   $2_1 = $2_1 | 0;
   $3_1 = $3_1 | 0;
-  var i64toi32_i32$2 = 0, i64toi32_i32$1 = 0, i64toi32_i32$0 = 0, i64toi32_i32$4 = 0, i64toi32_i32$3 = 0, $19 = 0, $20 = 0, $5_1 = 0, $5$hi = 0, $8$hi = 0, $9_1 = 0, $9$hi = 0, $11 = 0, $11$hi = 0, $14$hi = 0, $15 = 0, $15$hi = 0;
-  i64toi32_i32$0 = 0;
-  $5_1 = $0;
-  $5$hi = i64toi32_i32$0;
-  i64toi32_i32$0 = 0;
-  i64toi32_i32$2 = $1_1;
-  i64toi32_i32$1 = 0;
-  i64toi32_i32$3 = 32;
-  i64toi32_i32$4 = i64toi32_i32$3 & 31 | 0;
-  if (32 >>> 0 <= (i64toi32_i32$3 & 63 | 0) >>> 0) {
-   {
-    i64toi32_i32$1 = i64toi32_i32$2 << i64toi32_i32$4 | 0;
-    $19 = 0;
+  var $4_1 = 0, $5_1 = 0, $6_1 = 0, $7_1 = 0, $8_1 = 0, $9_1 = 0;
+  $6_1 = 0;
+  $7_1 = $0;
+  $8_1 = $6_1;
+  $6_1 = 0;
+  $4_1 = 32;
+  $5_1 = $4_1 & 31 | 0;
+  if (32 >>> 0 <= ($4_1 & 63 | 0) >>> 0) {
+   {
+    $0 = $1_1 << $5_1 | 0;
+    $4_1 = 0;
    }
   } else {
    {
-    i64toi32_i32$1 = ((1 << i64toi32_i32$4 | 0) - 1 | 0) & (i64toi32_i32$2 >>> (32 - i64toi32_i32$4 | 0) | 0) | 0 | (i64toi32_i32$0 << i64toi32_i32$4 | 0) | 0;
-    $19 = i64toi32_i32$2 << i64toi32_i32$4 | 0;
+    $0 = ((1 << $5_1 | 0) - 1 | 0) & ($1_1 >>> (32 - $5_1 | 0) | 0) | 0 | ($6_1 << $5_1 | 0) | 0;
+    $4_1 = $1_1 << $5_1 | 0;
    }
   }
-  $8$hi = i64toi32_i32$1;
-  i64toi32_i32$1 = $5$hi;
-  i64toi32_i32$0 = $5_1;
-  i64toi32_i32$2 = $8$hi;
-  i64toi32_i32$3 = $19;
-  i64toi32_i32$2 = i64toi32_i32$1 | i64toi32_i32$2 | 0;
-  $9_1 = i64toi32_i32$0 | i64toi32_i32$3 | 0;
-  $9$hi = i64toi32_i32$2;
-  i64toi32_i32$2 = 0;
-  $11 = $2_1;
-  $11$hi = i64toi32_i32$2;
-  i64toi32_i32$2 = 0;
-  i64toi32_i32$1 = $3_1;
-  i64toi32_i32$0 = 0;
-  i64toi32_i32$3 = 32;
-  i64toi32_i32$4 = i64toi32_i32$3 & 31 | 0;
-  if (32 >>> 0 <= (i64toi32_i32$3 & 63 | 0) >>> 0) {
-   {
-    i64toi32_i32$0 = i64toi32_i32$1 << i64toi32_i32$4 | 0;
-    $20 = 0;
+  $1_1 = $0;
+  $0 = $8_1;
+  $6_1 = $7_1;
+  $1_1 = $0 | $1_1 | 0;
+  $9_1 = $6_1 | $4_1 | 0;
+  $7_1 = $1_1;
+  $1_1 = 0;
+  $8_1 = $1_1;
+  $1_1 = 0;
+  $0 = $3_1;
+  $4_1 = 32;
+  $5_1 = $4_1 & 31 | 0;
+  if (32 >>> 0 <= ($4_1 & 63 | 0) >>> 0) {
+   {
+    $6_1 = $0 << $5_1 | 0;
+    $4_1 = 0;
    }
   } else {
    {
-    i64toi32_i32$0 = ((1 << i64toi32_i32$4 | 0) - 1 | 0) & (i64toi32_i32$1 >>> (32 - i64toi32_i32$4 | 0) | 0) | 0 | (i64toi32_i32$2 << i64toi32_i32$4 | 0) | 0;
-    $20 = i64toi32_i32$1 << i64toi32_i32$4 | 0;
+    $6_1 = ((1 << $5_1 | 0) - 1 | 0) & ($0 >>> (32 - $5_1 | 0) | 0) | 0 | ($1_1 << $5_1 | 0) | 0;
+    $4_1 = $0 << $5_1 | 0;
    }
   }
-  $14$hi = i64toi32_i32$0;
-  i64toi32_i32$0 = $11$hi;
-  i64toi32_i32$2 = $11;
-  i64toi32_i32$1 = $14$hi;
-  i64toi32_i32$3 = $20;
-  i64toi32_i32$1 = i64toi32_i32$0 | i64toi32_i32$1 | 0;
-  $15 = i64toi32_i32$2 | i64toi32_i32$3 | 0;
-  $15$hi = i64toi32_i32$1;
-  i64toi32_i32$1 = $9$hi;
-  i64toi32_i32$2 = $15$hi;
-  return $2($9_1 | 0, i64toi32_i32$1 | 0, $15 | 0, i64toi32_i32$2 | 0) | 0 | 0;
+  $0 = $6_1;
+  $6_1 = $8_1;
+  $1_1 = $2_1;
+  $0 = $6_1 | $0 | 0;
+  $2_1 = $1_1 | $4_1 | 0;
+  $1_1 = $0;
+  $0 = $7_1;
+  return $2($9_1 | 0, $0 | 0, $2_1 | 0, $1_1 | 0) | 0 | 0;
  }
  
  function legalstub$3($0, $1_1, $2_1, $3_1) {
@@ -364,64 +278,55 @@ function asmFunc(global, env, buffer) {
   $1_1 = $1_1 | 0;
   $2_1 = $2_1 | 0;
   $3_1 = $3_1 | 0;
-  var i64toi32_i32$2 = 0, i64toi32_i32$1 = 0, i64toi32_i32$0 = 0, i64toi32_i32$4 = 0, i64toi32_i32$3 = 0, $19 = 0, $20 = 0, $5_1 = 0, $5$hi = 0, $8$hi = 0, $9_1 = 0, $9$hi = 0, $11 = 0, $11$hi = 0, $14$hi = 0, $15 = 0, $15$hi = 0;
-  i64toi32_i32$0 = 0;
-  $5_1 = $0;
-  $5$hi = i64toi32_i32$0;
-  i64toi32_i32$0 = 0;
-  i64toi32_i32$2 = $1_1;
-  i64toi32_i32$1 = 0;
-  i64toi32_i32$3 = 32;
-  i64toi32_i32$4 = i64toi32_i32$3 & 31 | 0;
-  if (32 >>> 0 <= (i64toi32_i32$3 & 63 | 0) >>> 0) {
-   {
-    i64toi32_i32$1 = i64toi32_i32$2 << i64toi32_i32$4 | 0;
-    $19 = 0;
+  var $4_1 = 0, $5_1 = 0, $6_1 = 0, $7_1 = 0, $8_1 = 0, $9_1 = 0;
+  $6_1 = 0;
+  $7_1 = $0;
+  $8_1 = $6_1;
+  $6_1 = 0;
+  $4_1 = 32;
+  $5_1 = $4_1 & 31 | 0;
+  if (32 >>> 0 <= ($4_1 & 63 | 0) >>> 0) {
+   {
+    $0 = $1_1 << $5_1 | 0;
+    $4_1 = 0;
    }
   } else {
    {
-    i64toi32_i32$1 = ((1 << i64toi32_i32$4 | 0) - 1 | 0) & (i64toi32_i32$2 >>> (32 - i64toi32_i32$4 | 0) | 0) | 0 | (i64toi32_i32$0 << i64toi32_i32$4 | 0) | 0;
-    $19 = i64toi32_i32$2 << i64toi32_i32$4 | 0;
+    $0 = ((1 << $5_1 | 0) - 1 | 0) & ($1_1 >>> (32 - $5_1 | 0) | 0) | 0 | ($6_1 << $5_1 | 0) | 0;
+    $4_1 = $1_1 << $5_1 | 0;
    }
   }
-  $8$hi = i64toi32_i32$1;
-  i64toi32_i32$1 = $5$hi;
-  i64toi32_i32$0 = $5_1;
-  i64toi32_i32$2 = $8$hi;
-  i64toi32_i32$3 = $19;
-  i64toi32_i32$2 = i64toi32_i32$1 | i64toi32_i32$2 | 0;
-  $9_1 = i64toi32_i32$0 | i64toi32_i32$3 | 0;
-  $9$hi = i64toi32_i32$2;
-  i64toi32_i32$2 = 0;
-  $11 = $2_1;
-  $11$hi = i64toi32_i32$2;
-  i64toi32_i32$2 = 0;
-  i64toi32_i32$1 = $3_1;
-  i64toi32_i32$0 = 0;
-  i64toi32_i32$3 = 32;
-  i64toi32_i32$4 = i64toi32_i32$3 & 31 | 0;
-  if (32 >>> 0 <= (i64toi32_i32$3 & 63 | 0) >>> 0) {
-   {
-    i64toi32_i32$0 = i64toi32_i32$1 << i64toi32_i32$4 | 0;
-    $20 = 0;
+  $1_1 = $0;
+  $0 = $8_1;
+  $6_1 = $7_1;
+  $1_1 = $0 | $1_1 | 0;
+  $9_1 = $6_1 | $4_1 | 0;
+  $7_1 = $1_1;
+  $1_1 = 0;
+  $8_1 = $1_1;
+  $1_1 = 0;
+  $0 = $3_1;
+  $4_1 = 32;
+  $5_1 = $4_1 & 31 | 0;
+  if (32 >>> 0 <= ($4_1 & 63 | 0) >>> 0) {
+   {
+    $6_1 = $0 << $5_1 | 0;
+    $4_1 = 0;
    }
   } else {
    {
-    i64toi32_i32$0 = ((1 << i64toi32_i32$4 | 0) - 1 | 0) & (i64toi32_i32$1 >>> (32 - i64toi32_i32$4 | 0) | 0) | 0 | (i64toi32_i32$2 << i64toi32_i32$4 | 0) | 0;
-    $20 = i64toi32_i32$1 << i64toi32_i32$4 | 0;
+    $6_1 = ((1 << $5_1 | 0) - 1 | 0) & ($0 >>> (32 - $5_1 | 0) | 0) | 0 | ($1_1 << $5_1 | 0) | 0;
+    $4_1 = $0 << $5_1 | 0;
    }
   }
-  $14$hi = i64toi32_i32$0;
-  i64toi32_i32$0 = $11$hi;
-  i64toi32_i32$2 = $11;
-  i64toi32_i32$1 = $14$hi;
-  i64toi32_i32$3 = $20;
-  i64toi32_i32$1 = i64toi32_i32$0 | i64toi32_i32$1 | 0;
-  $15 = i64toi32_i32$2 | i64toi32_i32$3 | 0;
-  $15$hi = i64toi32_i32$1;
-  i64toi32_i32$1 = $9$hi;
-  i64toi32_i32$2 = $15$hi;
-  return $3($9_1 | 0, i64toi32_i32$1 | 0, $15 | 0, i64toi32_i32$2 | 0) | 0 | 0;
+  $0 = $6_1;
+  $6_1 = $8_1;
+  $1_1 = $2_1;
+  $0 = $6_1 | $0 | 0;
+  $2_1 = $1_1 | $4_1 | 0;
+  $1_1 = $0;
+  $0 = $7_1;
+  return $3($9_1 | 0, $0 | 0, $2_1 | 0, $1_1 | 0) | 0 | 0;
  }
  
  function legalstub$4($0, $1_1, $2_1, $3_1) {
@@ -429,64 +334,55 @@ function asmFunc(global, env, buffer) {
   $1_1 = $1_1 | 0;
   $2_1 = $2_1 | 0;
   $3_1 = $3_1 | 0;
-  var i64toi32_i32$2 = 0, i64toi32_i32$1 = 0, i64toi32_i32$0 = 0, i64toi32_i32$4 = 0, i64toi32_i32$3 = 0, $19 = 0, $20 = 0, $5_1 = 0, $5$hi = 0, $8$hi = 0, $9_1 = 0, $9$hi = 0, $11 = 0, $11$hi = 0, $14$hi = 0, $15 = 0, $15$hi = 0;
-  i64toi32_i32$0 = 0;
-  $5_1 = $0;
-  $5$hi = i64toi32_i32$0;
-  i64toi32_i32$0 = 0;
-  i64toi32_i32$2 = $1_1;
-  i64toi32_i32$1 = 0;
-  i64toi32_i32$3 = 32;
-  i64toi32_i32$4 = i64toi32_i32$3 & 31 | 0;
-  if (32 >>> 0 <= (i64toi32_i32$3 & 63 | 0) >>> 0) {
-   {
-    i64toi32_i32$1 = i64toi32_i32$2 << i64toi32_i32$4 | 0;
-    $19 = 0;
+  var $4_1 = 0, $5_1 = 0, $6_1 = 0, $7_1 = 0, $8_1 = 0, $9_1 = 0;
+  $6_1 = 0;
+  $7_1 = $0;
+  $8_1 = $6_1;
+  $6_1 = 0;
+  $4_1 = 32;
+  $5_1 = $4_1 & 31 | 0;
+  if (32 >>> 0 <= ($4_1 & 63 | 0) >>> 0) {
+   {
+    $0 = $1_1 << $5_1 | 0;
+    $4_1 = 0;
    }
   } else {
    {
-    i64toi32_i32$1 = ((1 << i64toi32_i32$4 | 0) - 1 | 0) & (i64toi32_i32$2 >>> (32 - i64toi32_i32$4 | 0) | 0) | 0 | (i64toi32_i32$0 << i64toi32_i32$4 | 0) | 0;
-    $19 = i64toi32_i32$2 << i64toi32_i32$4 | 0;
+    $0 = ((1 << $5_1 | 0) - 1 | 0) & ($1_1 >>> (32 - $5_1 | 0) | 0) | 0 | ($6_1 << $5_1 | 0) | 0;
+    $4_1 = $1_1 << $5_1 | 0;
    }
   }
-  $8$hi = i64toi32_i32$1;
-  i64toi32_i32$1 = $5$hi;
-  i64toi32_i32$0 = $5_1;
-  i64toi32_i32$2 = $8$hi;
-  i64toi32_i32$3 = $19;
-  i64toi32_i32$2 = i64toi32_i32$1 | i64toi32_i32$2 | 0;
-  $9_1 = i64toi32_i32$0 | i64toi32_i32$3 | 0;
-  $9$hi = i64toi32_i32$2;
-  i64toi32_i32$2 = 0;
-  $11 = $2_1;
-  $11$hi = i64toi32_i32$2;
-  i64toi32_i32$2 = 0;
-  i64toi32_i32$1 = $3_1;
-  i64toi32_i32$0 = 0;
-  i64toi32_i32$3 = 32;
-  i64toi32_i32$4 = i64toi32_i32$3 & 31 | 0;
-  if (32 >>> 0 <= (i64toi32_i32$3 & 63 | 0) >>> 0) {
-   {
-    i64toi32_i32$0 = i64toi32_i32$1 << i64toi32_i32$4 | 0;
-    $20 = 0;
+  $1_1 = $0;
+  $0 = $8_1;
+  $6_1 = $7_1;
+  $1_1 = $0 | $1_1 | 0;
+  $9_1 = $6_1 | $4_1 | 0;
+  $7_1 = $1_1;
+  $1_1 = 0;
+  $8_1 = $1_1;
+  $1_1 = 0;
+  $0 = $3_1;
+  $4_1 = 32;
+  $5_1 = $4_1 & 31 | 0;
+  if (32 >>> 0 <= ($4_1 & 63 | 0) >>> 0) {
+   {
+    $6_1 = $0 << $5_1 | 0;
+    $4_1 = 0;
    }
   } else {
    {
-    i64toi32_i32$0 = ((1 << i64toi32_i32$4 | 0) - 1 | 0) & (i64toi32_i32$1 >>> (32 - i64toi32_i32$4 | 0) | 0) | 0 | (i64toi32_i32$2 << i64toi32_i32$4 | 0) | 0;
-    $20 = i64toi32_i32$1 << i64toi32_i32$4 | 0;
+    $6_1 = ((1 << $5_1 | 0) - 1 | 0) & ($0 >>> (32 - $5_1 | 0) | 0) | 0 | ($1_1 << $5_1 | 0) | 0;
+    $4_1 = $0 << $5_1 | 0;
    }
   }
-  $14$hi = i64toi32_i32$0;
-  i64toi32_i32$0 = $11$hi;
-  i64toi32_i32$2 = $11;
-  i64toi32_i32$1 = $14$hi;
-  i64toi32_i32$3 = $20;
-  i64toi32_i32$1 = i64toi32_i32$0 | i64toi32_i32$1 | 0;
-  $15 = i64toi32_i32$2 | i64toi32_i32$3 | 0;
-  $15$hi = i64toi32_i32$1;
-  i64toi32_i32$1 = $9$hi;
-  i64toi32_i32$2 = $15$hi;
-  return $4($9_1 | 0, i64toi32_i32$1 | 0, $15 | 0, i64toi32_i32$2 | 0) | 0 | 0;
+  $0 = $6_1;
+  $6_1 = $8_1;
+  $1_1 = $2_1;
+  $0 = $6_1 | $0 | 0;
+  $2_1 = $1_1 | $4_1 | 0;
+  $1_1 = $0;
+  $0 = $7_1;
+  return $4($9_1 | 0, $0 | 0, $2_1 | 0, $1_1 | 0) | 0 | 0;
  }
  
  function legalstub$5($0, $1_1, $2_1, $3_1) {
@@ -494,64 +390,55 @@ function asmFunc(global, env, buffer) {
   $1_1 = $1_1 | 0;
   $2_1 = $2_1 | 0;
   $3_1 = $3_1 | 0;
-  var i64toi32_i32$2 = 0, i64toi32_i32$1 = 0, i64toi32_i32$0 = 0, i64toi32_i32$4 = 0, i64toi32_i32$3 = 0, $19 = 0, $20 = 0, $5_1 = 0, $5$hi = 0, $8$hi = 0, $9_1 = 0, $9$hi = 0, $11 = 0, $11$hi = 0, $14$hi = 0, $15 = 0, $15$hi = 0;
-  i64toi32_i32$0 = 0;
-  $5_1 = $0;
-  $5$hi = i64toi32_i32$0;
-  i64toi32_i32$0 = 0;
-  i64toi32_i32$2 = $1_1;
-  i64toi32_i32$1 = 0;
-  i64toi32_i32$3 = 32;
-  i64toi32_i32$4 = i64toi32_i32$3 & 31 | 0;
-  if (32 >>> 0 <= (i64toi32_i32$3 & 63 | 0) >>> 0) {
-   {
-    i64toi32_i32$1 = i64toi32_i32$2 << i64toi32_i32$4 | 0;
-    $19 = 0;
+  var $4_1 = 0, $5_1 = 0, $6_1 = 0, $7_1 = 0, $8_1 = 0, $9_1 = 0;
+  $6_1 = 0;
+  $7_1 = $0;
+  $8_1 = $6_1;
+  $6_1 = 0;
+  $4_1 = 32;
+  $5_1 = $4_1 & 31 | 0;
+  if (32 >>> 0 <= ($4_1 & 63 | 0) >>> 0) {
+   {
+    $0 = $1_1 << $5_1 | 0;
+    $4_1 = 0;
    }
   } else {
    {
-    i64toi32_i32$1 = ((1 << i64toi32_i32$4 | 0) - 1 | 0) & (i64toi32_i32$2 >>> (32 - i64toi32_i32$4 | 0) | 0) | 0 | (i64toi32_i32$0 << i64toi32_i32$4 | 0) | 0;
-    $19 = i64toi32_i32$2 << i64toi32_i32$4 | 0;
+    $0 = ((1 << $5_1 | 0) - 1 | 0) & ($1_1 >>> (32 - $5_1 | 0) | 0) | 0 | ($6_1 << $5_1 | 0) | 0;
+    $4_1 = $1_1 << $5_1 | 0;
    }
   }
-  $8$hi = i64toi32_i32$1;
-  i64toi32_i32$1 = $5$hi;
-  i64toi32_i32$0 = $5_1;
-  i64toi32_i32$2 = $8$hi;
-  i64toi32_i32$3 = $19;
-  i64toi32_i32$2 = i64toi32_i32$1 | i64toi32_i32$2 | 0;
-  $9_1 = i64toi32_i32$0 | i64toi32_i32$3 | 0;
-  $9$hi = i64toi32_i32$2;
-  i64toi32_i32$2 = 0;
-  $11 = $2_1;
-  $11$hi = i64toi32_i32$2;
-  i64toi32_i32$2 = 0;
-  i64toi32_i32$1 = $3_1;
-  i64toi32_i32$0 = 0;
-  i64toi32_i32$3 = 32;
-  i64toi32_i32$4 = i64toi32_i32$3 & 31 | 0;
-  if (32 >>> 0 <= (i64toi32_i32$3 & 63 | 0) >>> 0) {
-   {
-    i64toi32_i32$0 = i64toi32_i32$1 << i64toi32_i32$4 | 0;
-    $20 = 0;
+  $1_1 = $0;
+  $0 = $8_1;
+  $6_1 = $7_1;
+  $1_1 = $0 | $1_1 | 0;
+  $9_1 = $6_1 | $4_1 | 0;
+  $7_1 = $1_1;
+  $1_1 = 0;
+  $8_1 = $1_1;
+  $1_1 = 0;
+  $0 = $3_1;
+  $4_1 = 32;
+  $5_1 = $4_1 & 31 | 0;
+  if (32 >>> 0 <= ($4_1 & 63 | 0) >>> 0) {
+   {
+    $6_1 = $0 << $5_1 | 0;
+    $4_1 = 0;
    }
   } else {
    {
-    i64toi32_i32$0 = ((1 << i64toi32_i32$4 | 0) - 1 | 0) & (i64toi32_i32$1 >>> (32 - i64toi32_i32$4 | 0) | 0) | 0 | (i64toi32_i32$2 << i64toi32_i32$4 | 0) | 0;
-    $20 = i64toi32_i32$1 << i64toi32_i32$4 | 0;
+    $6_1 = ((1 << $5_1 | 0) - 1 | 0) & ($0 >>> (32 - $5_1 | 0) | 0) | 0 | ($1_1 << $5_1 | 0) | 0;
+    $4_1 = $0 << $5_1 | 0;
    }
   }
-  $14$hi = i64toi32_i32$0;
-  i64toi32_i32$0 = $11$hi;
-  i64toi32_i32$2 = $11;
-  i64toi32_i32$1 = $14$hi;
-  i64toi32_i32$3 = $20;
-  i64toi32_i32$1 = i64toi32_i32$0 | i64toi32_i32$1 | 0;
-  $15 = i64toi32_i32$2 | i64toi32_i32$3 | 0;
-  $15$hi = i64toi32_i32$1;
-  i64toi32_i32$1 = $9$hi;
-  i64toi32_i32$2 = $15$hi;
-  return $5($9_1 | 0, i64toi32_i32$1 | 0, $15 | 0, i64toi32_i32$2 | 0) | 0 | 0;
+  $0 = $6_1;
+  $6_1 = $8_1;
+  $1_1 = $2_1;
+  $0 = $6_1 | $0 | 0;
+  $2_1 = $1_1 | $4_1 | 0;
+  $1_1 = $0;
+  $0 = $7_1;
+  return $5($9_1 | 0, $0 | 0, $2_1 | 0, $1_1 | 0) | 0 | 0;
  }
  
  function legalstub$6($0, $1_1, $2_1, $3_1) {
@@ -559,64 +446,55 @@ function asmFunc(global, env, buffer) {
   $1_1 = $1_1 | 0;
   $2_1 = $2_1 | 0;
   $3_1 = $3_1 | 0;
-  var i64toi32_i32$2 = 0, i64toi32_i32$1 = 0, i64toi32_i32$0 = 0, i64toi32_i32$4 = 0, i64toi32_i32$3 = 0, $19 = 0, $20 = 0, $5_1 = 0, $5$hi = 0, $8$hi = 0, $9_1 = 0, $9$hi = 0, $11 = 0, $11$hi = 0, $14$hi = 0, $15 = 0, $15$hi = 0;
-  i64toi32_i32$0 = 0;
-  $5_1 = $0;
-  $5$hi = i64toi32_i32$0;
-  i64toi32_i32$0 = 0;
-  i64toi32_i32$2 = $1_1;
-  i64toi32_i32$1 = 0;
-  i64toi32_i32$3 = 32;
-  i64toi32_i32$4 = i64toi32_i32$3 & 31 | 0;
-  if (32 >>> 0 <= (i64toi32_i32$3 & 63 | 0) >>> 0) {
-   {
-    i64toi32_i32$1 = i64toi32_i32$2 << i64toi32_i32$4 | 0;
-    $19 = 0;
+  var $4_1 = 0, $5_1 = 0, $6_1 = 0, $7_1 = 0, $8_1 = 0, $9_1 = 0;
+  $6_1 = 0;
+  $7_1 = $0;
+  $8_1 = $6_1;
+  $6_1 = 0;
+  $4_1 = 32;
+  $5_1 = $4_1 & 31 | 0;
+  if (32 >>> 0 <= ($4_1 & 63 | 0) >>> 0) {
+   {
+    $0 = $1_1 << $5_1 | 0;
+    $4_1 = 0;
    }
   } else {
    {
-    i64toi32_i32$1 = ((1 << i64toi32_i32$4 | 0) - 1 | 0) & (i64toi32_i32$2 >>> (32 - i64toi32_i32$4 | 0) | 0) | 0 | (i64toi32_i32$0 << i64toi32_i32$4 | 0) | 0;
-    $19 = i64toi32_i32$2 << i64toi32_i32$4 | 0;
+    $0 = ((1 << $5_1 | 0) - 1 | 0) & ($1_1 >>> (32 - $5_1 | 0) | 0) | 0 | ($6_1 << $5_1 | 0) | 0;
+    $4_1 = $1_1 << $5_1 | 0;
    }
   }
-  $8$hi = i64toi32_i32$1;
-  i64toi32_i32$1 = $5$hi;
-  i64toi32_i32$0 = $5_1;
-  i64toi32_i32$2 = $8$hi;
-  i64toi32_i32$3 = $19;
-  i64toi32_i32$2 = i64toi32_i32$1 | i64toi32_i32$2 | 0;
-  $9_1 = i64toi32_i32$0 | i64toi32_i32$3 | 0;
-  $9$hi = i64toi32_i32$2;
-  i64toi32_i32$2 = 0;
-  $11 = $2_1;
-  $11$hi = i64toi32_i32$2;
-  i64toi32_i32$2 = 0;
-  i64toi32_i32$1 = $3_1;
-  i64toi32_i32$0 = 0;
-  i64toi32_i32$3 = 32;
-  i64toi32_i32$4 = i64toi32_i32$3 & 31 | 0;
-  if (32 >>> 0 <= (i64toi32_i32$3 & 63 | 0) >>> 0) {
-   {
-    i64toi32_i32$0 = i64toi32_i32$1 << i64toi32_i32$4 | 0;
-    $20 = 0;
+  $1_1 = $0;
+  $0 = $8_1;
+  $6_1 = $7_1;
+  $1_1 = $0 | $1_1 | 0;
+  $9_1 = $6_1 | $4_1 | 0;
+  $7_1 = $1_1;
+  $1_1 = 0;
+  $8_1 = $1_1;
+  $1_1 = 0;
+  $0 = $3_1;
+  $4_1 = 32;
+  $5_1 = $4_1 & 31 | 0;
+  if (32 >>> 0 <= ($4_1 & 63 | 0) >>> 0) {
+   {
+    $6_1 = $0 << $5_1 | 0;
+    $4_1 = 0;
    }
   } else {
    {
-    i64toi32_i32$0 = ((1 << i64toi32_i32$4 | 0) - 1 | 0) & (i64toi32_i32$1 >>> (32 - i64toi32_i32$4 | 0) | 0) | 0 | (i64toi32_i32$2 << i64toi32_i32$4 | 0) | 0;
-    $20 = i64toi32_i32$1 << i64toi32_i32$4 | 0;
+    $6_1 = ((1 << $5_1 | 0) - 1 | 0) & ($0 >>> (32 - $5_1 | 0) | 0) | 0 | ($1_1 << $5_1 | 0) | 0;
+    $4_1 = $0 << $5_1 | 0;
    }
   }
-  $14$hi = i64toi32_i32$0;
-  i64toi32_i32$0 = $11$hi;
-  i64toi32_i32$2 = $11;
-  i64toi32_i32$1 = $14$hi;
-  i64toi32_i32$3 = $20;
-  i64toi32_i32$1 = i64toi32_i32$0 | i64toi32_i32$1 | 0;
-  $15 = i64toi32_i32$2 | i64toi32_i32$3 | 0;
-  $15$hi = i64toi32_i32$1;
-  i64toi32_i32$1 = $9$hi;
-  i64toi32_i32$2 = $15$hi;
-  return $6($9_1 | 0, i64toi32_i32$1 | 0, $15 | 0, i64toi32_i32$2 | 0) | 0 | 0;
+  $0 = $6_1;
+  $6_1 = $8_1;
+  $1_1 = $2_1;
+  $0 = $6_1 | $0 | 0;
+  $2_1 = $1_1 | $4_1 | 0;
+  $1_1 = $0;
+  $0 = $7_1;
+  return $6($9_1 | 0, $0 | 0, $2_1 | 0, $1_1 | 0) | 0 | 0;
  }
  
  function legalstub$7($0, $1_1, $2_1, $3_1) {
@@ -624,64 +502,55 @@ function asmFunc(global, env, buffer) {
   $1_1 = $1_1 | 0;
   $2_1 = $2_1 | 0;
   $3_1 = $3_1 | 0;
-  var i64toi32_i32$2 = 0, i64toi32_i32$1 = 0, i64toi32_i32$0 = 0, i64toi32_i32$4 = 0, i64toi32_i32$3 = 0, $19 = 0, $20 = 0, $5_1 = 0, $5$hi = 0, $8$hi = 0, $9_1 = 0, $9$hi = 0, $11 = 0, $11$hi = 0, $14$hi = 0, $15 = 0, $15$hi = 0;
-  i64toi32_i32$0 = 0;
-  $5_1 = $0;
-  $5$hi = i64toi32_i32$0;
-  i64toi32_i32$0 = 0;
-  i64toi32_i32$2 = $1_1;
-  i64toi32_i32$1 = 0;
-  i64toi32_i32$3 = 32;
-  i64toi32_i32$4 = i64toi32_i32$3 & 31 | 0;
-  if (32 >>> 0 <= (i64toi32_i32$3 & 63 | 0) >>> 0) {
-   {
-    i64toi32_i32$1 = i64toi32_i32$2 << i64toi32_i32$4 | 0;
-    $19 = 0;
+  var $4_1 = 0, $5_1 = 0, $6_1 = 0, $7_1 = 0, $8_1 = 0, $9_1 = 0;
+  $6_1 = 0;
+  $7_1 = $0;
+  $8_1 = $6_1;
+  $6_1 = 0;
+  $4_1 = 32;
+  $5_1 = $4_1 & 31 | 0;
+  if (32 >>> 0 <= ($4_1 & 63 | 0) >>> 0) {
+   {
+    $0 = $1_1 << $5_1 | 0;
+    $4_1 = 0;
    }
   } else {
    {
-    i64toi32_i32$1 = ((1 << i64toi32_i32$4 | 0) - 1 | 0) & (i64toi32_i32$2 >>> (32 - i64toi32_i32$4 | 0) | 0) | 0 | (i64toi32_i32$0 << i64toi32_i32$4 | 0) | 0;
-    $19 = i64toi32_i32$2 << i64toi32_i32$4 | 0;
+    $0 = ((1 << $5_1 | 0) - 1 | 0) & ($1_1 >>> (32 - $5_1 | 0) | 0) | 0 | ($6_1 << $5_1 | 0) | 0;
+    $4_1 = $1_1 << $5_1 | 0;
    }
   }
-  $8$hi = i64toi32_i32$1;
-  i64toi32_i32$1 = $5$hi;
-  i64toi32_i32$0 = $5_1;
-  i64toi32_i32$2 = $8$hi;
-  i64toi32_i32$3 = $19;
-  i64toi32_i32$2 = i64toi32_i32$1 | i64toi32_i32$2 | 0;
-  $9_1 = i64toi32_i32$0 | i64toi32_i32$3 | 0;
-  $9$hi = i64toi32_i32$2;
-  i64toi32_i32$2 = 0;
-  $11 = $2_1;
-  $11$hi = i64toi32_i32$2;
-  i64toi32_i32$2 = 0;
-  i64toi32_i32$1 = $3_1;
-  i64toi32_i32$0 = 0;
-  i64toi32_i32$3 = 32;
-  i64toi32_i32$4 = i64toi32_i32$3 & 31 | 0;
-  if (32 >>> 0 <= (i64toi32_i32$3 & 63 | 0) >>> 0) {
-   {
-    i64toi32_i32$0 = i64toi32_i32$1 << i64toi32_i32$4 | 0;
-    $20 = 0;
+  $1_1 = $0;
+  $0 = $8_1;
+  $6_1 = $7_1;
+  $1_1 = $0 | $1_1 | 0;
+  $9_1 = $6_1 | $4_1 | 0;
+  $7_1 = $1_1;
+  $1_1 = 0;
+  $8_1 = $1_1;
+  $1_1 = 0;
+  $0 = $3_1;
+  $4_1 = 32;
+  $5_1 = $4_1 & 31 | 0;
+  if (32 >>> 0 <= ($4_1 & 63 | 0) >>> 0) {
+   {
+    $6_1 = $0 << $5_1 | 0;
+    $4_1 = 0;
    }
   } else {
    {
-    i64toi32_i32$0 = ((1 << i64toi32_i32$4 | 0) - 1 | 0) & (i64toi32_i32$1 >>> (32 - i64toi32_i32$4 | 0) | 0) | 0 | (i64toi32_i32$2 << i64toi32_i32$4 | 0) | 0;
-    $20 = i64toi32_i32$1 << i64toi32_i32$4 | 0;
+    $6_1 = ((1 << $5_1 | 0) - 1 | 0) & ($0 >>> (32 - $5_1 | 0) | 0) | 0 | ($1_1 << $5_1 | 0) | 0;
+    $4_1 = $0 << $5_1 | 0;
    }
   }
-  $14$hi = i64toi32_i32$0;
-  i64toi32_i32$0 = $11$hi;
-  i64toi32_i32$2 = $11;
-  i64toi32_i32$1 = $14$hi;
-  i64toi32_i32$3 = $20;
-  i64toi32_i32$1 = i64toi32_i32$0 | i64toi32_i32$1 | 0;
-  $15 = i64toi32_i32$2 | i64toi32_i32$3 | 0;
-  $15$hi = i64toi32_i32$1;
-  i64toi32_i32$1 = $9$hi;
-  i64toi32_i32$2 = $15$hi;
-  return $7($9_1 | 0, i64toi32_i32$1 | 0, $15 | 0, i64toi32_i32$2 | 0) | 0 | 0;
+  $0 = $6_1;
+  $6_1 = $8_1;
+  $1_1 = $2_1;
+  $0 = $6_1 | $0 | 0;
+  $2_1 = $1_1 | $4_1 | 0;
+  $1_1 = $0;
+  $0 = $7_1;
+  return $7($9_1 | 0, $0 | 0, $2_1 | 0, $1_1 | 0) | 0 | 0;
  }
  
  function legalstub$8($0, $1_1, $2_1, $3_1) {
@@ -689,64 +558,55 @@ function asmFunc(global, env, buffer) {
   $1_1 = $1_1 | 0;
   $2_1 = $2_1 | 0;
   $3_1 = $3_1 | 0;
-  var i64toi32_i32$2 = 0, i64toi32_i32$1 = 0, i64toi32_i32$0 = 0, i64toi32_i32$4 = 0, i64toi32_i32$3 = 0, $19 = 0, $20 = 0, $5_1 = 0, $5$hi = 0, $8$hi = 0, $9_1 = 0, $9$hi = 0, $11 = 0, $11$hi = 0, $14$hi = 0, $15 = 0, $15$hi = 0;
-  i64toi32_i32$0 = 0;
-  $5_1 = $0;
-  $5$hi = i64toi32_i32$0;
-  i64toi32_i32$0 = 0;
-  i64toi32_i32$2 = $1_1;
-  i64toi32_i32$1 = 0;
-  i64toi32_i32$3 = 32;
-  i64toi32_i32$4 = i64toi32_i32$3 & 31 | 0;
-  if (32 >>> 0 <= (i64toi32_i32$3 & 63 | 0) >>> 0) {
-   {
-    i64toi32_i32$1 = i64toi32_i32$2 << i64toi32_i32$4 | 0;
-    $19 = 0;
+  var $4_1 = 0, $5_1 = 0, $6_1 = 0, $7_1 = 0, $8_1 = 0, $9_1 = 0;
+  $6_1 = 0;
+  $7_1 = $0;
+  $8_1 = $6_1;
+  $6_1 = 0;
+  $4_1 = 32;
+  $5_1 = $4_1 & 31 | 0;
+  if (32 >>> 0 <= ($4_1 & 63 | 0) >>> 0) {
+   {
+    $0 = $1_1 << $5_1 | 0;
+    $4_1 = 0;
    }
   } else {
    {
-    i64toi32_i32$1 = ((1 << i64toi32_i32$4 | 0) - 1 | 0) & (i64toi32_i32$2 >>> (32 - i64toi32_i32$4 | 0) | 0) | 0 | (i64toi32_i32$0 << i64toi32_i32$4 | 0) | 0;
-    $19 = i64toi32_i32$2 << i64toi32_i32$4 | 0;
+    $0 = ((1 << $5_1 | 0) - 1 | 0) & ($1_1 >>> (32 - $5_1 | 0) | 0) | 0 | ($6_1 << $5_1 | 0) | 0;
+    $4_1 = $1_1 << $5_1 | 0;
    }
   }
-  $8$hi = i64toi32_i32$1;
-  i64toi32_i32$1 = $5$hi;
-  i64toi32_i32$0 = $5_1;
-  i64toi32_i32$2 = $8$hi;
-  i64toi32_i32$3 = $19;
-  i64toi32_i32$2 = i64toi32_i32$1 | i64toi32_i32$2 | 0;
-  $9_1 = i64toi32_i32$0 | i64toi32_i32$3 | 0;
-  $9$hi = i64toi32_i32$2;
-  i64toi32_i32$2 = 0;
-  $11 = $2_1;
-  $11$hi = i64toi32_i32$2;
-  i64toi32_i32$2 = 0;
-  i64toi32_i32$1 = $3_1;
-  i64toi32_i32$0 = 0;
-  i64toi32_i32$3 = 32;
-  i64toi32_i32$4 = i64toi32_i32$3 & 31 | 0;
-  if (32 >>> 0 <= (i64toi32_i32$3 & 63 | 0) >>> 0) {
-   {
-    i64toi32_i32$0 = i64toi32_i32$1 << i64toi32_i32$4 | 0;
-    $20 = 0;
+  $1_1 = $0;
+  $0 = $8_1;
+  $6_1 = $7_1;
+  $1_1 = $0 | $1_1 | 0;
+  $9_1 = $6_1 | $4_1 | 0;
+  $7_1 = $1_1;
+  $1_1 = 0;
+  $8_1 = $1_1;
+  $1_1 = 0;
+  $0 = $3_1;
+  $4_1 = 32;
+  $5_1 = $4_1 & 31 | 0;
+  if (32 >>> 0 <= ($4_1 & 63 | 0) >>> 0) {
+   {
+    $6_1 = $0 << $5_1 | 0;
+    $4_1 = 0;
    }
   } else {
    {
-    i64toi32_i32$0 = ((1 << i64toi32_i32$4 | 0) - 1 | 0) & (i64toi32_i32$1 >>> (32 - i64toi32_i32$4 | 0) | 0) | 0 | (i64toi32_i32$2 << i64toi32_i32$4 | 0) | 0;
-    $20 = i64toi32_i32$1 << i64toi32_i32$4 | 0;
+    $6_1 = ((1 << $5_1 | 0) - 1 | 0) & ($0 >>> (32 - $5_1 | 0) | 0) | 0 | ($1_1 << $5_1 | 0) | 0;
+    $4_1 = $0 << $5_1 | 0;
    }
   }
-  $14$hi = i64toi32_i32$0;
-  i64toi32_i32$0 = $11$hi;
-  i64toi32_i32$2 = $11;
-  i64toi32_i32$1 = $14$hi;
-  i64toi32_i32$3 = $20;
-  i64toi32_i32$1 = i64toi32_i32$0 | i64toi32_i32$1 | 0;
-  $15 = i64toi32_i32$2 | i64toi32_i32$3 | 0;
-  $15$hi = i64toi32_i32$1;
-  i64toi32_i32$1 = $9$hi;
-  i64toi32_i32$2 = $15$hi;
-  return $8($9_1 | 0, i64toi32_i32$1 | 0, $15 | 0, i64toi32_i32$2 | 0) | 0 | 0;
+  $0 = $6_1;
+  $6_1 = $8_1;
+  $1_1 = $2_1;
+  $0 = $6_1 | $0 | 0;
+  $2_1 = $1_1 | $4_1 | 0;
+  $1_1 = $0;
+  $0 = $7_1;
+  return $8($9_1 | 0, $0 | 0, $2_1 | 0, $1_1 | 0) | 0 | 0;
  }
  
  function legalstub$9($0, $1_1, $2_1, $3_1) {
@@ -754,64 +614,55 @@ function asmFunc(global, env, buffer) {
   $1_1 = $1_1 | 0;
   $2_1 = $2_1 | 0;
   $3_1 = $3_1 | 0;
-  var i64toi32_i32$2 = 0, i64toi32_i32$1 = 0, i64toi32_i32$0 = 0, i64toi32_i32$4 = 0, i64toi32_i32$3 = 0, $19 = 0, $20 = 0, $5_1 = 0, $5$hi = 0, $8$hi = 0, $9_1 = 0, $9$hi = 0, $11 = 0, $11$hi = 0, $14$hi = 0, $15 = 0, $15$hi = 0;
-  i64toi32_i32$0 = 0;
-  $5_1 = $0;
-  $5$hi = i64toi32_i32$0;
-  i64toi32_i32$0 = 0;
-  i64toi32_i32$2 = $1_1;
-  i64toi32_i32$1 = 0;
-  i64toi32_i32$3 = 32;
-  i64toi32_i32$4 = i64toi32_i32$3 & 31 | 0;
-  if (32 >>> 0 <= (i64toi32_i32$3 & 63 | 0) >>> 0) {
-   {
-    i64toi32_i32$1 = i64toi32_i32$2 << i64toi32_i32$4 | 0;
-    $19 = 0;
+  var $4_1 = 0, $5_1 = 0, $6_1 = 0, $7_1 = 0, $8_1 = 0, $9_1 = 0;
+  $6_1 = 0;
+  $7_1 = $0;
+  $8_1 = $6_1;
+  $6_1 = 0;
+  $4_1 = 32;
+  $5_1 = $4_1 & 31 | 0;
+  if (32 >>> 0 <= ($4_1 & 63 | 0) >>> 0) {
+   {
+    $0 = $1_1 << $5_1 | 0;
+    $4_1 = 0;
    }
   } else {
    {
-    i64toi32_i32$1 = ((1 << i64toi32_i32$4 | 0) - 1 | 0) & (i64toi32_i32$2 >>> (32 - i64toi32_i32$4 | 0) | 0) | 0 | (i64toi32_i32$0 << i64toi32_i32$4 | 0) | 0;
-    $19 = i64toi32_i32$2 << i64toi32_i32$4 | 0;
+    $0 = ((1 << $5_1 | 0) - 1 | 0) & ($1_1 >>> (32 - $5_1 | 0) | 0) | 0 | ($6_1 << $5_1 | 0) | 0;
+    $4_1 = $1_1 << $5_1 | 0;
    }
   }
-  $8$hi = i64toi32_i32$1;
-  i64toi32_i32$1 = $5$hi;
-  i64toi32_i32$0 = $5_1;
-  i64toi32_i32$2 = $8$hi;
-  i64toi32_i32$3 = $19;
-  i64toi32_i32$2 = i64toi32_i32$1 | i64toi32_i32$2 | 0;
-  $9_1 = i64toi32_i32$0 | i64toi32_i32$3 | 0;
-  $9$hi = i64toi32_i32$2;
-  i64toi32_i32$2 = 0;
-  $11 = $2_1;
-  $11$hi = i64toi32_i32$2;
-  i64toi32_i32$2 = 0;
-  i64toi32_i32$1 = $3_1;
-  i64toi32_i32$0 = 0;
-  i64toi32_i32$3 = 32;
-  i64toi32_i32$4 = i64toi32_i32$3 & 31 | 0;
-  if (32 >>> 0 <= (i64toi32_i32$3 & 63 | 0) >>> 0) {
-   {
-    i64toi32_i32$0 = i64toi32_i32$1 << i64toi32_i32$4 | 0;
-    $20 = 0;
+  $1_1 = $0;
+  $0 = $8_1;
+  $6_1 = $7_1;
+  $1_1 = $0 | $1_1 | 0;
+  $9_1 = $6_1 | $4_1 | 0;
+  $7_1 = $1_1;
+  $1_1 = 0;
+  $8_1 = $1_1;
+  $1_1 = 0;
+  $0 = $3_1;
+  $4_1 = 32;
+  $5_1 = $4_1 & 31 | 0;
+  if (32 >>> 0 <= ($4_1 & 63 | 0) >>> 0) {
+   {
+    $6_1 = $0 << $5_1 | 0;
+    $4_1 = 0;
    }
   } else {
    {
-    i64toi32_i32$0 = ((1 << i64toi32_i32$4 | 0) - 1 | 0) & (i64toi32_i32$1 >>> (32 - i64toi32_i32$4 | 0) | 0) | 0 | (i64toi32_i32$2 << i64toi32_i32$4 | 0) | 0;
-    $20 = i64toi32_i32$1 << i64toi32_i32$4 | 0;
+    $6_1 = ((1 << $5_1 | 0) - 1 | 0) & ($0 >>> (32 - $5_1 | 0) | 0) | 0 | ($1_1 << $5_1 | 0) | 0;
+    $4_1 = $0 << $5_1 | 0;
    }
   }
-  $14$hi = i64toi32_i32$0;
-  i64toi32_i32$0 = $11$hi;
-  i64toi32_i32$2 = $11;
-  i64toi32_i32$1 = $14$hi;
-  i64toi32_i32$3 = $20;
-  i64toi32_i32$1 = i64toi32_i32$0 | i64toi32_i32$1 | 0;
-  $15 = i64toi32_i32$2 | i64toi32_i32$3 | 0;
-  $15$hi = i64toi32_i32$1;
-  i64toi32_i32$1 = $9$hi;
-  i64toi32_i32$2 = $15$hi;
-  return $9($9_1 | 0, i64toi32_i32$1 | 0, $15 | 0, i64toi32_i32$2 | 0) | 0 | 0;
+  $0 = $6_1;
+  $6_1 = $8_1;
+  $1_1 = $2_1;
+  $0 = $6_1 | $0 | 0;
+  $2_1 = $1_1 | $4_1 | 0;
+  $1_1 = $0;
+  $0 = $7_1;
+  return $9($9_1 | 0, $0 | 0, $2_1 | 0, $1_1 | 0) | 0 | 0;
  }
  
  function legalstub$10($0, $1_1, $2_1, $3_1) {
@@ -819,64 +670,55 @@ function asmFunc(global, env, buffer) {
   $1_1 = $1_1 | 0;
   $2_1 = $2_1 | 0;
   $3_1 = $3_1 | 0;
-  var i64toi32_i32$2 = 0, i64toi32_i32$1 = 0, i64toi32_i32$0 = 0, i64toi32_i32$4 = 0, i64toi32_i32$3 = 0, $19 = 0, $20 = 0, $5_1 = 0, $5$hi = 0, $8$hi = 0, $9_1 = 0, $9$hi = 0, $11 = 0, $11$hi = 0, $14$hi = 0, $15 = 0, $15$hi = 0;
-  i64toi32_i32$0 = 0;
-  $5_1 = $0;
-  $5$hi = i64toi32_i32$0;
-  i64toi32_i32$0 = 0;
-  i64toi32_i32$2 = $1_1;
-  i64toi32_i32$1 = 0;
-  i64toi32_i32$3 = 32;
-  i64toi32_i32$4 = i64toi32_i32$3 & 31 | 0;
-  if (32 >>> 0 <= (i64toi32_i32$3 & 63 | 0) >>> 0) {
-   {
-    i64toi32_i32$1 = i64toi32_i32$2 << i64toi32_i32$4 | 0;
-    $19 = 0;
+  var $4_1 = 0, $5_1 = 0, $6_1 = 0, $7_1 = 0, $8_1 = 0, $9_1 = 0;
+  $6_1 = 0;
+  $7_1 = $0;
+  $8_1 = $6_1;
+  $6_1 = 0;
+  $4_1 = 32;
+  $5_1 = $4_1 & 31 | 0;
+  if (32 >>> 0 <= ($4_1 & 63 | 0) >>> 0) {
+   {
+    $0 = $1_1 << $5_1 | 0;
+    $4_1 = 0;
    }
   } else {
    {
-    i64toi32_i32$1 = ((1 << i64toi32_i32$4 | 0) - 1 | 0) & (i64toi32_i32$2 >>> (32 - i64toi32_i32$4 | 0) | 0) | 0 | (i64toi32_i32$0 << i64toi32_i32$4 | 0) | 0;
-    $19 = i64toi32_i32$2 << i64toi32_i32$4 | 0;
+    $0 = ((1 << $5_1 | 0) - 1 | 0) & ($1_1 >>> (32 - $5_1 | 0) | 0) | 0 | ($6_1 << $5_1 | 0) | 0;
+    $4_1 = $1_1 << $5_1 | 0;
    }
   }
-  $8$hi = i64toi32_i32$1;
-  i64toi32_i32$1 = $5$hi;
-  i64toi32_i32$0 = $5_1;
-  i64toi32_i32$2 = $8$hi;
-  i64toi32_i32$3 = $19;
-  i64toi32_i32$2 = i64toi32_i32$1 | i64toi32_i32$2 | 0;
-  $9_1 = i64toi32_i32$0 | i64toi32_i32$3 | 0;
-  $9$hi = i64toi32_i32$2;
-  i64toi32_i32$2 = 0;
-  $11 = $2_1;
-  $11$hi = i64toi32_i32$2;
-  i64toi32_i32$2 = 0;
-  i64toi32_i32$1 = $3_1;
-  i64toi32_i32$0 = 0;
-  i64toi32_i32$3 = 32;
-  i64toi32_i32$4 = i64toi32_i32$3 & 31 | 0;
-  if (32 >>> 0 <= (i64toi32_i32$3 & 63 | 0) >>> 0) {
-   {
-    i64toi32_i32$0 = i64toi32_i32$1 << i64toi32_i32$4 | 0;
-    $20 = 0;
+  $1_1 = $0;
+  $0 = $8_1;
+  $6_1 = $7_1;
+  $1_1 = $0 | $1_1 | 0;
+  $9_1 = $6_1 | $4_1 | 0;
+  $7_1 = $1_1;
+  $1_1 = 0;
+  $8_1 = $1_1;
+  $1_1 = 0;
+  $0 = $3_1;
+  $4_1 = 32;
+  $5_1 = $4_1 & 31 | 0;
+  if (32 >>> 0 <= ($4_1 & 63 | 0) >>> 0) {
+   {
+    $6_1 = $0 << $5_1 | 0;
+    $4_1 = 0;
    }
   } else {
    {
-    i64toi32_i32$0 = ((1 << i64toi32_i32$4 | 0) - 1 | 0) & (i64toi32_i32$1 >>> (32 - i64toi32_i32$4 | 0) | 0) | 0 | (i64toi32_i32$2 << i64toi32_i32$4 | 0) | 0;
-    $20 = i64toi32_i32$1 << i64toi32_i32$4 | 0;
+    $6_1 = ((1 << $5_1 | 0) - 1 | 0) & ($0 >>> (32 - $5_1 | 0) | 0) | 0 | ($1_1 << $5_1 | 0) | 0;
+    $4_1 = $0 << $5_1 | 0;
    }
   }
-  $14$hi = i64toi32_i32$0;
-  i64toi32_i32$0 = $11$hi;
-  i64toi32_i32$2 = $11;
-  i64toi32_i32$1 = $14$hi;
-  i64toi32_i32$3 = $20;
-  i64toi32_i32$1 = i64toi32_i32$0 | i64toi32_i32$1 | 0;
-  $15 = i64toi32_i32$2 | i64toi32_i32$3 | 0;
-  $15$hi = i64toi32_i32$1;
-  i64toi32_i32$1 = $9$hi;
-  i64toi32_i32$2 = $15$hi;
-  return $10($9_1 | 0, i64toi32_i32$1 | 0, $15 | 0, i64toi32_i32$2 | 0) | 0 | 0;
+  $0 = $6_1;
+  $6_1 = $8_1;
+  $1_1 = $2_1;
+  $0 = $6_1 | $0 | 0;
+  $2_1 = $1_1 | $4_1 | 0;
+  $1_1 = $0;
+  $0 = $7_1;
+  return $10($9_1 | 0, $0 | 0, $2_1 | 0, $1_1 | 0) | 0 | 0;
  }
  
  var FUNCTION_TABLE = [];