[wasm] Remove TableSwitch and replace with br_table.

src/wasm/wasm-macro-gen.h

 // Copyright 2015 the V8 project authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef V8_WASM_MACRO_GEN_H_
 #define V8_WASM_MACRO_GEN_H_
 
 #include "src/wasm/wasm-opcodes.h"
 
 // Convenience macros for building Wasm bytecode directly into a byte array.
 
+#define U32_LE(v)                                    \
+  static_cast<byte>(v), static_cast<byte>((v) >> 8), \
+      static_cast<byte>((v) >> 16), static_cast<byte>((v) >> 24)
+
+#define U16_LE(v) static_cast<byte>(v), static_cast<byte>((v) >> 8)
+
+#define WASM_MODULE_HEADER U32_LE(kWasmMagic), U32_LE(kWasmVersion)

[rossberg, 2016/03/04 14:25:22]

Nit: perhaps move the concrete index macros to a separate section; at least put
them after all the generic number macros.

+
+#define SIG_INDEX(v) U16_LE(v)
+#define FUNC_INDEX(v) U16_LE(v)
+#define NAME_OFFSET(v) U32_LE(v)
+#define BR_TARGET(v) U16_LE(v)
+
+#define MASK_7 ((1 << 7) - 1)
+#define MASK_14 ((1 << 14) - 1)
+#define MASK_21 ((1 << 21) - 1)
+#define MASK_28 ((1 << 28) - 1)
+
+#define U32V_1(x) static_cast<byte>(x & MASK_7)

[bradn, 2016/03/03 18:08:23]

Maybe the leb stuff should go in its own header? (You keep having to move it up
:-)

+#define U32V_2(x) \
+  static_cast<byte>((x & MASK_7) | 0x80), static_cast<byte>((x >> 7) & MASK_7)
+#define U32V_3(x)                                    \
+  static_cast<byte>((x & MASK_7) | 0x80),            \
+      static_cast<byte>(((x >> 7) & MASK_7) | 0x80), \
+      static_cast<byte>((x >> 14) & MASK_7)
+#define U32V_4(x)                                     \
+  static_cast<byte>((x & MASK_7) | 0x80),             \
+      static_cast<byte>(((x >> 7) & MASK_7) | 0x80),  \
+      static_cast<byte>(((x >> 14) & MASK_7) | 0x80), \
+      static_cast<byte>((x >> 21) & MASK_7)
+#define U32V_5(x)                                     \
+  static_cast<byte>((x & MASK_7) | 0x80),             \
+      static_cast<byte>(((x >> 7) & MASK_7) | 0x80),  \
+      static_cast<byte>(((x >> 14) & MASK_7) | 0x80), \
+      static_cast<byte>(((x >> 21) & MASK_7) | 0x80), \
+      static_cast<byte>((x >> 28) & 0xF)
+
 //------------------------------------------------------------------------------
 // Control.
 //------------------------------------------------------------------------------
 #define WASM_NOP kExprNop
 
 #define WASM_BLOCK(count, ...) kExprBlock, static_cast<byte>(count), __VA_ARGS__
 #define WASM_INFINITE_LOOP kExprLoop, 1, kExprBr, 0, kExprNop
 #define WASM_LOOP(count, ...) kExprLoop, static_cast<byte>(count), __VA_ARGS__
 #define WASM_IF(cond, tstmt) kExprIf, cond, tstmt
 #define WASM_IF_ELSE(cond, tstmt, fstmt) kExprIfElse, cond, tstmt, fstmt
 #define WASM_SELECT(cond, tval, fval) kExprSelect, cond, tval, fval
 #define WASM_BR(depth) kExprBr, static_cast<byte>(depth), kExprNop
 #define WASM_BR_IF(depth, cond) \
   kExprBrIf, static_cast<byte>(depth), kExprNop, cond
 #define WASM_BRV(depth, val) kExprBr, static_cast<byte>(depth), val
 #define WASM_BRV_IF(depth, val, cond) \
   kExprBrIf, static_cast<byte>(depth), val, cond
 #define WASM_BREAK(depth) kExprBr, static_cast<byte>(depth + 1), kExprNop
 #define WASM_CONTINUE(depth) kExprBr, static_cast<byte>(depth), kExprNop
 #define WASM_BREAKV(depth, val) kExprBr, static_cast<byte>(depth + 1), val
 #define WASM_RETURN0 kExprReturn
 #define WASM_RETURN(...) kExprReturn, __VA_ARGS__
 #define WASM_UNREACHABLE kExprUnreachable
 
-#define WASM_TABLESWITCH_OP(case_count, table_count, ...)                 \
-  kExprTableSwitch, static_cast<byte>(case_count),                        \
-      static_cast<byte>(case_count >> 8), static_cast<byte>(table_count), \
-      static_cast<byte>(table_count >> 8), __VA_ARGS__
-
-#define WASM_TABLESWITCH_BODY0(key) key
-
-#define WASM_TABLESWITCH_BODY(key, ...) key, __VA_ARGS__
-
-#define WASM_CASE(x) static_cast<byte>(x), static_cast<byte>(x >> 8)
-#define WASM_CASE_BR(x) static_cast<byte>(x), static_cast<byte>(0x80 | (x) >> 8)
+#define WASM_BR_TABLE(key, count, ...) \
+  kExprBrTable, U16_LE(count), __VA_ARGS__, key
 
 //------------------------------------------------------------------------------
 // Misc expressions.
 //------------------------------------------------------------------------------
 #define WASM_ID(...) __VA_ARGS__
 #define WASM_ZERO kExprI8Const, 0
 #define WASM_ONE kExprI8Const, 1
 #define WASM_I8(val) kExprI8Const, static_cast<byte>(val)
 #define WASM_I32(val)                                                 \
   kExprI32Const, static_cast<byte>(val), static_cast<byte>(val >> 8), \
@@ skipping 201 matching lines @@
 #define WASM_F32_REINTERPRET_I32(x) kExprF32ReinterpretI32, x
 #define WASM_F64_SCONVERT_I32(x) kExprF64SConvertI32, x
 #define WASM_F64_UCONVERT_I32(x) kExprF64UConvertI32, x
 #define WASM_F64_SCONVERT_I64(x) kExprF64SConvertI64, x
 #define WASM_F64_UCONVERT_I64(x) kExprF64UConvertI64, x
 #define WASM_F64_CONVERT_F32(x) kExprF64ConvertF32, x
 #define WASM_F64_REINTERPRET_I64(x) kExprF64ReinterpretI64, x
 #define WASM_I32_REINTERPRET_F32(x) kExprI32ReinterpretF32, x
 #define WASM_I64_REINTERPRET_F64(x) kExprI64ReinterpretF64, x
 
-#define U32_LE(v)                                    \
-  static_cast<byte>(v), static_cast<byte>((v) >> 8), \
-      static_cast<byte>((v) >> 16), static_cast<byte>((v) >> 24)
-
-#define U16_LE(v) static_cast<byte>(v), static_cast<byte>((v) >> 8)
-
-#define WASM_MODULE_HEADER U32_LE(kWasmMagic), U32_LE(kWasmVersion)
-
-#define SIG_INDEX(v) U16_LE(v)
-#define FUNC_INDEX(v) U16_LE(v)
-#define NAME_OFFSET(v) U32_LE(v)
-
-#define MASK_7 ((1 << 7) - 1)
-#define MASK_14 ((1 << 14) - 1)
-#define MASK_21 ((1 << 21) - 1)
-#define MASK_28 ((1 << 28) - 1)
-
-#define U32V_1(x) static_cast<byte>(x & MASK_7)
-#define U32V_2(x) \
-  static_cast<byte>((x & MASK_7) | 0x80), static_cast<byte>((x >> 7) & MASK_7)
-#define U32V_3(x)                                    \
-  static_cast<byte>((x & MASK_7) | 0x80),            \
-      static_cast<byte>(((x >> 7) & MASK_7) | 0x80), \
-      static_cast<byte>((x >> 14) & MASK_7)
-#define U32V_4(x)                                     \
-  static_cast<byte>((x & MASK_7) | 0x80),             \
-      static_cast<byte>(((x >> 7) & MASK_7) | 0x80),  \
-      static_cast<byte>(((x >> 14) & MASK_7) | 0x80), \
-      static_cast<byte>((x >> 21) & MASK_7)
-#define U32V_5(x)                                     \
-  static_cast<byte>((x & MASK_7) | 0x80),             \
-      static_cast<byte>(((x >> 7) & MASK_7) | 0x80),  \
-      static_cast<byte>(((x >> 14) & MASK_7) | 0x80), \
-      static_cast<byte>(((x >> 21) & MASK_7) | 0x80), \
-      static_cast<byte>((x >> 28) & 0xF)
-
 #endif  // V8_WASM_MACRO_GEN_H_