Index: src/arm/code-stubs-arm.h |
diff --git a/src/arm/code-stubs-arm.h b/src/arm/code-stubs-arm.h |
index 38ed476cc1e831b65354a9b64cee739355eb7693..3ddc405715e0073579f9047d2d50813379434b10 100644 |
--- a/src/arm/code-stubs-arm.h |
+++ b/src/arm/code-stubs-arm.h |
@@ -1,4 +1,4 @@ |
-// Copyright 2011 the V8 project authors. All rights reserved. |
+// Copyright 2012 the V8 project authors. All rights reserved. |
// Redistribution and use in source and binary forms, with or without |
// modification, are permitted provided that the following conditions are |
// met: |
@@ -149,7 +149,7 @@ class BinaryOpStub: public CodeStub { |
mode_(mode), |
operands_type_(BinaryOpIC::UNINITIALIZED), |
result_type_(BinaryOpIC::UNINITIALIZED) { |
- use_vfp3_ = CpuFeatures::IsSupported(VFP3); |
+ use_vfp2_ = CpuFeatures::IsSupported(VFP2); |
ASSERT(OpBits::is_valid(Token::NUM_TOKENS)); |
} |
@@ -159,7 +159,7 @@ class BinaryOpStub: public CodeStub { |
BinaryOpIC::TypeInfo result_type = BinaryOpIC::UNINITIALIZED) |
: op_(OpBits::decode(key)), |
mode_(ModeBits::decode(key)), |
- use_vfp3_(VFP3Bits::decode(key)), |
+ use_vfp2_(VFP2Bits::decode(key)), |
operands_type_(operands_type), |
result_type_(result_type) { } |
@@ -171,7 +171,7 @@ class BinaryOpStub: public CodeStub { |
Token::Value op_; |
OverwriteMode mode_; |
- bool use_vfp3_; |
+ bool use_vfp2_; |
// Operand type information determined at runtime. |
BinaryOpIC::TypeInfo operands_type_; |
@@ -182,7 +182,7 @@ class BinaryOpStub: public CodeStub { |
// Minor key encoding in 16 bits RRRTTTVOOOOOOOMM. |
class ModeBits: public BitField<OverwriteMode, 0, 2> {}; |
class OpBits: public BitField<Token::Value, 2, 7> {}; |
- class VFP3Bits: public BitField<bool, 9, 1> {}; |
+ class VFP2Bits: public BitField<bool, 9, 1> {}; |
class OperandTypeInfoBits: public BitField<BinaryOpIC::TypeInfo, 10, 3> {}; |
class ResultTypeInfoBits: public BitField<BinaryOpIC::TypeInfo, 13, 3> {}; |
@@ -190,7 +190,7 @@ class BinaryOpStub: public CodeStub { |
int MinorKey() { |
return OpBits::encode(op_) |
| ModeBits::encode(mode_) |
- | VFP3Bits::encode(use_vfp3_) |
+ | VFP2Bits::encode(use_vfp2_) |
| OperandTypeInfoBits::encode(operands_type_) |
| ResultTypeInfoBits::encode(result_type_); |
} |
@@ -571,7 +571,7 @@ class RecordWriteStub: public CodeStub { |
void SaveCallerSaveRegisters(MacroAssembler* masm, SaveFPRegsMode mode) { |
masm->stm(db_w, sp, (kCallerSaved | lr.bit()) & ~scratch1_.bit()); |
if (mode == kSaveFPRegs) { |
- CpuFeatures::Scope scope(VFP3); |
+ CpuFeatures::Scope scope(VFP2); |
masm->sub(sp, |
sp, |
Operand(kDoubleSize * (DwVfpRegister::kNumRegisters - 1))); |
@@ -586,7 +586,7 @@ class RecordWriteStub: public CodeStub { |
inline void RestoreCallerSaveRegisters(MacroAssembler*masm, |
SaveFPRegsMode mode) { |
if (mode == kSaveFPRegs) { |
- CpuFeatures::Scope scope(VFP3); |
+ CpuFeatures::Scope scope(VFP2); |
// Restore all VFP registers except d0. |
for (int i = DwVfpRegister::kNumRegisters - 1; i > 0; i--) { |
DwVfpRegister reg = DwVfpRegister::from_code(i); |