[Interpreter] Add support for short (16 bit) operands.

test/unittests/compiler/interpreter-assembler-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/compiler/interpreter-assembler-unittest.h"
 
 #include "src/code-factory.h"
 #include "src/compiler/graph.h"
 #include "src/compiler/node.h"
 #include "src/interface-descriptors.h"
@@ skipping 69 matching lines @@
 template <class... A>
 Matcher<Node*> InterpreterAssemblerTest::InterpreterAssemblerForTest::IsCall(
     const Matcher<const CallDescriptor*>& descriptor_matcher, A... args) {
   return ::i::compiler::IsCall(descriptor_matcher, args..., graph()->start(),
                                graph()->start());
 }
 
 
 Matcher<Node*>
 InterpreterAssemblerTest::InterpreterAssemblerForTest::IsBytecodeOperand(
-    int operand) {
+    int offset) {
   return IsLoad(
       kMachUint8, IsParameter(Linkage::kInterpreterBytecodeArrayParameter),
       IsIntPtrAdd(IsParameter(Linkage::kInterpreterBytecodeOffsetParameter),
-                  IsInt32Constant(1 + operand)));
+                  IsInt32Constant(offset)));
 }
 
 
 Matcher<Node*> InterpreterAssemblerTest::InterpreterAssemblerForTest::
-    IsBytecodeOperandSignExtended(int operand) {
+    IsBytecodeOperandSignExtended(int offset) {
   Matcher<Node*> load_matcher = IsLoad(
       kMachInt8, IsParameter(Linkage::kInterpreterBytecodeArrayParameter),
       IsIntPtrAdd(IsParameter(Linkage::kInterpreterBytecodeOffsetParameter),
-                  IsInt32Constant(1 + operand)));
+                  IsInt32Constant(offset)));
   if (kPointerSize == 8) {
     load_matcher = IsChangeInt32ToInt64(load_matcher);
   }
   return load_matcher;
 }
 
 
+Matcher<Node*>
+InterpreterAssemblerTest::InterpreterAssemblerForTest::IsBytecodeOperandWide(
+    int offset) {
+  return IsLoad(
+      kMachUint16, IsParameter(Linkage::kInterpreterBytecodeArrayParameter),
+      IsIntPtrAdd(IsParameter(Linkage::kInterpreterBytecodeOffsetParameter),
+                  IsInt32Constant(offset)));
+}
+
+
 Graph*
 InterpreterAssemblerTest::InterpreterAssemblerForTest::GetCompletedGraph() {
   End();
   return graph();
 }
 
 
 TARGET_TEST_F(InterpreterAssemblerTest, Dispatch) {
   TRACED_FOREACH(interpreter::Bytecode, bytecode, kBytecodes) {
     InterpreterAssemblerForTest m(this, bytecode);
@@ skipping 140 matching lines @@
                    graph->start(), graph->start()));
   }
 }
 
 
 TARGET_TEST_F(InterpreterAssemblerTest, BytecodeOperand) {
   TRACED_FOREACH(interpreter::Bytecode, bytecode, kBytecodes) {
     InterpreterAssemblerForTest m(this, bytecode);
     int number_of_operands = interpreter::Bytecodes::NumberOfOperands(bytecode);
     for (int i = 0; i < number_of_operands; i++) {
+      int offset = interpreter::Bytecodes::GetOperandOffset(bytecode, i);
       switch (interpreter::Bytecodes::GetOperandType(bytecode, i)) {
         case interpreter::OperandType::kCount:
-          EXPECT_THAT(m.BytecodeOperandCount(i), m.IsBytecodeOperand(i));
+          EXPECT_THAT(m.BytecodeOperandCount(i), m.IsBytecodeOperand(offset));
           break;
         case interpreter::OperandType::kIdx:
-          EXPECT_THAT(m.BytecodeOperandIdx(i), m.IsBytecodeOperand(i));
+          EXPECT_THAT(m.BytecodeOperandIdx(i), m.IsBytecodeOperand(offset));
           break;
         case interpreter::OperandType::kImm8:
           EXPECT_THAT(m.BytecodeOperandImm8(i),
-                      m.IsBytecodeOperandSignExtended(i));
+                      m.IsBytecodeOperandSignExtended(offset));
           break;
         case interpreter::OperandType::kReg:
           EXPECT_THAT(m.BytecodeOperandReg(i),
-                      m.IsBytecodeOperandSignExtended(i));
+                      m.IsBytecodeOperandSignExtended(offset));
+          break;
+        case interpreter::OperandType::kWideIdx:
+          EXPECT_THAT(m.BytecodeOperandWideIdx(i),
+                      m.IsBytecodeOperandWide(offset));
           break;
         case interpreter::OperandType::kNone:
           UNREACHABLE();
           break;
       }
     }
   }
 }
 
 
@@ skipping 230 matching lines @@
         feedback_vector,
         m.IsLoad(kMachAnyTagged, load_shared_function_info_matcher,
                  IsIntPtrConstant(SharedFunctionInfo::kFeedbackVectorOffset -
                                   kHeapObjectTag)));
   }
 }
 
 }  // namespace compiler
 }  // namespace internal
 }  // namespace v8