Index: src/crankshaft/mips/lithium-codegen-mips.cc |
diff --git a/src/crankshaft/mips/lithium-codegen-mips.cc b/src/crankshaft/mips/lithium-codegen-mips.cc |
index 38ce3ea76df9fe2d96cdb73e140d25ee1a434ac1..2635317cc43009a10fd0818f5c472ac6f34e17f5 100644 |
--- a/src/crankshaft/mips/lithium-codegen-mips.cc |
+++ b/src/crankshaft/mips/lithium-codegen-mips.cc |
@@ -372,7 +372,7 @@ bool LCodeGen::GenerateJumpTable() { |
bool LCodeGen::GenerateSafepointTable() { |
DCHECK(is_done()); |
- safepoints_.Emit(masm(), GetStackSlotCount()); |
+ safepoints_.Emit(masm(), GetTotalFrameSlotCount()); |
return !is_aborted(); |
} |
@@ -545,7 +545,7 @@ MemOperand LCodeGen::ToMemOperand(LOperand* op) const { |
DCHECK(!op->IsDoubleRegister()); |
DCHECK(op->IsStackSlot() || op->IsDoubleStackSlot()); |
if (NeedsEagerFrame()) { |
- return MemOperand(fp, StackSlotOffset(op->index())); |
+ return MemOperand(fp, FrameSlotToFPOffset(op->index())); |
} else { |
// Retrieve parameter without eager stack-frame relative to the |
// stack-pointer. |
@@ -557,7 +557,7 @@ MemOperand LCodeGen::ToMemOperand(LOperand* op) const { |
MemOperand LCodeGen::ToHighMemOperand(LOperand* op) const { |
DCHECK(op->IsDoubleStackSlot()); |
if (NeedsEagerFrame()) { |
- return MemOperand(fp, StackSlotOffset(op->index()) + kPointerSize); |
+ return MemOperand(fp, FrameSlotToFPOffset(op->index()) + kPointerSize); |
} else { |
// Retrieve parameter without eager stack-frame relative to the |
// stack-pointer. |
@@ -626,9 +626,6 @@ void LCodeGen::AddToTranslation(LEnvironment* environment, |
if (op->IsStackSlot()) { |
int index = op->index(); |
- if (index >= 0) { |
- index += StandardFrameConstants::kFixedFrameSize / kPointerSize; |
- } |
if (is_tagged) { |
translation->StoreStackSlot(index); |
} else if (is_uint32) { |
@@ -638,9 +635,6 @@ void LCodeGen::AddToTranslation(LEnvironment* environment, |
} |
} else if (op->IsDoubleStackSlot()) { |
int index = op->index(); |
- if (index >= 0) { |
- index += StandardFrameConstants::kFixedFrameSize / kPointerSize; |
- } |
translation->StoreDoubleStackSlot(index); |
} else if (op->IsRegister()) { |
Register reg = ToRegister(op); |