[wasm] Experimental: Add support for multiple non-homogeneous tables

src/wasm/wasm-macro-gen.h

Index: src/wasm/wasm-macro-gen.h
diff --git a/src/wasm/wasm-macro-gen.h b/src/wasm/wasm-macro-gen.h
index abd57d505a11a51359f0b819229b7917a16efb06..fb30bb4744a1ccb1b9380a8649855cc7b9b01144 100644
--- a/src/wasm/wasm-macro-gen.h
+++ b/src/wasm/wasm-macro-gen.h
@@ -403,20 +403,21 @@ class LocalDeclEncoder {
 #define WASM_CALL_IMPORTN(arity, index, ...) \
   __VA_ARGS__, kExprCallImport, U32V_1(arity), static_cast<byte>(index),
 
-#define WASM_CALL_INDIRECT0(index, func) \
-  func, kExprCallIndirect, 0, static_cast<byte>(index)
-#define WASM_CALL_INDIRECT1(index, func, a) \
-  func, a, kExprCallIndirect, 1, static_cast<byte>(index)
-#define WASM_CALL_INDIRECT2(index, func, a, b) \
-  func, a, b, kExprCallIndirect, 2, static_cast<byte>(index)
-#define WASM_CALL_INDIRECT3(index, func, a, b, c) \
-  func, a, b, c, kExprCallIndirect, 3, static_cast<byte>(index)
-#define WASM_CALL_INDIRECT4(index, func, a, b, c, d) \
-  func, a, b, c, d, kExprCallIndirect, 4, static_cast<byte>(index)
-#define WASM_CALL_INDIRECT5(index, func, a, b, c, d, e) \
-  func, a, b, c, d, e, kExprCallIndirect, 5, static_cast<byte>(index)
-#define WASM_CALL_INDIRECTN(arity, index, func, ...) \
-  func, __VA_ARGS__, kExprCallIndirect, U32V_1(arity), static_cast<byte>(index)
+#define WASM_CALL_INDIRECT0(index, table, func) \
+  func, kExprCallIndirect, 0, static_cast<byte>(index), table
+#define WASM_CALL_INDIRECT1(index, table, func, a) \
+  func, a, kExprCallIndirect, 1, static_cast<byte>(index), table
+#define WASM_CALL_INDIRECT2(index, table, func, a, b) \
+  func, a, b, kExprCallIndirect, 2, static_cast<byte>(index), table
+#define WASM_CALL_INDIRECT3(index, table, func, a, b, c) \
+  func, a, b, c, kExprCallIndirect, 3, static_cast<byte>(index), table
+#define WASM_CALL_INDIRECT4(index, table, func, a, b, c, d) \
+  func, a, b, c, d, kExprCallIndirect, 4, static_cast<byte>(index), table
+#define WASM_CALL_INDIRECT5(index, table, func, a, b, c, d, e) \
+  func, a, b, c, d, e, kExprCallIndirect, 5, static_cast<byte>(index), table
+#define WASM_CALL_INDIRECTN(arity, table, index, func, ...) \
+  func, __VA_ARGS__, kExprCallIndirect, U32V_1(arity),      \
+      static_cast<byte>(index), table
 
 #define WASM_NOT(x) x, kExprI32Eqz
 #define WASM_SEQ(...) __VA_ARGS__
@@ -589,6 +590,9 @@ class LocalDeclEncoder {
 #define SIG_ENTRY_v_v kWasmFunctionTypeForm, 0, 0
 #define SIZEOF_SIG_ENTRY_v_v 3
 
+#define SIG_ENTRY_ANYFUNC kWasmFunctionTypeForm, 1, kLocalVoid, 0
+#define SIZEOF_SIG_ENTRY_ANYFUNC 3
+
 #define SIG_ENTRY_v_x(a) kWasmFunctionTypeForm, 1, a, 0
 #define SIG_ENTRY_v_xx(a, b) kWasmFunctionTypeForm, 2, a, b, 0
 #define SIG_ENTRY_v_xxx(a, b, c) kWasmFunctionTypeForm, 3, a, b, c, 0