| Index: src/compiler/mips64/code-generator-mips64.cc
|
| diff --git a/src/compiler/mips64/code-generator-mips64.cc b/src/compiler/mips64/code-generator-mips64.cc
|
| index 5245b4aaf1d30945dac14c6052bbd56aa92d550c..0d6fa9be5205088f27636aed983ad63b33cdad16 100644
|
| --- a/src/compiler/mips64/code-generator-mips64.cc
|
| +++ b/src/compiler/mips64/code-generator-mips64.cc
|
| @@ -120,8 +120,8 @@ class MipsOperandConverter final : public InstructionOperandConverter {
|
| MemOperand ToMemOperand(InstructionOperand* op) const {
|
| DCHECK(op != NULL);
|
| DCHECK(op->IsStackSlot() || op->IsDoubleStackSlot());
|
| - FrameOffset offset =
|
| - linkage()->GetFrameOffset(AllocatedOperand::cast(op)->index(), frame());
|
| + FrameOffset offset = linkage()->GetFrameOffset(
|
| + AllocatedOperand::cast(op)->index(), frame_access_state());
|
| return MemOperand(offset.from_stack_pointer() ? sp : fp, offset.offset());
|
| }
|
| };
|
| @@ -458,12 +458,10 @@ void CodeGenerator::AssembleDeconstructActivationRecord(int stack_param_delta) {
|
| if (sp_slot_delta > 0) {
|
| __ daddiu(sp, sp, sp_slot_delta * kPointerSize);
|
| }
|
| - CallDescriptor* descriptor = linkage()->GetIncomingDescriptor();
|
| - int spill_slots = frame()->GetSpillSlotCount();
|
| - bool has_frame = descriptor->IsJSFunctionCall() || spill_slots > 0;
|
| - if (has_frame) {
|
| + if (frame()->needs_frame()) {
|
| __ Pop(ra, fp);
|
| }
|
| + frame_access_state()->UseDefaultFrameAccess();
|
| }
|
|
|
|
|
| @@ -471,7 +469,9 @@ void CodeGenerator::AssemblePrepareTailCall(int stack_param_delta) {
|
| int sp_slot_delta = TailCallFrameStackSlotDelta(stack_param_delta);
|
| if (sp_slot_delta < 0) {
|
| __ Dsubu(sp, sp, Operand(-sp_slot_delta * kPointerSize));
|
| + frame_access_state()->IncreaseSPDelta(-sp_slot_delta);
|
| }
|
| + frame_access_state()->UseSPToAccessFrame();
|
| }
|
|
|
|
|
| @@ -491,6 +491,7 @@ void CodeGenerator::AssembleArchInstruction(Instruction* instr) {
|
| __ Call(at);
|
| }
|
| RecordCallPosition(instr);
|
| + frame_access_state()->ClearSPDelta();
|
| break;
|
| }
|
| case kArchTailCallCodeObject: {
|
| @@ -503,6 +504,7 @@ void CodeGenerator::AssembleArchInstruction(Instruction* instr) {
|
| __ daddiu(at, i.InputRegister(0), Code::kHeaderSize - kHeapObjectTag);
|
| __ Jump(at);
|
| }
|
| + frame_access_state()->ClearSPDelta();
|
| break;
|
| }
|
| case kArchCallJSFunction: {
|
| @@ -516,6 +518,7 @@ void CodeGenerator::AssembleArchInstruction(Instruction* instr) {
|
| __ ld(at, FieldMemOperand(func, JSFunction::kCodeEntryOffset));
|
| __ Call(at);
|
| RecordCallPosition(instr);
|
| + frame_access_state()->ClearSPDelta();
|
| break;
|
| }
|
| case kArchTailCallJSFunction: {
|
| @@ -529,6 +532,7 @@ void CodeGenerator::AssembleArchInstruction(Instruction* instr) {
|
| AssembleDeconstructActivationRecord(stack_param_delta);
|
| __ ld(at, FieldMemOperand(func, JSFunction::kCodeEntryOffset));
|
| __ Jump(at);
|
| + frame_access_state()->ClearSPDelta();
|
| break;
|
| }
|
| case kArchLazyBailout: {
|
| @@ -539,6 +543,8 @@ void CodeGenerator::AssembleArchInstruction(Instruction* instr) {
|
| case kArchPrepareCallCFunction: {
|
| int const num_parameters = MiscField::decode(instr->opcode());
|
| __ PrepareCallCFunction(num_parameters, kScratchReg);
|
| + // Frame alignment requires using FP-relative frame addressing.
|
| + frame_access_state()->UseFPToAccessFrame();
|
| break;
|
| }
|
| case kArchPrepareTailCall:
|
| @@ -553,6 +559,8 @@ void CodeGenerator::AssembleArchInstruction(Instruction* instr) {
|
| Register func = i.InputRegister(0);
|
| __ CallCFunction(func, num_parameters);
|
| }
|
| + frame_access_state()->UseDefaultFrameAccess();
|
| + frame_access_state()->ClearSPDelta();
|
| break;
|
| }
|
| case kArchJmp:
|
| @@ -1072,12 +1080,15 @@ void CodeGenerator::AssembleArchInstruction(Instruction* instr) {
|
| if (instr->InputAt(0)->IsDoubleRegister()) {
|
| __ sdc1(i.InputDoubleRegister(0), MemOperand(sp, -kDoubleSize));
|
| __ Subu(sp, sp, Operand(kDoubleSize));
|
| + frame_access_state()->IncreaseSPDelta(kDoubleSize / kPointerSize);
|
| } else {
|
| __ Push(i.InputRegister(0));
|
| + frame_access_state()->IncreaseSPDelta(1);
|
| }
|
| break;
|
| case kMips64StackClaim: {
|
| __ Dsubu(sp, sp, Operand(i.InputInt32(0)));
|
| + frame_access_state()->IncreaseSPDelta(i.InputInt32(0) / kPointerSize);
|
| break;
|
| }
|
| case kMips64StoreToStackSlot: {
|
| @@ -1417,17 +1428,18 @@ void CodeGenerator::AssembleDeoptimizerCall(
|
|
|
| void CodeGenerator::AssemblePrologue() {
|
| CallDescriptor* descriptor = linkage()->GetIncomingDescriptor();
|
| - if (descriptor->kind() == CallDescriptor::kCallAddress) {
|
| + if (descriptor->IsCFunctionCall()) {
|
| __ Push(ra, fp);
|
| __ mov(fp, sp);
|
| } else if (descriptor->IsJSFunctionCall()) {
|
| CompilationInfo* info = this->info();
|
| __ Prologue(info->IsCodePreAgingActive());
|
| - } else if (needs_frame_) {
|
| + } else if (frame()->needs_frame()) {
|
| __ StubPrologue();
|
| } else {
|
| frame()->SetElidedFrameSizeInSlots(0);
|
| }
|
| + frame_access_state()->UseDefaultFrameAccess();
|
|
|
| int stack_shrink_slots = frame()->GetSpillSlotCount();
|
| if (info()->is_osr()) {
|
| @@ -1487,10 +1499,10 @@ void CodeGenerator::AssembleReturn() {
|
| __ MultiPopFPU(saves_fpu);
|
| }
|
|
|
| - if (descriptor->kind() == CallDescriptor::kCallAddress) {
|
| + if (descriptor->IsCFunctionCall()) {
|
| __ mov(sp, fp);
|
| __ Pop(ra, fp);
|
| - } else if (descriptor->IsJSFunctionCall() || needs_frame_) {
|
| + } else if (frame()->needs_frame()) {
|
| // Canonicalize JSFunction return sites for now.
|
| if (return_label_.is_bound()) {
|
| __ Branch(&return_label_);
|
|
|