[wasm] Master CL for Binary 0xC changes.

test/unittests/wasm/wasm-macro-gen-unittest.cc

 // 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.
 
 #include "test/unittests/test-utils.h"
 
 #include "src/wasm/wasm-macro-gen.h"
 
 namespace v8 {
 namespace internal {
@@ skipping 38 matching lines @@
 
 TEST_F(WasmMacroGenTest, Statements) {
   EXPECT_SIZE(1, WASM_NOP);
 
   EXPECT_SIZE(4, WASM_SET_LOCAL(0, WASM_ZERO));
 
   EXPECT_SIZE(4, WASM_SET_GLOBAL(0, WASM_ZERO));
 
   EXPECT_SIZE(7, WASM_STORE_MEM(MachineType::Int32(), WASM_ZERO, WASM_ZERO));
 
-  EXPECT_SIZE(5, WASM_IF(WASM_ZERO, WASM_NOP));
+  EXPECT_SIZE(6, WASM_IF(WASM_ZERO, WASM_NOP));
 
-  EXPECT_SIZE(7, WASM_IF_ELSE(WASM_ZERO, WASM_NOP, WASM_NOP));
+  EXPECT_SIZE(8, WASM_IF_ELSE(WASM_ZERO, WASM_NOP, WASM_NOP));
 
   EXPECT_SIZE(5, WASM_SELECT(WASM_ZERO, WASM_NOP, WASM_NOP));
 
-  EXPECT_SIZE(3, WASM_BR(0));
-  EXPECT_SIZE(5, WASM_BR_IF(0, WASM_ZERO));
+  EXPECT_SIZE(2, WASM_BR(0));
+  EXPECT_SIZE(4, WASM_BR_IF(0, WASM_ZERO));
 
-  EXPECT_SIZE(3, WASM_BLOCK(WASM_NOP));
-  EXPECT_SIZE(4, WASM_BLOCK(WASM_NOP, WASM_NOP));
-  EXPECT_SIZE(5, WASM_BLOCK(WASM_NOP, WASM_NOP, WASM_NOP));
+  EXPECT_SIZE(4, WASM_BLOCK(WASM_NOP));
+  EXPECT_SIZE(5, WASM_BLOCK(WASM_NOP, WASM_NOP));
+  EXPECT_SIZE(6, WASM_BLOCK(WASM_NOP, WASM_NOP, WASM_NOP));
 
   EXPECT_SIZE(5, WASM_INFINITE_LOOP);
 
-  EXPECT_SIZE(3, WASM_LOOP(WASM_NOP));
-  EXPECT_SIZE(4, WASM_LOOP(WASM_NOP, WASM_NOP));
-  EXPECT_SIZE(5, WASM_LOOP(WASM_NOP, WASM_NOP, WASM_NOP));
+  EXPECT_SIZE(4, WASM_LOOP(WASM_NOP));
+  EXPECT_SIZE(5, WASM_LOOP(WASM_NOP, WASM_NOP));
+  EXPECT_SIZE(6, WASM_LOOP(WASM_NOP, WASM_NOP, WASM_NOP));
   EXPECT_SIZE(5, WASM_LOOP(WASM_BR(0)));
   EXPECT_SIZE(7, WASM_LOOP(WASM_BR_IF(0, WASM_ZERO)));
 
-  EXPECT_SIZE(2, WASM_RETURN0);
-  EXPECT_SIZE(4, WASM_RETURN1(WASM_ZERO));
+  EXPECT_SIZE(1, WASM_RETURN0);
+  EXPECT_SIZE(3, WASM_RETURN1(WASM_ZERO));
 
   EXPECT_SIZE(1, WASM_UNREACHABLE);
 }
 
 TEST_F(WasmMacroGenTest, MacroStatements) {
-  EXPECT_SIZE(10, WASM_WHILE(WASM_I8(0), WASM_NOP));
+  EXPECT_SIZE(11, WASM_WHILE(WASM_I8(0), WASM_NOP));
   EXPECT_SIZE(7, WASM_INC_LOCAL(0));
   EXPECT_SIZE(7, WASM_INC_LOCAL_BY(0, 3));
 
-  EXPECT_SIZE(3, WASM_BREAK(0));
-  EXPECT_SIZE(3, WASM_CONTINUE(0));
+  EXPECT_SIZE(2, WASM_CONTINUE(0));
 }
 
 TEST_F(WasmMacroGenTest, BrTable) {
-  EXPECT_SIZE(9, WASM_BR_TABLE(WASM_ZERO, 1, BR_TARGET(1)));
-  EXPECT_SIZE(11, WASM_BR_TABLEV(WASM_ZERO, WASM_ZERO, 1, BR_TARGET(1)));
+  EXPECT_SIZE(5, WASM_BR_TABLE(WASM_ZERO, 1, BR_TARGET(0)));
+  EXPECT_SIZE(6, WASM_BR_TABLE(WASM_ZERO, 2, BR_TARGET(0), BR_TARGET(0)));
 }
 
 TEST_F(WasmMacroGenTest, Expressions) {
   EXPECT_SIZE(2, WASM_GET_LOCAL(0));
   EXPECT_SIZE(2, WASM_GET_LOCAL(1));
   EXPECT_SIZE(2, WASM_GET_LOCAL(12));
   EXPECT_SIZE(2, WASM_GET_GLOBAL(0));
   EXPECT_SIZE(2, WASM_GET_GLOBAL(1));
   EXPECT_SIZE(2, WASM_GET_GLOBAL(12));
   EXPECT_SIZE(5, WASM_LOAD_MEM(MachineType::Int32(), WASM_ZERO));
   EXPECT_SIZE(5, WASM_LOAD_MEM(MachineType::Float64(), WASM_ZERO));
   EXPECT_SIZE(5, WASM_LOAD_MEM(MachineType::Float32(), WASM_ZERO));
 
   EXPECT_SIZE(3, WASM_NOT(WASM_ZERO));
 
-  EXPECT_SIZE(5, WASM_BRV(1, WASM_ZERO));
-  EXPECT_SIZE(7, WASM_BRV_IF(1, WASM_ZERO, WASM_ZERO));
+  EXPECT_SIZE(4, WASM_BRV(1, WASM_ZERO));
+  EXPECT_SIZE(6, WASM_BRV_IF(1, WASM_ZERO, WASM_ZERO));
 
-  EXPECT_SIZE(4, WASM_BLOCK(WASM_ZERO));
-  EXPECT_SIZE(5, WASM_BLOCK(WASM_NOP, WASM_ZERO));
-  EXPECT_SIZE(6, WASM_BLOCK(WASM_NOP, WASM_NOP, WASM_ZERO));
+  EXPECT_SIZE(5, WASM_BLOCK(WASM_ZERO));
+  EXPECT_SIZE(6, WASM_BLOCK(WASM_NOP, WASM_ZERO));
+  EXPECT_SIZE(7, WASM_BLOCK(WASM_NOP, WASM_NOP, WASM_ZERO));
 
-  EXPECT_SIZE(4, WASM_LOOP(WASM_ZERO));
-  EXPECT_SIZE(5, WASM_LOOP(WASM_NOP, WASM_ZERO));
-  EXPECT_SIZE(6, WASM_LOOP(WASM_NOP, WASM_NOP, WASM_ZERO));
+  EXPECT_SIZE(5, WASM_LOOP(WASM_ZERO));
+  EXPECT_SIZE(6, WASM_LOOP(WASM_NOP, WASM_ZERO));
+  EXPECT_SIZE(7, WASM_LOOP(WASM_NOP, WASM_NOP, WASM_ZERO));
 }
 
 TEST_F(WasmMacroGenTest, CallFunction) {
-  EXPECT_SIZE(3, WASM_CALL_FUNCTION0(0));
-  EXPECT_SIZE(3, WASM_CALL_FUNCTION0(1));
-  EXPECT_SIZE(3, WASM_CALL_FUNCTION0(11));
+  EXPECT_SIZE(2, WASM_CALL_FUNCTION0(0));
+  EXPECT_SIZE(2, WASM_CALL_FUNCTION0(1));
+  EXPECT_SIZE(2, WASM_CALL_FUNCTION0(11));
 
-  EXPECT_SIZE(5, WASM_CALL_FUNCTION1(0, WASM_ZERO));
-  EXPECT_SIZE(7, WASM_CALL_FUNCTION2(1, WASM_ZERO, WASM_ZERO));
-}
-
-TEST_F(WasmMacroGenTest, CallImport) {
-  EXPECT_SIZE(3, WASM_CALL_IMPORT0(0));
-  EXPECT_SIZE(3, WASM_CALL_IMPORT0(1));
-  EXPECT_SIZE(3, WASM_CALL_IMPORT0(11));
-
-  EXPECT_SIZE(5, WASM_CALL_IMPORT1(0, WASM_ZERO));
-  EXPECT_SIZE(7, WASM_CALL_IMPORT2(1, WASM_ZERO, WASM_ZERO));
+  EXPECT_SIZE(4, WASM_CALL_FUNCTION(0, WASM_ZERO));
+  EXPECT_SIZE(6, WASM_CALL_FUNCTION(1, WASM_ZERO, WASM_ZERO));
 }
 
 TEST_F(WasmMacroGenTest, CallIndirect) {
-  EXPECT_SIZE(5, WASM_CALL_INDIRECT0(0, WASM_ZERO));
-  EXPECT_SIZE(5, WASM_CALL_INDIRECT0(1, WASM_ZERO));
-  EXPECT_SIZE(5, WASM_CALL_INDIRECT0(11, WASM_ZERO));
+  EXPECT_SIZE(4, WASM_CALL_INDIRECT0(0, WASM_ZERO));
+  EXPECT_SIZE(4, WASM_CALL_INDIRECT0(1, WASM_ZERO));
+  EXPECT_SIZE(4, WASM_CALL_INDIRECT0(11, WASM_ZERO));
 
-  EXPECT_SIZE(7, WASM_CALL_INDIRECT1(0, WASM_ZERO, WASM_ZERO));
-  EXPECT_SIZE(9, WASM_CALL_INDIRECT2(1, WASM_ZERO, WASM_ZERO, WASM_ZERO));
+  EXPECT_SIZE(6, WASM_CALL_INDIRECT1(0, WASM_ZERO, WASM_ZERO));
+  EXPECT_SIZE(8, WASM_CALL_INDIRECT2(1, WASM_ZERO, WASM_ZERO, WASM_ZERO));
 }
 
 TEST_F(WasmMacroGenTest, Int32Ops) {
   EXPECT_SIZE(5, WASM_I32_ADD(WASM_ZERO, WASM_ZERO));
   EXPECT_SIZE(5, WASM_I32_SUB(WASM_ZERO, WASM_ZERO));
   EXPECT_SIZE(5, WASM_I32_MUL(WASM_ZERO, WASM_ZERO));
   EXPECT_SIZE(5, WASM_I32_DIVS(WASM_ZERO, WASM_ZERO));
   EXPECT_SIZE(5, WASM_I32_DIVU(WASM_ZERO, WASM_ZERO));
   EXPECT_SIZE(5, WASM_I32_REMS(WASM_ZERO, WASM_ZERO));
   EXPECT_SIZE(5, WASM_I32_REMU(WASM_ZERO, WASM_ZERO));
@@ skipping 153 matching lines @@
     EXPECT_SIZE(5, WASM_LOAD_MEM_OFFSET(kMemTypes[i], 11, WASM_ZERO));
   }
   for (size_t i = 0; i < arraysize(kMemTypes); i++) {
     EXPECT_SIZE(7, WASM_STORE_MEM_OFFSET(kMemTypes[i], 13, WASM_ZERO,
                                          WASM_GET_LOCAL(0)));
   }
 }
 }  // namespace wasm
 }  // namespace internal
 }  // namespace v8