Chromium Code Reviews| Index: src/interpreter/bytecodes.h |
| diff --git a/src/interpreter/bytecodes.h b/src/interpreter/bytecodes.h |
| index 0cfb9605fd5f75f130f17cbd90edccb0aac06f0f..03c393f9b3726a169a4842dc325b238da6882c7f 100644 |
| --- a/src/interpreter/bytecodes.h |
| +++ b/src/interpreter/bytecodes.h |
| @@ -98,7 +98,7 @@ namespace interpreter { |
| OperandType::kIdx) \ |
| \ |
| /* Context operations */ \ |
| - V(PushContext, AccumulatorUse::kRead, OperandType::kReg) \ |
| + V(PushContext, AccumulatorUse::kRead, OperandType::kRegOut) \ |
| V(PopContext, AccumulatorUse::kNone, OperandType::kReg) \ |
| V(LdaContextSlot, AccumulatorUse::kWrite, OperandType::kReg, \ |
| OperandType::kIdx) \ |
| @@ -250,7 +250,11 @@ namespace interpreter { |
| DEBUG_BREAK_BYTECODE_LIST(V) \ |
| \ |
| /* Illegal bytecode (terminates execution) */ \ |
| - V(Illegal, AccumulatorUse::kNone) |
| + V(Illegal, AccumulatorUse::kNone) \ |
| + \ |
| + /* No operation (used to maintain source positions for peephole */ \ |
| + /* eliminated bytecodes). */ \ |
| + V(Nop, AccumulatorUse::kNone) |
| enum class AccumulatorUse : uint8_t { |
| kNone = 0, |
| @@ -271,13 +275,22 @@ V8_INLINE AccumulatorUse operator|(AccumulatorUse lhs, AccumulatorUse rhs) { |
| // Enumeration of scaling factors applicable to scalable operands. Code |
| // relies on being able to cast values to integer scaling values. |
| +#define OPERAND_SCALE_LIST(V) \ |
| + V(Single, 1) \ |
| + V(Double, 2) \ |
| + V(Quadruple, 4) |
| + |
| enum class OperandScale : uint8_t { |
| - kSingle = 1, |
| - kDouble = 2, |
| - kQuadruple = 4, |
| - kMaxValid = kQuadruple, |
| - kInvalid = 8, |
| +#define DECLARE_OPERAND_SCALE(Name, Scale) k##Name = Scale, |
| + OPERAND_SCALE_LIST(DECLARE_OPERAND_SCALE) |
| +#undef DECLARE_OPERAND_SCALE |
| +#define COUNT_OPERAND_SCALES(x, _) *2 |
| + // The COUNT_OPERAND macro will turn this into kLast = 2^N / 2... which will |
| + // evaluate to the same value as the last operand. |
| + kLast = (1 OPERAND_SCALE_LIST(COUNT_OPERAND_SCALES)) / 2 |
|
rmcilroy
2016/05/10 11:14:10
Do we really need kLast? It is only used once to c
oth
2016/05/11 13:17:31
It ensures code does not read uninitialised memory
rmcilroy
2016/05/12 12:15:13
Acknowledged.
|
| +#undef COUNT_OPERAND_SCALES |
| }; |
| +STATIC_ASSERT(OperandScale::kLast == OperandScale::kQuadruple); |
| // Enumeration of the size classes of operand types used by |
| // bytecodes. Code relies on being able to cast values to integer |
| @@ -333,7 +346,7 @@ enum class Bytecode : uint8_t { |
| // An interpreter Register which is located in the function's Register file |
| // in its stack-frame. Register hold parameters, this, and expression values. |
| -class Register { |
| +class Register final { |
| public: |
| explicit Register(int index = kInvalidIndex) : index_(index) {} |
| @@ -464,9 +477,20 @@ class Bytecodes { |
| // Returns true if |bytecode| writes the accumulator. |
| static bool WritesAccumulator(Bytecode bytecode); |
| + // Return true if |bytecode| writes the accumulator with a boolean value. |
| + static bool WritesAccumulatorWithBoolean(Bytecode bytecode); |
|
rmcilroy
2016/05/10 11:14:10
nit - WritesBooleanToAccumulator
oth
2016/05/11 13:17:31
How about WritesAnyPossibleBooleanValueToTheAccumu
|
| + |
| + // Return true if |bytecode| is an accumulator load bytecode, |
| + // e.g. LdaConstant, LdaTrue, Ldar. |
| + static bool IsAccumulatorLoadWithoutEffects(Bytecode bytecode); |
| + |
| // Returns the i-th operand of |bytecode|. |
| static OperandType GetOperandType(Bytecode bytecode, int i); |
| + // Returns a pointer to an array of operand types terminated in |
| + // OperandType::kNone. |
| + static const OperandType* GetOperandTypes(Bytecode bytecode); |
| + |
| // Returns the size of the i-th operand of |bytecode|. |
| static OperandSize GetOperandSize(Bytecode bytecode, int i, |
| OperandScale operand_scale); |
| @@ -514,6 +538,13 @@ class Bytecodes { |
| // any kind of operand. |
| static bool IsJump(Bytecode bytecode); |
| + // Returns true if the bytecode is a jump that internally coerces the |
| + // accumulator to a boolean. |
| + static bool IsJumpIfToBoolean(Bytecode bytecode); |
| + |
| + // Returns the equivalent jump bytecode without the accumulator coercion. |
| + static Bytecode GetJumpWithoutToBoolean(Bytecode bytecode); |
| + |
| // Returns true if the bytecode is a conditional jump, a jump, or a return. |
| static bool IsJumpOrReturn(Bytecode bytecode); |
| @@ -541,6 +572,10 @@ class Bytecodes { |
| // Returns true if |operand_type| represents a register used as an output. |
| static bool IsRegisterOutputOperandType(OperandType operand_type); |
| + // Returns the number of registers represented by a register operand. For |
| + // instance, a RegPair represents two registers. |
| + static int GetNumberOfRegistersRepresentedBy(OperandType operand_type); |
| + |
| // Returns true if |operand_type| is a maybe register operand |
| // (kMaybeReg). |
| static bool IsMaybeRegisterOperandType(OperandType operand_type); |
| @@ -576,8 +611,21 @@ class Bytecodes { |
| // OperandScale values. |
| static bool BytecodeHasHandler(Bytecode bytecode, OperandScale operand_scale); |
| - // Return the next larger operand scale. |
| - static OperandScale NextOperandScale(OperandScale operand_scale); |
| + // Return the operand size required to hold a signed operand. |
| + static OperandSize SizeForSignedOperand(int value); |
| + |
| + // Return the operand size required to hold an unsigned operand. |
| + static OperandSize SizeForUnsignedOperand(int value); |
| + |
| + // Return the operand size required to hold an unsigned operand. |
| + static OperandSize SizeForUnsignedOperand(size_t value); |
| + |
| + // Return the OperandScale required for bytecode emission of |
| + // operand sizes. |
| + static OperandScale OperandSizesToScale( |
| + OperandSize size0, OperandSize size1 = OperandSize::kByte, |
| + OperandSize size2 = OperandSize::kByte, |
| + OperandSize size3 = OperandSize::kByte); |
| private: |
| DISALLOW_IMPLICIT_CONSTRUCTORS(Bytecodes); |