[Interpreter] Preparation for wide registers.

src/interpreter/bytecodes.h

 // 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.
 
 #ifndef V8_INTERPRETER_BYTECODES_H_
 #define V8_INTERPRETER_BYTECODES_H_
 
 #include <iosfwd>
 
 // Clients of this interface shouldn't depend on lots of interpreter internals.
 // Do not include anything from src/interpreter here!
 #include "src/utils.h"
 
 namespace v8 {
 namespace internal {
 namespace interpreter {
 
+#define INVALID_OPERAND_TYPE_LIST(V) \
+  V(None, OperandSize::kNone)
+
+#define REGISTER_OPERAND_TYPE_LIST(V) \
+  /* Byte operands. */                \
+  V(MaybeReg8, OperandSize::kByte)    \
+  V(Reg8, OperandSize::kByte)         \
+  V(RegPair8, OperandSize::kByte)     \
+  V(RegTriple8, OperandSize::kByte)   \
+  /* Short operands. */               \
+  V(MaybeReg16, OperandSize::kShort)  \
+  V(Reg16, OperandSize::kShort)       \
+  V(RegPair16, OperandSize::kShort)   \
+  V(RegTriple16, OperandSize::kShort)
+
+#define SCALAR_OPERAND_TYPE_LIST(V) \
+  /* Byte operands. */              \
+  V(Idx8, OperandSize::kByte)       \
+  V(Imm8, OperandSize::kByte)       \
+  V(RegCount8, OperandSize::kByte)  \
+  /* Short operands. */             \
+  V(Idx16, OperandSize::kShort)     \
+  V(RegCount16, OperandSize::kShort)
+
 // The list of operand types used by bytecodes.
-#define OPERAND_TYPE_LIST(V)        \
-                                    \
-  /* None operand. */               \
-  V(None, OperandSize::kNone)       \
-                                    \
-  /* Byte operands. */              \
-  V(Count8, OperandSize::kByte)     \
-  V(Imm8, OperandSize::kByte)       \
-  V(Idx8, OperandSize::kByte)       \
-  V(MaybeReg8, OperandSize::kByte)  \
-  V(Reg8, OperandSize::kByte)       \
-  V(RegPair8, OperandSize::kByte)   \
-  V(RegTriple8, OperandSize::kByte) \
-                                    \
-  /* Short operands. */             \
-  V(Count16, OperandSize::kShort)   \
-  V(Idx16, OperandSize::kShort)     \
-  V(Reg16, OperandSize::kShort)
+#define OPERAND_TYPE_LIST(V)    \
+  INVALID_OPERAND_TYPE_LIST(V)  \
+  REGISTER_OPERAND_TYPE_LIST(V) \
+  SCALAR_OPERAND_TYPE_LIST(V)
 
 // The list of bytecodes which are interpreted by the interpreter.
 #define BYTECODE_LIST(V)                                                       \
                                                                                \
   /* Loading the accumulator */                                                \
   V(LdaZero, OperandType::kNone)                                               \
   V(LdaSmi8, OperandType::kImm8)                                               \
   V(LdaUndefined, OperandType::kNone)                                          \
   V(LdaNull, OperandType::kNone)                                               \
   V(LdaTheHole, OperandType::kNone)                                            \
@@ skipping 33 matching lines @@
   V(StaLookupSlotStrict, OperandType::kIdx8)                                   \
   V(StaLookupSlotSloppyWide, OperandType::kIdx16)                              \
   V(StaLookupSlotStrictWide, OperandType::kIdx16)                              \
                                                                                \
   /* Register-accumulator transfers */                                         \
   V(Ldar, OperandType::kReg8)                                                  \
   V(Star, OperandType::kReg8)                                                  \
                                                                                \
   /* Register-register transfers */                                            \
   V(Mov, OperandType::kReg8, OperandType::kReg8)                               \
-  V(Exchange, OperandType::kReg8, OperandType::kReg16)                         \
-  V(ExchangeWide, OperandType::kReg16, OperandType::kReg16)                    \
+  V(MovWide, OperandType::kReg16, OperandType::kReg16)                         \
                                                                                \
   /* LoadIC operations */                                                      \
   V(LoadICSloppy, OperandType::kReg8, OperandType::kIdx8, OperandType::kIdx8)  \
   V(LoadICStrict, OperandType::kReg8, OperandType::kIdx8, OperandType::kIdx8)  \
   V(KeyedLoadICSloppy, OperandType::kReg8, OperandType::kIdx8)                 \
   V(KeyedLoadICStrict, OperandType::kReg8, OperandType::kIdx8)                 \
   /* TODO(rmcilroy): Wide register operands too? */                            \
   V(LoadICSloppyWide, OperandType::kReg8, OperandType::kIdx16,                 \
     OperandType::kIdx16)                                                       \
   V(LoadICStrictWide, OperandType::kReg8, OperandType::kIdx16,                 \
@@ skipping 34 matching lines @@
   /* Unary Operators */                                                        \
   V(Inc, OperandType::kNone)                                                   \
   V(Dec, OperandType::kNone)                                                   \
   V(LogicalNot, OperandType::kNone)                                            \
   V(TypeOf, OperandType::kNone)                                                \
   V(DeletePropertyStrict, OperandType::kReg8)                                  \
   V(DeletePropertySloppy, OperandType::kReg8)                                  \
   V(DeleteLookupSlot, OperandType::kNone)                                      \
                                                                                \
   /* Call operations */                                                        \
-  V(Call, OperandType::kReg8, OperandType::kReg8, OperandType::kCount8,        \
+  V(Call, OperandType::kReg8, OperandType::kReg8, OperandType::kRegCount8,     \
     OperandType::kIdx8)                                                        \
-  V(CallWide, OperandType::kReg8, OperandType::kReg8, OperandType::kCount16,   \
-    OperandType::kIdx16)                                                       \
+  V(CallWide, OperandType::kReg16, OperandType::kReg16,                        \
+    OperandType::kRegCount16, OperandType::kIdx16)                             \
   V(CallRuntime, OperandType::kIdx16, OperandType::kMaybeReg8,                 \
-    OperandType::kCount8)                                                      \
+    OperandType::kRegCount8)                                                   \
+  V(CallRuntimeWide, OperandType::kIdx16, OperandType::kMaybeReg16,            \
+    OperandType::kRegCount8)                                                   \
   V(CallRuntimeForPair, OperandType::kIdx16, OperandType::kMaybeReg8,          \
-    OperandType::kCount8, OperandType::kRegPair8)                              \
+    OperandType::kRegCount8, OperandType::kRegPair8)                           \
+  V(CallRuntimeForPairWide, OperandType::kIdx16, OperandType::kMaybeReg16,     \
+    OperandType::kRegCount8, OperandType::kRegPair16)                          \
   V(CallJSRuntime, OperandType::kIdx16, OperandType::kReg8,                    \
-    OperandType::kCount8)                                                      \
+    OperandType::kRegCount8)                                                   \
+  V(CallJSRuntimeWide, OperandType::kIdx16, OperandType::kReg16,               \
+    OperandType::kRegCount16)                                                  \
                                                                                \
   /* New operator */                                                           \
-  V(New, OperandType::kReg8, OperandType::kMaybeReg8, OperandType::kCount8)    \
+  V(New, OperandType::kReg8, OperandType::kMaybeReg8, OperandType::kRegCount8) \
+  V(NewWide, OperandType::kReg16, OperandType::kMaybeReg16,                    \
+    OperandType::kRegCount16)                                                  \
                                                                                \
   /* Test Operators */                                                         \
   V(TestEqual, OperandType::kReg8)                                             \
   V(TestNotEqual, OperandType::kReg8)                                          \
   V(TestEqualStrict, OperandType::kReg8)                                       \
   V(TestNotEqualStrict, OperandType::kReg8)                                    \
   V(TestLessThan, OperandType::kReg8)                                          \
   V(TestGreaterThan, OperandType::kReg8)                                       \
   V(TestLessThanOrEqual, OperandType::kReg8)                                   \
   V(TestGreaterThanOrEqual, OperandType::kReg8)                                \
@@ skipping 45 matching lines @@
   V(JumpIfToBooleanFalseConstantWide, OperandType::kIdx16)                     \
   V(JumpIfNull, OperandType::kImm8)                                            \
   V(JumpIfNullConstant, OperandType::kIdx8)                                    \
   V(JumpIfNullConstantWide, OperandType::kIdx16)                               \
   V(JumpIfUndefined, OperandType::kImm8)                                       \
   V(JumpIfUndefinedConstant, OperandType::kIdx8)                               \
   V(JumpIfUndefinedConstantWide, OperandType::kIdx16)                          \
                                                                                \
   /* Complex flow control For..in */                                           \
   V(ForInPrepare, OperandType::kRegTriple8)                                    \
+  V(ForInPrepareWide, OperandType::kRegTriple16)                               \
   V(ForInDone, OperandType::kReg8, OperandType::kReg8)                         \
   V(ForInNext, OperandType::kReg8, OperandType::kReg8, OperandType::kRegPair8) \
+  V(ForInNextWide, OperandType::kReg16, OperandType::kReg16,                   \
+    OperandType::kRegPair16)                                                   \
   V(ForInStep, OperandType::kReg8)                                             \
                                                                                \
   /* Non-local flow control */                                                 \
   V(Throw, OperandType::kNone)                                                 \
   V(Return, OperandType::kNone)
 
 
 // Enumeration of the size classes of operand types used by bytecodes.
 enum class OperandSize : uint8_t {
   kNone = 0,
@@ skipping 58 matching lines @@
   // Returns the register for the incoming new target value.
   static Register new_target();
   bool is_new_target() const;
 
   static Register FromOperand(uint8_t operand);
   uint8_t ToOperand() const;
 
   static Register FromWideOperand(uint16_t operand);
   uint16_t ToWideOperand() const;
 
+  static Register FromRawOperand(uint32_t raw_operand);
+  uint32_t ToRawOperand() const;
+
   static bool AreContiguous(Register reg1, Register reg2,
                             Register reg3 = Register(),
                             Register reg4 = Register(),
                             Register reg5 = Register());
 
   bool operator==(const Register& other) const {
     return index() == other.index();
   }
   bool operator!=(const Register& other) const {
     return index() != other.index();
   }
   bool operator<(const Register& other) const {
     return index() < other.index();
   }
   bool operator<=(const Register& other) const {
     return index() <= other.index();
   }
+  bool operator>(const Register& other) const {
+    return index() > other.index();
+  }
+  bool operator>=(const Register& other) const {
+    return index() >= other.index();
+  }
 
  private:
   static const int kIllegalIndex = kMaxInt;
 
   void* operator new(size_t size);
   void operator delete(void* p);
 
   int index_;
 };
 
@@ skipping 79 matching lines @@
 
 std::ostream& operator<<(std::ostream& os, const Bytecode& bytecode);
 std::ostream& operator<<(std::ostream& os, const OperandType& operand_type);
 std::ostream& operator<<(std::ostream& os, const OperandSize& operand_type);
 
 }  // namespace interpreter
 }  // namespace internal
 }  // namespace v8
 
 #endif  // V8_INTERPRETER_BYTECODES_H_