Index: src/mips/lithium-gap-resolver-mips.cc |
diff --git a/src/mips/lithium-gap-resolver-mips.cc b/src/mips/lithium-gap-resolver-mips.cc |
index 41b060debc4bb3bf9ff875767f6e460c39d12934..4a5fbe39c5970dc8d0f887258f8a3181853200c9 100644 |
--- a/src/mips/lithium-gap-resolver-mips.cc |
+++ b/src/mips/lithium-gap-resolver-mips.cc |
@@ -33,8 +33,6 @@ |
namespace v8 { |
namespace internal { |
-static const Register kSavedValueRegister = kLithiumScratchReg; |
- |
LGapResolver::LGapResolver(LCodeGen* owner) |
: cgen_(owner), |
moves_(32), |
@@ -170,9 +168,9 @@ void LGapResolver::BreakCycle(int index) { |
LOperand* source = moves_[index].source(); |
saved_destination_ = moves_[index].destination(); |
if (source->IsRegister()) { |
- __ mov(kSavedValueRegister, cgen_->ToRegister(source)); |
+ __ mov(kLithiumScratchReg, cgen_->ToRegister(source)); |
} else if (source->IsStackSlot()) { |
- __ lw(kSavedValueRegister, cgen_->ToMemOperand(source)); |
+ __ lw(kLithiumScratchReg, cgen_->ToMemOperand(source)); |
} else if (source->IsDoubleRegister()) { |
__ mov_d(kLithiumScratchDouble, cgen_->ToDoubleRegister(source)); |
} else if (source->IsDoubleStackSlot()) { |
@@ -189,11 +187,11 @@ void LGapResolver::RestoreValue() { |
ASSERT(in_cycle_); |
ASSERT(saved_destination_ != NULL); |
- // Spilled value is in kSavedValueRegister or kLithiumScratchDouble. |
+ // Spilled value is in kLithiumScratchReg or kLithiumScratchDouble. |
if (saved_destination_->IsRegister()) { |
- __ mov(cgen_->ToRegister(saved_destination_), kSavedValueRegister); |
+ __ mov(cgen_->ToRegister(saved_destination_), kLithiumScratchReg); |
} else if (saved_destination_->IsStackSlot()) { |
- __ sw(kSavedValueRegister, cgen_->ToMemOperand(saved_destination_)); |
+ __ sw(kLithiumScratchReg, cgen_->ToMemOperand(saved_destination_)); |
} else if (saved_destination_->IsDoubleRegister()) { |
__ mov_d(cgen_->ToDoubleRegister(saved_destination_), |
kLithiumScratchDouble); |
@@ -245,8 +243,8 @@ void LGapResolver::EmitMove(int index) { |
__ sw(at, destination_operand); |
} |
} else { |
- __ lw(kSavedValueRegister, source_operand); |
- __ sw(kSavedValueRegister, destination_operand); |
+ __ lw(kLithiumScratchReg, source_operand); |
+ __ sw(kLithiumScratchReg, destination_operand); |
} |
} |
@@ -263,13 +261,13 @@ void LGapResolver::EmitMove(int index) { |
ASSERT(destination->IsStackSlot()); |
ASSERT(!in_cycle_); // Constant moves happen after all cycles are gone. |
if (cgen_->IsInteger32(constant_source)) { |
- __ li(kSavedValueRegister, |
+ __ li(kLithiumScratchReg, |
Operand(cgen_->ToInteger32(constant_source))); |
} else { |
- __ LoadObject(kSavedValueRegister, |
+ __ LoadObject(kLithiumScratchReg, |
cgen_->ToHandle(constant_source)); |
} |
- __ sw(kSavedValueRegister, cgen_->ToMemOperand(destination)); |
+ __ sw(kLithiumScratchReg, cgen_->ToMemOperand(destination)); |
} |
} else if (source->IsDoubleRegister()) { |
@@ -291,15 +289,15 @@ void LGapResolver::EmitMove(int index) { |
MemOperand destination_operand = cgen_->ToMemOperand(destination); |
if (in_cycle_) { |
// kLithiumScratchDouble was used to break the cycle, |
- // but kSavedValueRegister is free. |
+ // but kLithiumScratchReg is free. |
MemOperand source_high_operand = |
cgen_->ToHighMemOperand(source); |
MemOperand destination_high_operand = |
cgen_->ToHighMemOperand(destination); |
- __ lw(kSavedValueRegister, source_operand); |
- __ sw(kSavedValueRegister, destination_operand); |
- __ lw(kSavedValueRegister, source_high_operand); |
- __ sw(kSavedValueRegister, destination_high_operand); |
+ __ lw(kLithiumScratchReg, source_operand); |
+ __ sw(kLithiumScratchReg, destination_operand); |
+ __ lw(kLithiumScratchReg, source_high_operand); |
+ __ sw(kLithiumScratchReg, destination_high_operand); |
} else { |
__ ldc1(kLithiumScratchDouble, source_operand); |
__ sdc1(kLithiumScratchDouble, destination_operand); |