| Index: src/arm/lithium-gap-resolver-arm.cc
|
| diff --git a/src/arm/lithium-gap-resolver-arm.cc b/src/arm/lithium-gap-resolver-arm.cc
|
| index c100720d89cd6130ad3e3a04a9528c48c045f5f7..2552d6da49145dfe73d26e9d634b73fb5245a72d 100644
|
| --- a/src/arm/lithium-gap-resolver-arm.cc
|
| +++ b/src/arm/lithium-gap-resolver-arm.cc
|
| @@ -171,9 +171,9 @@ void LGapResolver::BreakCycle(int index) {
|
| } else if (source->IsStackSlot()) {
|
| __ ldr(kSavedValueRegister, cgen_->ToMemOperand(source));
|
| } else if (source->IsDoubleRegister()) {
|
| - __ vmov(kScratchDoubleReg, cgen_->ToDoubleRegister(source));
|
| + __ vmov(DwVfpRegister::ScratchReg(), cgen_->ToDoubleRegister(source));
|
| } else if (source->IsDoubleStackSlot()) {
|
| - __ vldr(kScratchDoubleReg, cgen_->ToMemOperand(source));
|
| + __ vldr(DwVfpRegister::ScratchReg(), cgen_->ToMemOperand(source));
|
| } else {
|
| UNREACHABLE();
|
| }
|
| @@ -192,9 +192,11 @@ void LGapResolver::RestoreValue() {
|
| } else if (saved_destination_->IsStackSlot()) {
|
| __ str(kSavedValueRegister, cgen_->ToMemOperand(saved_destination_));
|
| } else if (saved_destination_->IsDoubleRegister()) {
|
| - __ vmov(cgen_->ToDoubleRegister(saved_destination_), kScratchDoubleReg);
|
| + __ vmov(cgen_->ToDoubleRegister(saved_destination_),
|
| + DwVfpRegister::ScratchReg());
|
| } else if (saved_destination_->IsDoubleStackSlot()) {
|
| - __ vstr(kScratchDoubleReg, cgen_->ToMemOperand(saved_destination_));
|
| + __ vstr(DwVfpRegister::ScratchReg(),
|
| + cgen_->ToMemOperand(saved_destination_));
|
| } else {
|
| UNREACHABLE();
|
| }
|
| @@ -232,8 +234,8 @@ void LGapResolver::EmitMove(int index) {
|
| // ip is overwritten while saving the value to the destination.
|
| // Therefore we can't use ip. It is OK if the read from the source
|
| // destroys ip, since that happens before the value is read.
|
| - __ vldr(kScratchDoubleReg.low(), source_operand);
|
| - __ vstr(kScratchDoubleReg.low(), destination_operand);
|
| + __ vldr(DwVfpRegister::ScratchReg().low(), source_operand);
|
| + __ vstr(DwVfpRegister::ScratchReg().low(), destination_operand);
|
| } else {
|
| __ ldr(ip, source_operand);
|
| __ str(ip, destination_operand);
|
| @@ -294,8 +296,8 @@ void LGapResolver::EmitMove(int index) {
|
| __ ldr(kSavedValueRegister, source_high_operand);
|
| __ str(kSavedValueRegister, destination_high_operand);
|
| } else {
|
| - __ vldr(kScratchDoubleReg, source_operand);
|
| - __ vstr(kScratchDoubleReg, destination_operand);
|
| + __ vldr(DwVfpRegister::ScratchReg(), source_operand);
|
| + __ vstr(DwVfpRegister::ScratchReg(), destination_operand);
|
| }
|
| }
|
| } else {
|
|
|