wasm2asm i32 arithmetic support (#1120)

* Rotations, popcnt, ctz, etc

Author: tlively

src/asmjs/shared-constants.cpp

@@ -58,15 +58,20 @@ cashew::IString GLOBAL("global"),
                 ENV("env"),
                 INSTRUMENT("instrument"),
                 MATH_IMUL("Math_imul"),
-                MATH_CLZ32("Math_clz32"),
-                MATH_POPCNT32("Math_popcnt32"),
                 MATH_ABS("Math_abs"),
                 MATH_CEIL("Math_ceil"),
                 MATH_FLOOR("Math_floor"),
                 MATH_TRUNC("Math_trunc"),
                 MATH_NEAREST("Math_NEAREST"),
                 MATH_SQRT("Math_sqrt"),
-                MATH_MIN("Math_max"),
-                MATH_MAX("Math_min");
-
+                MATH_MIN("Math_min"),
+                MATH_MAX("Math_max"),
+                CTZ32("__wasm_ctz_i32"),
+                CTZ64("__wasm_ctz_i64"),
+                POPCNT32("__wasm_popcnt_i32"),
+                POPCNT64("__wasm_popcnt_i64"),
+                ROTL32("__wasm_rotl_i32"),
+                ROTL64("__wasm_rotl_i64"),
+                ROTR32("__wasm_rotr_i32"),
+                ROTR64("__wasm_rotr_i64");
 }

src/asmjs/shared-constants.h

@@ -61,17 +61,22 @@ extern cashew::IString GLOBAL,
                 ENV,
                 INSTRUMENT,
                 MATH_IMUL,
-                MATH_CLZ32,
-                MATH_POPCNT32,
                 MATH_ABS,
                 MATH_CEIL,
                 MATH_FLOOR,
                 MATH_TRUNC,
                 MATH_NEAREST,
                 MATH_SQRT,
                 MATH_MIN,
-                MATH_MAX;
-
+                MATH_MAX,
+                CTZ32,
+                CTZ64,
+                POPCNT32,
+                POPCNT64,
+                ROTL32,
+                ROTL64,
+                ROTR32,
+                ROTR64;
 }
 
 #endif // wasm_asmjs_shared_constants_h

src/emscripten-optimizer/parser.cpp

@@ -50,6 +50,7 @@ IString TOPLEVEL("toplevel"),
         UNARY_PREFIX("unary-prefix"),
         UNARY_POSTFIX("unary-postfix"),
         MATH_FROUND("Math_fround"),
+        MATH_CLZ32("Math_clz32"),
         INT64("i64"),
         INT64_CONST("i64_const"),
         SIMD_FLOAT32X4("SIMD_Float32x4"),

src/emscripten-optimizer/parser.h

@@ -65,6 +65,7 @@ extern IString TOPLEVEL,
                UNARY_PREFIX,
                UNARY_POSTFIX,
                MATH_FROUND,
+               MATH_CLZ32,
                INT64,
                INT64_CONST,
                SIMD_FLOAT32X4,

src/wasm-builder.h

@@ -336,6 +336,11 @@ class Builder {
     return block;
   }
 
+  template<typename ...Ts>
+  Block* blockify(Expression* any, Expression* append, Ts... args) {
+    return blockify(blockify(any, append), args...);
+  }
+
   // ensure a node is a block, if it isn't already, and optionally append to the block
   // this variant sets a name for the block, so it will not reuse a block already named
   Block* blockifyWithName(Expression* any, Name name, Expression* append = nullptr) {