[wasm] Remove non-standard kExprI8Const bytecode

test/cctest/wasm/test-run-wasm-module.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 <stdlib.h>
 #include <string.h>
 
 #include "src/snapshot/code-serializer.h"
 #include "src/version.h"
 #include "src/wasm/module-decoder.h"
@@ skipping 57 matching lines @@
 TEST(Run_WasmModule_Return114) {
   {
     static const int32_t kReturnValue = 114;
     TestSignatures sigs;
     v8::internal::AccountingAllocator allocator;
     Zone zone(&allocator, ZONE_NAME);
 
     WasmModuleBuilder* builder = new (&zone) WasmModuleBuilder(&zone);
     WasmFunctionBuilder* f = builder->AddFunction(sigs.i_v());
     ExportAsMain(f);
-    byte code[] = {WASM_I8(kReturnValue)};
+    byte code[] = {WASM_I32V_2(kReturnValue)};
     f->EmitCode(code, sizeof(code));
     TestModule(&zone, builder, kReturnValue);
   }
   Cleanup();
 }
 
 TEST(Run_WasmModule_CallAdd) {
   {
     v8::internal::AccountingAllocator allocator;
     Zone zone(&allocator, ZONE_NAME);
     TestSignatures sigs;
 
     WasmModuleBuilder* builder = new (&zone) WasmModuleBuilder(&zone);
 
     WasmFunctionBuilder* f1 = builder->AddFunction(sigs.i_ii());
     uint16_t param1 = 0;
     uint16_t param2 = 1;
     byte code1[] = {
         WASM_I32_ADD(WASM_GET_LOCAL(param1), WASM_GET_LOCAL(param2))};
     f1->EmitCode(code1, sizeof(code1));
 
     WasmFunctionBuilder* f2 = builder->AddFunction(sigs.i_v());
 
     ExportAsMain(f2);
     byte code2[] = {
-        WASM_CALL_FUNCTION(f1->func_index(), WASM_I8(77), WASM_I8(22))};
+        WASM_CALL_FUNCTION(f1->func_index(), WASM_I32V_2(77), WASM_I32V_1(22))};
     f2->EmitCode(code2, sizeof(code2));
     TestModule(&zone, builder, 99);
   }
   Cleanup();
 }
 
 TEST(Run_WasmModule_ReadLoadedDataSegment) {
   {
     static const byte kDataSegmentDest0 = 12;
     v8::internal::AccountingAllocator allocator;
     Zone zone(&allocator, ZONE_NAME);
     TestSignatures sigs;
 
     WasmModuleBuilder* builder = new (&zone) WasmModuleBuilder(&zone);
     WasmFunctionBuilder* f = builder->AddFunction(sigs.i_v());
 
     ExportAsMain(f);
     byte code[] = {
-        WASM_LOAD_MEM(MachineType::Int32(), WASM_I8(kDataSegmentDest0))};
+        WASM_LOAD_MEM(MachineType::Int32(), WASM_I32V_1(kDataSegmentDest0))};
     f->EmitCode(code, sizeof(code));
     byte data[] = {0xaa, 0xbb, 0xcc, 0xdd};
     builder->AddDataSegment(data, sizeof(data), kDataSegmentDest0);
     TestModule(&zone, builder, 0xddccbbaa);
   }
   Cleanup();
 }
 
 TEST(Run_WasmModule_CheckMemoryIsZero) {
   {
     static const int kCheckSize = 16 * 1024;
     v8::internal::AccountingAllocator allocator;
     Zone zone(&allocator, ZONE_NAME);
     TestSignatures sigs;
 
     WasmModuleBuilder* builder = new (&zone) WasmModuleBuilder(&zone);
     WasmFunctionBuilder* f = builder->AddFunction(sigs.i_v());
 
     uint16_t localIndex = f->AddLocal(kWasmI32);
     ExportAsMain(f);
     byte code[] = {WASM_BLOCK_I(
         WASM_WHILE(
             WASM_I32_LTS(WASM_GET_LOCAL(localIndex), WASM_I32V_3(kCheckSize)),
             WASM_IF_ELSE(
                 WASM_LOAD_MEM(MachineType::Int32(), WASM_GET_LOCAL(localIndex)),
-                WASM_BRV(3, WASM_I8(-1)), WASM_INC_LOCAL_BY(localIndex, 4))),
-        WASM_I8(11))};
+                WASM_BRV(3, WASM_I32V_1(-1)),
+                WASM_INC_LOCAL_BY(localIndex, 4))),
+        WASM_I32V_1(11))};
     f->EmitCode(code, sizeof(code));
     TestModule(&zone, builder, 11);
   }
   Cleanup();
 }
 
 TEST(Run_WasmModule_CallMain_recursive) {
   {
     v8::internal::AccountingAllocator allocator;
     Zone zone(&allocator, ZONE_NAME);
     TestSignatures sigs;
 
     WasmModuleBuilder* builder = new (&zone) WasmModuleBuilder(&zone);
     WasmFunctionBuilder* f = builder->AddFunction(sigs.i_v());
 
     uint16_t localIndex = f->AddLocal(kWasmI32);
     ExportAsMain(f);
     byte code[] = {
         WASM_SET_LOCAL(localIndex,
                        WASM_LOAD_MEM(MachineType::Int32(), WASM_ZERO)),
-        WASM_IF_ELSE_I(WASM_I32_LTS(WASM_GET_LOCAL(localIndex), WASM_I8(5)),
+        WASM_IF_ELSE_I(WASM_I32_LTS(WASM_GET_LOCAL(localIndex), WASM_I32V_1(5)),
                        WASM_SEQ(WASM_STORE_MEM(MachineType::Int32(), WASM_ZERO,
                                                WASM_INC_LOCAL(localIndex)),
                                 WASM_CALL_FUNCTION0(0)),
-                       WASM_I8(55))};
+                       WASM_I32V_1(55))};
     f->EmitCode(code, sizeof(code));
     TestModule(&zone, builder, 55);
   }
   Cleanup();
 }
 
 TEST(Run_WasmModule_Global) {
   {
     v8::internal::AccountingAllocator allocator;
     Zone zone(&allocator, ZONE_NAME);
@@ skipping 248 matching lines @@
   {
     // Initial memory size = 16 + GrowMemory(10)
     static const int kExpectedValue = 26;
     TestSignatures sigs;
     v8::internal::AccountingAllocator allocator;
     Zone zone(&allocator, ZONE_NAME);
 
     WasmModuleBuilder* builder = new (&zone) WasmModuleBuilder(&zone);
     WasmFunctionBuilder* f = builder->AddFunction(sigs.i_v());
     ExportAsMain(f);
-    byte code[] = {WASM_GROW_MEMORY(WASM_I8(10)), WASM_DROP, WASM_MEMORY_SIZE};
+    byte code[] = {WASM_GROW_MEMORY(WASM_I32V_1(10)), WASM_DROP,
+                   WASM_MEMORY_SIZE};
     f->EmitCode(code, sizeof(code));
     TestModule(&zone, builder, kExpectedValue);
   }
   Cleanup();
 }
 
 TEST(GrowMemoryZero) {
   {
     // Initial memory size is 16, see wasm-module-builder.cc
     static const int kExpectedValue = 16;
@@ skipping 127 matching lines @@
     // Initial memory size = 16 + GrowMemory(10)
     static const int index = kPageSize * 17 + 4;
     int value = 0xaced;
     TestSignatures sigs;
     v8::internal::AccountingAllocator allocator;
     Zone zone(&allocator, ZONE_NAME);
 
     WasmModuleBuilder* builder = new (&zone) WasmModuleBuilder(&zone);
     WasmFunctionBuilder* f = builder->AddFunction(sigs.i_v());
     ExportAsMain(f);
-    byte code[] = {WASM_GROW_MEMORY(WASM_I8(1)),
+    byte code[] = {WASM_GROW_MEMORY(WASM_I32V_1(1)),
                    WASM_STORE_MEM(MachineType::Int32(), WASM_I32V(index),
                                   WASM_I32V(value))};
     f->EmitCode(code, sizeof(code));
     TestModuleException(&zone, builder);
   }
   Cleanup();
 }
 
 TEST(Run_WasmModule_GrowMemOobFixedIndex) {
   {
@@ skipping 49 matching lines @@
     static const int kPageSize = 0x10000;
     int value = 0xaced;
     TestSignatures sigs;
     Isolate* isolate = CcTest::InitIsolateOnce();
     v8::internal::AccountingAllocator allocator;
     Zone zone(&allocator, ZONE_NAME);
 
     WasmModuleBuilder* builder = new (&zone) WasmModuleBuilder(&zone);
     WasmFunctionBuilder* f = builder->AddFunction(sigs.i_i());
     ExportAsMain(f);
-    byte code[] = {WASM_GROW_MEMORY(WASM_I8(1)), WASM_DROP,
+    byte code[] = {WASM_GROW_MEMORY(WASM_I32V_1(1)), WASM_DROP,
                    WASM_STORE_MEM(MachineType::Int32(), WASM_GET_LOCAL(0),
                                   WASM_I32V(value)),
                    WASM_LOAD_MEM(MachineType::Int32(), WASM_GET_LOCAL(0))};
     f->EmitCode(code, sizeof(code));
 
     HandleScope scope(isolate);
     ZoneBuffer buffer(&zone);
     builder->WriteTo(buffer);
     testing::SetupIsolateForWasmModule(isolate);
 
@@ skipping 236 matching lines @@
     };
 
     testing::CompileInstantiateWasmModuleForTesting(isolate, &thrower, data,
                                                     data + arraysize(data),
                                                     ModuleOrigin::kWasmOrigin);
     // It should be possible to instantiate this module.
     CHECK(!thrower.error());
   }
   Cleanup();
 }