[wasm] Make LoadGlobal/StoreGlobal opcodes match what is coming in binary 0xC.

src/wasm/ast-decoder.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 "src/signature.h"
 
 #include "src/bit-vector.h"
 #include "src/flags.h"
 #include "src/handles.h"
 #include "src/zone-containers.h"
@@ skipping 238 matching lines @@
     FOREACH_SIGNATURE(DECLARE_ARITY);
 #undef DECLARE_ARITY
 
     switch (static_cast<WasmOpcode>(*pc)) {
       case kExprI8Const:
       case kExprI32Const:
       case kExprI64Const:
       case kExprF64Const:
       case kExprF32Const:
       case kExprGetLocal:
-      case kExprLoadGlobal:
+      case kExprGetGlobal:
       case kExprNop:
       case kExprUnreachable:
       case kExprEnd:
       case kExprBlock:
       case kExprLoop:
         return 0;
 
-      case kExprStoreGlobal:
+      case kExprSetGlobal:
       case kExprSetLocal:
       case kExprElse:
         return 1;
 
       case kExprBr: {
         BreakDepthOperand operand(this, pc);
         return operand.arity;
       }
       case kExprBrIf: {
         BreakDepthOperand operand(this, pc);
@@ skipping 54 matching lines @@
 #undef DECLARE_OPCODE_CASE
       {
         MemoryAccessOperand operand(this, pc);
         return 1 + operand.length;
       }
       case kExprBr:
       case kExprBrIf: {
         BreakDepthOperand operand(this, pc);
         return 1 + operand.length;
       }
-      case kExprStoreGlobal:
-      case kExprLoadGlobal: {
+      case kExprSetGlobal:
+      case kExprGetGlobal: {
         GlobalIndexOperand operand(this, pc);
         return 1 + operand.length;
       }
 
       case kExprCallFunction: {
         CallFunctionOperand operand(this, pc);
         return 1 + operand.length;
       }
       case kExprCallIndirect: {
         CallIndirectOperand operand(this, pc);
@@ skipping 530 matching lines @@
           case kExprSetLocal: {
             LocalIndexOperand operand(this, pc_);
             if (Validate(pc_, operand)) {
               Value val = Pop(0, local_type_vec_[operand.index]);
               if (ssa_env_->locals) ssa_env_->locals[operand.index] = val.node;
               Push(val.type, val.node);
             }
             len = 1 + operand.length;
             break;
           }
-          case kExprLoadGlobal: {
+          case kExprGetGlobal: {
             GlobalIndexOperand operand(this, pc_);
             if (Validate(pc_, operand)) {
-              Push(operand.type, BUILD(LoadGlobal, operand.index));
+              Push(operand.type, BUILD(GetGlobal, operand.index));
             }
             len = 1 + operand.length;
             break;
           }
-          case kExprStoreGlobal: {
+          case kExprSetGlobal: {
             GlobalIndexOperand operand(this, pc_);
             if (Validate(pc_, operand)) {
               Value val = Pop(0, operand.type);
-              BUILD(StoreGlobal, operand.index, val.node);
+              BUILD(SetGlobal, operand.index, val.node);
               Push(val.type, val.node);
             }
             len = 1 + operand.length;
             break;
           }
           case kExprI32LoadMem8S:
             len = DecodeLoadMem(kAstI32, MachineType::Int8());
             break;
           case kExprI32LoadMem8U:
             len = DecodeLoadMem(kAstI32, MachineType::Uint8());
@@ skipping 785 matching lines @@
 BitVector* AnalyzeLoopAssignmentForTesting(Zone* zone, size_t num_locals,
                                            const byte* start, const byte* end) {
   FunctionBody body = {nullptr, nullptr, nullptr, start, end};
   WasmFullDecoder decoder(zone, nullptr, body);
   return decoder.AnalyzeLoopAssignmentForTesting(start, num_locals);
 }
 
 }  // namespace wasm
 }  // namespace internal
 }  // namespace v8