Index: src/mips/lithium-codegen-mips.cc |
=================================================================== |
--- src/mips/lithium-codegen-mips.cc (revision 11126) |
+++ src/mips/lithium-codegen-mips.cc (working copy) |
@@ -2651,20 +2651,16 @@ |
Register temp = scratch1(); |
Register result = ToRegister(instr->result()); |
- if (instr->from_inlined()) { |
- __ Subu(result, sp, 2 * kPointerSize); |
- } else { |
- // Check if the calling frame is an arguments adaptor frame. |
- Label done, adapted; |
- __ lw(scratch, MemOperand(fp, StandardFrameConstants::kCallerFPOffset)); |
- __ lw(result, MemOperand(scratch, StandardFrameConstants::kContextOffset)); |
- __ Xor(temp, result, Operand(Smi::FromInt(StackFrame::ARGUMENTS_ADAPTOR))); |
+ // Check if the calling frame is an arguments adaptor frame. |
+ Label done, adapted; |
+ __ lw(scratch, MemOperand(fp, StandardFrameConstants::kCallerFPOffset)); |
+ __ lw(result, MemOperand(scratch, StandardFrameConstants::kContextOffset)); |
+ __ Xor(temp, result, Operand(Smi::FromInt(StackFrame::ARGUMENTS_ADAPTOR))); |
- // Result is the frame pointer for the frame if not adapted and for the real |
- // frame below the adaptor frame if adapted. |
- __ Movn(result, fp, temp); // Move only if temp is not equal to zero (ne). |
- __ Movz(result, scratch, temp); // Move only if temp is equal to zero (eq). |
- } |
+ // Result is the frame pointer for the frame if not adapted and for the real |
+ // frame below the adaptor frame if adapted. |
+ __ Movn(result, fp, temp); // Move only if temp is not equal to zero (ne). |
+ __ Movz(result, scratch, temp); // Move only if temp is equal to zero (eq). |
} |
@@ -2797,11 +2793,6 @@ |
} |
-void LCodeGen::DoPop(LPop* instr) { |
- __ Drop(instr->count()); |
-} |
- |
- |
void LCodeGen::DoThisFunction(LThisFunction* instr) { |
Register result = ToRegister(instr->result()); |
__ LoadHeapObject(result, instr->hydrogen()->closure()); |