1 files changed, 28 insertions, 53 deletions

diff --git a/test/wasm2js/float_misc.2asm.js b/test/wasm2js/float_misc.2asm.js
index 59a49b07c..0e4c241e8 100644
--- a/test/wasm2js/float_misc.2asm.js
+++ b/test/wasm2js/float_misc.2asm.js
@@ -93,7 +93,7 @@ function asmFunc(global, env, buffer) {
  function $7(x, y) {
   x = Math_fround(x);
   y = Math_fround(y);
-  return Math_fround((wasm2js_scratch_store_i32(0, (wasm2js_scratch_store_f32(x), wasm2js_scratch_load_i32(0)) & 2147483647 | (wasm2js_scratch_store_f32(y), wasm2js_scratch_load_i32(0)) & 2147483648), wasm2js_scratch_load_f32()));
+  return Math_fround((wasm2js_scratch_store_i32(0, (wasm2js_scratch_store_f32(x), wasm2js_scratch_load_i32(0)) & 2147483647 | (wasm2js_scratch_store_f32(y), wasm2js_scratch_load_i32(0)) & -2147483648), wasm2js_scratch_load_f32()));
  }
  
  function $8(x) {
@@ -108,12 +108,12 @@ function asmFunc(global, env, buffer) {
  
  function $10(x) {
   x = Math_fround(x);
-  return Math_fround(Math_fround(__wasm_trunc_f32(Math_fround(x))));
+  return Math_fround(__wasm_trunc_f32(x));
  }
  
  function $11(x) {
   x = Math_fround(x);
-  return Math_fround(Math_fround(__wasm_nearest_f32(Math_fround(x))));
+  return Math_fround(__wasm_nearest_f32(x));
  }
  
  function $12(x, y) {
@@ -175,14 +175,14 @@ function asmFunc(global, env, buffer) {
   i64toi32_i32$0 = wasm2js_scratch_load_i32(1 | 0) | 0;
   i64toi32_i32$2 = wasm2js_scratch_load_i32(0 | 0) | 0;
   i64toi32_i32$1 = 2147483647;
-  i64toi32_i32$3 = 4294967295;
+  i64toi32_i32$3 = -1;
   i64toi32_i32$1 = i64toi32_i32$0 & i64toi32_i32$1;
   $4_1 = i64toi32_i32$2 & i64toi32_i32$3;
   $4$hi = i64toi32_i32$1;
   wasm2js_scratch_store_f64(+y);
   i64toi32_i32$1 = wasm2js_scratch_load_i32(1 | 0) | 0;
   i64toi32_i32$0 = wasm2js_scratch_load_i32(0 | 0) | 0;
-  i64toi32_i32$2 = 2147483648;
+  i64toi32_i32$2 = -2147483648;
   i64toi32_i32$3 = 0;
   i64toi32_i32$2 = i64toi32_i32$1 & i64toi32_i32$2;
   $7_1 = i64toi32_i32$0 & i64toi32_i32$3;
@@ -194,7 +194,7 @@ function asmFunc(global, env, buffer) {
   i64toi32_i32$0 = i64toi32_i32$2 | i64toi32_i32$0;
   wasm2js_scratch_store_i32(0 | 0, i64toi32_i32$1 | i64toi32_i32$3);
   wasm2js_scratch_store_i32(1 | 0, i64toi32_i32$0 | 0);
-  return +(+wasm2js_scratch_load_f64());
+  return +wasm2js_scratch_load_f64();
  }
  
  function $22(x) {
@@ -209,12 +209,12 @@ function asmFunc(global, env, buffer) {
  
  function $24(x) {
   x = +x;
-  return +(+__wasm_trunc_f64(+x));
+  return +__wasm_trunc_f64(x);
  }
  
  function $25(x) {
   x = +x;
-  return +(+__wasm_nearest_f64(+x));
+  return +__wasm_nearest_f64(x);
  }
  
  function $26(x, y) {
@@ -230,84 +230,62 @@ function asmFunc(global, env, buffer) {
  }
  
  function legalstub$0($0_1, $1_1) {
-  $0_1 = +$0_1;
-  $1_1 = +$1_1;
-  return +(+Math_fround($0(Math_fround(Math_fround($0_1)), Math_fround(Math_fround($1_1)))));
+  return +$0(Math_fround($0_1), Math_fround($1_1));
  }
  
  function legalstub$1($0_1, $1_1) {
-  $0_1 = +$0_1;
-  $1_1 = +$1_1;
-  return +(+Math_fround($1(Math_fround(Math_fround($0_1)), Math_fround(Math_fround($1_1)))));
+  return +$1(Math_fround($0_1), Math_fround($1_1));
  }
  
  function legalstub$2($0_1, $1_1) {
-  $0_1 = +$0_1;
-  $1_1 = +$1_1;
-  return +(+Math_fround($2(Math_fround(Math_fround($0_1)), Math_fround(Math_fround($1_1)))));
+  return +$2(Math_fround($0_1), Math_fround($1_1));
  }
  
  function legalstub$3($0_1, $1_1) {
-  $0_1 = +$0_1;
-  $1_1 = +$1_1;
-  return +(+Math_fround($3(Math_fround(Math_fround($0_1)), Math_fround(Math_fround($1_1)))));
+  return +$3(Math_fround($0_1), Math_fround($1_1));
  }
  
  function legalstub$4($0_1) {
-  $0_1 = +$0_1;
-  return +(+Math_fround($4(Math_fround(Math_fround($0_1)))));
+  return +$4(Math_fround($0_1));
  }
  
  function legalstub$5($0_1) {
-  $0_1 = +$0_1;
-  return +(+Math_fround($5(Math_fround(Math_fround($0_1)))));
+  return +$5(Math_fround($0_1));
  }
  
  function legalstub$6($0_1) {
-  $0_1 = +$0_1;
-  return +(+Math_fround($6(Math_fround(Math_fround($0_1)))));
+  return +$6(Math_fround($0_1));
  }
  
  function legalstub$7($0_1, $1_1) {
-  $0_1 = +$0_1;
-  $1_1 = +$1_1;
-  return +(+Math_fround($7(Math_fround(Math_fround($0_1)), Math_fround(Math_fround($1_1)))));
+  return +$7(Math_fround($0_1), Math_fround($1_1));
  }
  
  function legalstub$8($0_1) {
-  $0_1 = +$0_1;
-  return +(+Math_fround($8(Math_fround(Math_fround($0_1)))));
+  return +$8(Math_fround($0_1));
  }
  
  function legalstub$9($0_1) {
-  $0_1 = +$0_1;
-  return +(+Math_fround($9(Math_fround(Math_fround($0_1)))));
+  return +$9(Math_fround($0_1));
  }
  
  function legalstub$10($0_1) {
-  $0_1 = +$0_1;
-  return +(+Math_fround($10(Math_fround(Math_fround($0_1)))));
+  return +$10(Math_fround($0_1));
  }
  
  function legalstub$11($0_1) {
-  $0_1 = +$0_1;
-  return +(+Math_fround($11(Math_fround(Math_fround($0_1)))));
+  return +$11(Math_fround($0_1));
  }
  
  function legalstub$12($0_1, $1_1) {
-  $0_1 = +$0_1;
-  $1_1 = +$1_1;
-  return +(+Math_fround($12(Math_fround(Math_fround($0_1)), Math_fround(Math_fround($1_1)))));
+  return +$12(Math_fround($0_1), Math_fround($1_1));
  }
  
  function legalstub$13($0_1, $1_1) {
-  $0_1 = +$0_1;
-  $1_1 = +$1_1;
-  return +(+Math_fround($13(Math_fround(Math_fround($0_1)), Math_fround(Math_fround($1_1)))));
+  return +$13(Math_fround($0_1), Math_fround($1_1));
  }
  
  function __wasm_nearest_f32(var$0) {
-  var$0 = Math_fround(var$0);
   var var$1 = Math_fround(0), var$2 = Math_fround(0), wasm2js_f32$0 = Math_fround(0), wasm2js_f32$1 = Math_fround(0), wasm2js_i32$0 = 0;
   var$1 = Math_fround(Math_floor(var$0));
   var$2 = Math_fround(var$0 - var$1);
@@ -315,17 +293,16 @@ function asmFunc(global, env, buffer) {
    {
     var$0 = Math_fround(Math_ceil(var$0));
     if (var$2 > Math_fround(.5)) {
-     return Math_fround(var$0)
+     return var$0
     }
     var$2 = Math_fround(var$1 * Math_fround(.5));
     var$1 = (wasm2js_f32$0 = var$1, wasm2js_f32$1 = var$0, wasm2js_i32$0 = Math_fround(var$2 - Math_fround(Math_floor(var$2))) == Math_fround(0.0), wasm2js_i32$0 ? wasm2js_f32$0 : wasm2js_f32$1);
    }
   }
-  return Math_fround(var$1);
+  return var$1;
  }
  
  function __wasm_nearest_f64(var$0) {
-  var$0 = +var$0;
   var var$1 = 0.0, var$2 = 0.0, wasm2js_f64$0 = 0.0, wasm2js_f64$1 = 0.0, wasm2js_i32$0 = 0;
   var$1 = Math_floor(var$0);
   var$2 = var$0 - var$1;
@@ -333,25 +310,23 @@ function asmFunc(global, env, buffer) {
    {
     var$0 = Math_ceil(var$0);
     if (var$2 > .5) {
-     return +var$0
+     return var$0
     }
     var$2 = var$1 * .5;
     var$1 = (wasm2js_f64$0 = var$1, wasm2js_f64$1 = var$0, wasm2js_i32$0 = var$2 - Math_floor(var$2) == 0.0, wasm2js_i32$0 ? wasm2js_f64$0 : wasm2js_f64$1);
    }
   }
-  return +var$1;
+  return var$1;
  }
  
  function __wasm_trunc_f32(var$0) {
-  var$0 = Math_fround(var$0);
   var wasm2js_f32$0 = Math_fround(0), wasm2js_f32$1 = Math_fround(0), wasm2js_i32$0 = 0;
-  return Math_fround((wasm2js_f32$0 = Math_fround(Math_ceil(var$0)), wasm2js_f32$1 = Math_fround(Math_floor(var$0)), wasm2js_i32$0 = var$0 < Math_fround(0.0), wasm2js_i32$0 ? wasm2js_f32$0 : wasm2js_f32$1));
+  return wasm2js_f32$0 = Math_fround(Math_ceil(var$0)), wasm2js_f32$1 = Math_fround(Math_floor(var$0)), wasm2js_i32$0 = var$0 < Math_fround(0.0), wasm2js_i32$0 ? wasm2js_f32$0 : wasm2js_f32$1;
  }
  
  function __wasm_trunc_f64(var$0) {
-  var$0 = +var$0;
   var wasm2js_f64$0 = 0.0, wasm2js_f64$1 = 0.0, wasm2js_i32$0 = 0;
-  return +(wasm2js_f64$0 = Math_ceil(var$0), wasm2js_f64$1 = Math_floor(var$0), wasm2js_i32$0 = var$0 < 0.0, wasm2js_i32$0 ? wasm2js_f64$0 : wasm2js_f64$1);
+  return wasm2js_f64$0 = Math_ceil(var$0), wasm2js_f64$1 = Math_floor(var$0), wasm2js_i32$0 = var$0 < 0.0, wasm2js_i32$0 ? wasm2js_f64$0 : wasm2js_f64$1;
  }
  
  var FUNCTION_TABLE = [];