Index: src/compiler/ppc/code-generator-ppc.cc |
diff --git a/src/compiler/ppc/code-generator-ppc.cc b/src/compiler/ppc/code-generator-ppc.cc |
index e5aed5d71a6689cc989f97c6564649aeee7bcb3c..8a0c585a380db4b0a56e012a3eda94afa347ca61 100644 |
--- a/src/compiler/ppc/code-generator-ppc.cc |
+++ b/src/compiler/ppc/code-generator-ppc.cc |
@@ -103,7 +103,7 @@ class PPCOperandConverter final : public InstructionOperandConverter { |
MemOperand ToMemOperand(InstructionOperand* op) const { |
DCHECK_NOT_NULL(op); |
- DCHECK(op->IsStackSlot() || op->IsDoubleStackSlot()); |
+ DCHECK(op->IsStackSlot() || op->IsFPStackSlot()); |
return SlotToMemOperand(AllocatedOperand::cast(op)->index()); |
} |
@@ -1309,7 +1309,7 @@ CodeGenerator::CodeGenResult CodeGenerator::AssembleArchInstruction( |
break; |
#endif |
case kPPC_Push: |
- if (instr->InputAt(0)->IsDoubleRegister()) { |
+ if (instr->InputAt(0)->IsFPRegister()) { |
__ stfdu(i.InputDoubleRegister(0), MemOperand(sp, -kDoubleSize)); |
frame_access_state()->IncreaseSPDelta(kDoubleSize / kPointerSize); |
} else { |
@@ -1320,7 +1320,7 @@ CodeGenerator::CodeGenResult CodeGenerator::AssembleArchInstruction( |
break; |
case kPPC_PushFrame: { |
int num_slots = i.InputInt32(1); |
- if (instr->InputAt(0)->IsDoubleRegister()) { |
+ if (instr->InputAt(0)->IsFPRegister()) { |
__ StoreDoubleU(i.InputDoubleRegister(0), |
MemOperand(sp, -num_slots * kPointerSize), r0); |
} else { |
@@ -1331,7 +1331,7 @@ CodeGenerator::CodeGenResult CodeGenerator::AssembleArchInstruction( |
} |
case kPPC_StoreToStackSlot: { |
int slot = i.InputInt32(1); |
- if (instr->InputAt(0)->IsDoubleRegister()) { |
+ if (instr->InputAt(0)->IsFPRegister()) { |
__ StoreDouble(i.InputDoubleRegister(0), |
MemOperand(sp, slot * kPointerSize), r0); |
} else { |
@@ -1980,29 +1980,29 @@ void CodeGenerator::AssembleMove(InstructionOperand* source, |
__ StoreP(dst, g.ToMemOperand(destination), r0); |
} |
} else { |
- DoubleRegister dst = destination->IsDoubleRegister() |
+ DoubleRegister dst = destination->IsFPRegister() |
? g.ToDoubleRegister(destination) |
: kScratchDoubleReg; |
double value = (src.type() == Constant::kFloat32) ? src.ToFloat32() |
: src.ToFloat64(); |
__ LoadDoubleLiteral(dst, value, kScratchReg); |
- if (destination->IsDoubleStackSlot()) { |
+ if (destination->IsFPStackSlot()) { |
__ StoreDouble(dst, g.ToMemOperand(destination), r0); |
} |
} |
- } else if (source->IsDoubleRegister()) { |
+ } else if (source->IsFPRegister()) { |
DoubleRegister src = g.ToDoubleRegister(source); |
- if (destination->IsDoubleRegister()) { |
+ if (destination->IsFPRegister()) { |
DoubleRegister dst = g.ToDoubleRegister(destination); |
__ Move(dst, src); |
} else { |
- DCHECK(destination->IsDoubleStackSlot()); |
+ DCHECK(destination->IsFPStackSlot()); |
__ StoreDouble(src, g.ToMemOperand(destination), r0); |
} |
- } else if (source->IsDoubleStackSlot()) { |
- DCHECK(destination->IsDoubleRegister() || destination->IsDoubleStackSlot()); |
+ } else if (source->IsFPStackSlot()) { |
+ DCHECK(destination->IsFPRegister() || destination->IsFPStackSlot()); |
MemOperand src = g.ToMemOperand(source); |
- if (destination->IsDoubleRegister()) { |
+ if (destination->IsFPRegister()) { |
__ LoadDouble(g.ToDoubleRegister(destination), src, r0); |
} else { |
DoubleRegister temp = kScratchDoubleReg; |
@@ -2037,7 +2037,7 @@ void CodeGenerator::AssembleSwap(InstructionOperand* source, |
__ StoreP(temp, dst); |
} |
#if V8_TARGET_ARCH_PPC64 |
- } else if (source->IsStackSlot() || source->IsDoubleStackSlot()) { |
+ } else if (source->IsStackSlot() || source->IsFPStackSlot()) { |
#else |
} else if (source->IsStackSlot()) { |
DCHECK(destination->IsStackSlot()); |
@@ -2050,24 +2050,24 @@ void CodeGenerator::AssembleSwap(InstructionOperand* source, |
__ LoadP(temp_1, dst); |
__ StoreP(temp_0, dst); |
__ StoreP(temp_1, src); |
- } else if (source->IsDoubleRegister()) { |
+ } else if (source->IsFPRegister()) { |
DoubleRegister temp = kScratchDoubleReg; |
DoubleRegister src = g.ToDoubleRegister(source); |
- if (destination->IsDoubleRegister()) { |
+ if (destination->IsFPRegister()) { |
DoubleRegister dst = g.ToDoubleRegister(destination); |
__ fmr(temp, src); |
__ fmr(src, dst); |
__ fmr(dst, temp); |
} else { |
- DCHECK(destination->IsDoubleStackSlot()); |
+ DCHECK(destination->IsFPStackSlot()); |
MemOperand dst = g.ToMemOperand(destination); |
__ fmr(temp, src); |
__ lfd(src, dst); |
__ stfd(temp, dst); |
} |
#if !V8_TARGET_ARCH_PPC64 |
- } else if (source->IsDoubleStackSlot()) { |
- DCHECK(destination->IsDoubleStackSlot()); |
+ } else if (source->IsFPStackSlot()) { |
+ DCHECK(destination->IsFPStackSlot()); |
DoubleRegister temp_0 = kScratchDoubleReg; |
DoubleRegister temp_1 = d0; |
MemOperand src = g.ToMemOperand(source); |