[interpreter] Streamline bytecode array writing.

src/interpreter/bytecode-traits.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_BYTECODE_TRAITS_H_
 #define V8_INTERPRETER_BYTECODE_TRAITS_H_
 
 #include "src/interpreter/bytecodes.h"
 
 namespace v8 {
@@ skipping 82 matching lines @@
 
   static const OperandTypeInfo* GetOperandTypeInfos() {
     static const OperandTypeInfo operand_type_infos[] = {
         OperandTraits<operand_0>::kOperandTypeInfo,
         OperandTraits<operand_1>::kOperandTypeInfo,
         OperandTraits<operand_2>::kOperandTypeInfo,
         OperandTraits<operand_3>::kOperandTypeInfo, OperandTypeInfo::kNone};
     return operand_type_infos;
   }
 
-  static const OperandSize* GetOperandSizes(OperandScale operand_scale) {
-    switch (operand_scale) {
-#define CASE(Name, _)                                                  \
-  case OperandScale::k##Name: {                                        \
-    static const OperandSize kOperandSizes[] = {                       \
-        OperandScaler<operand_0, OperandScale::k##Name>::kOperandSize, \
-        OperandScaler<operand_1, OperandScale::k##Name>::kOperandSize, \
-        OperandScaler<operand_2, OperandScale::k##Name>::kOperandSize, \
-        OperandScaler<operand_3, OperandScale::k##Name>::kOperandSize, \
-    };                                                                 \
-    return kOperandSizes;                                              \
-  }
-      OPERAND_SCALE_LIST(CASE)
-#undef CASE
-    }
-    UNREACHABLE();
-    return nullptr;
-  }
-
   template <OperandType ot>
   static inline bool HasAnyOperandsOfType() {
     return operand_0 == ot || operand_1 == ot || operand_2 == ot ||
            operand_3 == ot;
   }
 
   static inline bool IsScalable() {
     return (OperandTraits<operand_0>::TypeInfoTraits::kIsScalable |
             OperandTraits<operand_1>::TypeInfoTraits::kIsScalable |
             OperandTraits<operand_2>::TypeInfoTraits::kIsScalable |
             OperandTraits<operand_3>::TypeInfoTraits::kIsScalable);
   }
 
   static const AccumulatorUse kAccumulatorUse = accumulator_use;
   static const int kOperandCount = 4;
   static const int kRegisterOperandCount =
       RegisterOperandTraits<operand_0>::kIsRegisterOperand +
       RegisterOperandTraits<operand_1>::kIsRegisterOperand +
       RegisterOperandTraits<operand_2>::kIsRegisterOperand +
       RegisterOperandTraits<operand_3>::kIsRegisterOperand;
-  static const int kRegisterOperandBitmap =
-      RegisterOperandTraits<operand_0>::kIsRegisterOperand +
-      (RegisterOperandTraits<operand_1>::kIsRegisterOperand << 1) +
-      (RegisterOperandTraits<operand_2>::kIsRegisterOperand << 2) +
-      (RegisterOperandTraits<operand_3>::kIsRegisterOperand << 3);
 };
 
 template <AccumulatorUse accumulator_use, OperandType operand_0,
           OperandType operand_1, OperandType operand_2>
 struct BytecodeTraits<accumulator_use, operand_0, operand_1, operand_2> {
   static const OperandType* GetOperandTypes() {
     static const OperandType operand_types[] = {operand_0, operand_1, operand_2,
                                                 OperandType::kNone};
     return operand_types;
   }
 
   static const OperandTypeInfo* GetOperandTypeInfos() {
     static const OperandTypeInfo operand_type_infos[] = {
         OperandTraits<operand_0>::kOperandTypeInfo,
         OperandTraits<operand_1>::kOperandTypeInfo,
         OperandTraits<operand_2>::kOperandTypeInfo, OperandTypeInfo::kNone};
     return operand_type_infos;
   }
 
-  static const OperandSize* GetOperandSizes(OperandScale operand_scale) {
-    switch (operand_scale) {
-#define CASE(Name, _)                                                  \
-  case OperandScale::k##Name: {                                        \
-    static const OperandSize kOperandSizes[] = {                       \
-        OperandScaler<operand_0, OperandScale::k##Name>::kOperandSize, \
-        OperandScaler<operand_1, OperandScale::k##Name>::kOperandSize, \
-        OperandScaler<operand_2, OperandScale::k##Name>::kOperandSize, \
-    };                                                                 \
-    return kOperandSizes;                                              \
-  }
-      OPERAND_SCALE_LIST(CASE)
-#undef CASE
-    }
-    UNREACHABLE();
-    return nullptr;
-  }
-
   template <OperandType ot>
   static inline bool HasAnyOperandsOfType() {
     return operand_0 == ot || operand_1 == ot || operand_2 == ot;
   }
 
   static inline bool IsScalable() {
     return (OperandTraits<operand_0>::TypeInfoTraits::kIsScalable |
             OperandTraits<operand_1>::TypeInfoTraits::kIsScalable |
             OperandTraits<operand_2>::TypeInfoTraits::kIsScalable);
   }
 
   static const AccumulatorUse kAccumulatorUse = accumulator_use;
   static const int kOperandCount = 3;
   static const int kRegisterOperandCount =
       RegisterOperandTraits<operand_0>::kIsRegisterOperand +
       RegisterOperandTraits<operand_1>::kIsRegisterOperand +
       RegisterOperandTraits<operand_2>::kIsRegisterOperand;
-  static const int kRegisterOperandBitmap =
-      RegisterOperandTraits<operand_0>::kIsRegisterOperand +
-      (RegisterOperandTraits<operand_1>::kIsRegisterOperand << 1) +
-      (RegisterOperandTraits<operand_2>::kIsRegisterOperand << 2);
 };
 
 template <AccumulatorUse accumulator_use, OperandType operand_0,
           OperandType operand_1>
 struct BytecodeTraits<accumulator_use, operand_0, operand_1> {
   static const OperandType* GetOperandTypes() {
     static const OperandType operand_types[] = {operand_0, operand_1,
                                                 OperandType::kNone};
     return operand_types;
   }
 
   static const OperandTypeInfo* GetOperandTypeInfos() {
     static const OperandTypeInfo operand_type_infos[] = {
         OperandTraits<operand_0>::kOperandTypeInfo,
         OperandTraits<operand_1>::kOperandTypeInfo, OperandTypeInfo::kNone};
     return operand_type_infos;
   }
 
-  static const OperandSize* GetOperandSizes(OperandScale operand_scale) {
-    switch (operand_scale) {
-#define CASE(Name, _)                                                  \
-  case OperandScale::k##Name: {                                        \
-    static const OperandSize kOperandSizes[] = {                       \
-        OperandScaler<operand_0, OperandScale::k##Name>::kOperandSize, \
-        OperandScaler<operand_1, OperandScale::k##Name>::kOperandSize, \
-    };                                                                 \
-    return kOperandSizes;                                              \
-  }
-      OPERAND_SCALE_LIST(CASE)
-#undef CASE
-    }
-    UNREACHABLE();
-    return nullptr;
-  }
-
   template <OperandType ot>
   static inline bool HasAnyOperandsOfType() {
     return operand_0 == ot || operand_1 == ot;
   }
 
   static inline bool IsScalable() {
     return (OperandTraits<operand_0>::TypeInfoTraits::kIsScalable |
             OperandTraits<operand_1>::TypeInfoTraits::kIsScalable);
   }
 
   static const AccumulatorUse kAccumulatorUse = accumulator_use;
   static const int kOperandCount = 2;
   static const int kRegisterOperandCount =
       RegisterOperandTraits<operand_0>::kIsRegisterOperand +
       RegisterOperandTraits<operand_1>::kIsRegisterOperand;
-  static const int kRegisterOperandBitmap =
-      RegisterOperandTraits<operand_0>::kIsRegisterOperand +
-      (RegisterOperandTraits<operand_1>::kIsRegisterOperand << 1);
 };
 
 template <AccumulatorUse accumulator_use, OperandType operand_0>
 struct BytecodeTraits<accumulator_use, operand_0> {
   static const OperandType* GetOperandTypes() {
     static const OperandType operand_types[] = {operand_0, OperandType::kNone};
     return operand_types;
   }
 
   static const OperandTypeInfo* GetOperandTypeInfos() {
     static const OperandTypeInfo operand_type_infos[] = {
         OperandTraits<operand_0>::kOperandTypeInfo, OperandTypeInfo::kNone};
     return operand_type_infos;
   }
 
-  static const OperandSize* GetOperandSizes(OperandScale operand_scale) {
-    switch (operand_scale) {
-#define CASE(Name, _)                                                  \
-  case OperandScale::k##Name: {                                        \
-    static const OperandSize kOperandSizes[] = {                       \
-        OperandScaler<operand_0, OperandScale::k##Name>::kOperandSize, \
-    };                                                                 \
-    return kOperandSizes;                                              \
-  }
-      OPERAND_SCALE_LIST(CASE)
-#undef CASE
-    }
-    UNREACHABLE();
-    return nullptr;
-  }
-
   template <OperandType ot>
   static inline bool HasAnyOperandsOfType() {
     return operand_0 == ot;
   }
 
   static inline bool IsScalable() {
     return OperandTraits<operand_0>::TypeInfoTraits::kIsScalable;
   }
 
   static const AccumulatorUse kAccumulatorUse = accumulator_use;
   static const int kOperandCount = 1;
   static const int kRegisterOperandCount =
       RegisterOperandTraits<operand_0>::kIsRegisterOperand;
-  static const int kRegisterOperandBitmap =
-      RegisterOperandTraits<operand_0>::kIsRegisterOperand;
 };
 
 template <AccumulatorUse accumulator_use>
 struct BytecodeTraits<accumulator_use> {
   static const OperandType* GetOperandTypes() {
     static const OperandType operand_types[] = {OperandType::kNone};
     return operand_types;
   }
 
   static const OperandTypeInfo* GetOperandTypeInfos() {
     static const OperandTypeInfo operand_type_infos[] = {
         OperandTypeInfo::kNone};
     return operand_type_infos;
   }
 
-  static const OperandSize* GetOperandSizes(OperandScale operand_scale) {
-    return nullptr;
-  }
-
   template <OperandType ot>
   static inline bool HasAnyOperandsOfType() {
     return false;
   }
 
   static inline bool IsScalable() { return false; }
 
   static const AccumulatorUse kAccumulatorUse = accumulator_use;
   static const int kOperandCount = 0;
   static const int kRegisterOperandCount = 0;
-  static const int kRegisterOperandBitmap = 0;
 };
 
 static OperandSize ScaledOperandSize(OperandType operand_type,
                                      OperandScale operand_scale) {
   STATIC_ASSERT(static_cast<int>(OperandScale::kQuadruple) == 4 &&
                 OperandScale::kLast == OperandScale::kQuadruple);
   int index = static_cast<int>(operand_scale) >> 1;
   switch (operand_type) {
 #define CASE(Name, TypeInfo)                                    \
   case OperandType::k##Name: {                                  \
@@ skipping 11 matching lines @@
   }
   UNREACHABLE();
   return OperandSize::kNone;
 }
 
 }  // namespace interpreter
 }  // namespace internal
 }  // namespace v8
 
 #endif  // V8_INTERPRETER_BYTECODE_TRAITS_H_