Index: src/arm/code-stubs-arm.h |
=================================================================== |
--- src/arm/code-stubs-arm.h (revision 8025) |
+++ src/arm/code-stubs-arm.h (working copy) |
@@ -71,18 +71,18 @@ |
}; |
-class TypeRecordingUnaryOpStub: public CodeStub { |
+class UnaryOpStub: public CodeStub { |
public: |
- TypeRecordingUnaryOpStub(Token::Value op, UnaryOverwriteMode mode) |
+ UnaryOpStub(Token::Value op, UnaryOverwriteMode mode) |
: op_(op), |
mode_(mode), |
- operand_type_(TRUnaryOpIC::UNINITIALIZED), |
+ operand_type_(UnaryOpIC::UNINITIALIZED), |
name_(NULL) { |
} |
- TypeRecordingUnaryOpStub( |
+ UnaryOpStub( |
int key, |
- TRUnaryOpIC::TypeInfo operand_type) |
+ UnaryOpIC::TypeInfo operand_type) |
: op_(OpBits::decode(key)), |
mode_(ModeBits::decode(key)), |
operand_type_(operand_type), |
@@ -94,7 +94,7 @@ |
UnaryOverwriteMode mode_; |
// Operand type information determined at runtime. |
- TRUnaryOpIC::TypeInfo operand_type_; |
+ UnaryOpIC::TypeInfo operand_type_; |
char* name_; |
@@ -102,20 +102,20 @@ |
#ifdef DEBUG |
void Print() { |
- PrintF("TypeRecordingUnaryOpStub %d (op %s), " |
+ PrintF("UnaryOpStub %d (op %s), " |
"(mode %d, runtime_type_info %s)\n", |
MinorKey(), |
Token::String(op_), |
static_cast<int>(mode_), |
- TRUnaryOpIC::GetName(operand_type_)); |
+ UnaryOpIC::GetName(operand_type_)); |
} |
#endif |
class ModeBits: public BitField<UnaryOverwriteMode, 0, 1> {}; |
class OpBits: public BitField<Token::Value, 1, 7> {}; |
- class OperandTypeInfoBits: public BitField<TRUnaryOpIC::TypeInfo, 8, 3> {}; |
+ class OperandTypeInfoBits: public BitField<UnaryOpIC::TypeInfo, 8, 3> {}; |
- Major MajorKey() { return TypeRecordingUnaryOp; } |
+ Major MajorKey() { return UnaryOp; } |
int MinorKey() { |
return ModeBits::encode(mode_) |
| OpBits::encode(op_) |
@@ -145,34 +145,34 @@ |
void GenerateGenericStubBitNot(MacroAssembler* masm); |
void GenerateGenericCodeFallback(MacroAssembler* masm); |
- virtual int GetCodeKind() { return Code::TYPE_RECORDING_UNARY_OP_IC; } |
+ virtual int GetCodeKind() { return Code::UNARY_OP_IC; } |
virtual InlineCacheState GetICState() { |
- return TRUnaryOpIC::ToState(operand_type_); |
+ return UnaryOpIC::ToState(operand_type_); |
} |
virtual void FinishCode(Code* code) { |
- code->set_type_recording_unary_op_type(operand_type_); |
+ code->set_unary_op_type(operand_type_); |
} |
}; |
-class TypeRecordingBinaryOpStub: public CodeStub { |
+class BinaryOpStub: public CodeStub { |
public: |
- TypeRecordingBinaryOpStub(Token::Value op, OverwriteMode mode) |
+ BinaryOpStub(Token::Value op, OverwriteMode mode) |
: op_(op), |
mode_(mode), |
- operands_type_(TRBinaryOpIC::UNINITIALIZED), |
- result_type_(TRBinaryOpIC::UNINITIALIZED), |
+ operands_type_(BinaryOpIC::UNINITIALIZED), |
+ result_type_(BinaryOpIC::UNINITIALIZED), |
name_(NULL) { |
use_vfp3_ = CpuFeatures::IsSupported(VFP3); |
ASSERT(OpBits::is_valid(Token::NUM_TOKENS)); |
} |
- TypeRecordingBinaryOpStub( |
+ BinaryOpStub( |
int key, |
- TRBinaryOpIC::TypeInfo operands_type, |
- TRBinaryOpIC::TypeInfo result_type = TRBinaryOpIC::UNINITIALIZED) |
+ BinaryOpIC::TypeInfo operands_type, |
+ BinaryOpIC::TypeInfo result_type = BinaryOpIC::UNINITIALIZED) |
: op_(OpBits::decode(key)), |
mode_(ModeBits::decode(key)), |
use_vfp3_(VFP3Bits::decode(key)), |
@@ -191,8 +191,8 @@ |
bool use_vfp3_; |
// Operand type information determined at runtime. |
- TRBinaryOpIC::TypeInfo operands_type_; |
- TRBinaryOpIC::TypeInfo result_type_; |
+ BinaryOpIC::TypeInfo operands_type_; |
+ BinaryOpIC::TypeInfo result_type_; |
char* name_; |
@@ -200,12 +200,12 @@ |
#ifdef DEBUG |
void Print() { |
- PrintF("TypeRecordingBinaryOpStub %d (op %s), " |
+ PrintF("BinaryOpStub %d (op %s), " |
"(mode %d, runtime_type_info %s)\n", |
MinorKey(), |
Token::String(op_), |
static_cast<int>(mode_), |
- TRBinaryOpIC::GetName(operands_type_)); |
+ BinaryOpIC::GetName(operands_type_)); |
} |
#endif |
@@ -213,10 +213,10 @@ |
class ModeBits: public BitField<OverwriteMode, 0, 2> {}; |
class OpBits: public BitField<Token::Value, 2, 7> {}; |
class VFP3Bits: public BitField<bool, 9, 1> {}; |
- class OperandTypeInfoBits: public BitField<TRBinaryOpIC::TypeInfo, 10, 3> {}; |
- class ResultTypeInfoBits: public BitField<TRBinaryOpIC::TypeInfo, 13, 3> {}; |
+ class OperandTypeInfoBits: public BitField<BinaryOpIC::TypeInfo, 10, 3> {}; |
+ class ResultTypeInfoBits: public BitField<BinaryOpIC::TypeInfo, 13, 3> {}; |
- Major MajorKey() { return TypeRecordingBinaryOp; } |
+ Major MajorKey() { return BinaryOp; } |
int MinorKey() { |
return OpBits::encode(op_) |
| ModeBits::encode(mode_) |
@@ -259,15 +259,15 @@ |
void GenerateTypeTransition(MacroAssembler* masm); |
void GenerateTypeTransitionWithSavedArgs(MacroAssembler* masm); |
- virtual int GetCodeKind() { return Code::TYPE_RECORDING_BINARY_OP_IC; } |
+ virtual int GetCodeKind() { return Code::BINARY_OP_IC; } |
virtual InlineCacheState GetICState() { |
- return TRBinaryOpIC::ToState(operands_type_); |
+ return BinaryOpIC::ToState(operands_type_); |
} |
virtual void FinishCode(Code* code) { |
- code->set_type_recording_binary_op_type(operands_type_); |
- code->set_type_recording_binary_op_result_type(result_type_); |
+ code->set_binary_op_type(operands_type_); |
+ code->set_binary_op_result_type(result_type_); |
} |
friend class CodeGenerator; |