| Index: src/compiler/x87/code-generator-x87.cc
|
| diff --git a/src/compiler/x87/code-generator-x87.cc b/src/compiler/x87/code-generator-x87.cc
|
| index c274610226e99aba784dfa58e965a401138318da..bbde90e5c4433b14418f96fb8d8973cb67a00fbb 100644
|
| --- a/src/compiler/x87/code-generator-x87.cc
|
| +++ b/src/compiler/x87/code-generator-x87.cc
|
| @@ -38,15 +38,12 @@ class X87OperandConverter : public InstructionOperandConverter {
|
| if (op->IsRegister()) {
|
| DCHECK(extra == 0);
|
| return Operand(ToRegister(op));
|
| - } else if (op->IsDoubleRegister()) {
|
| - DCHECK(extra == 0);
|
| - UNIMPLEMENTED();
|
| }
|
| DCHECK(op->IsStackSlot() || op->IsDoubleStackSlot());
|
| - // The linkage computes where all spill slots are located.
|
| - FrameOffset offset = linkage()->GetFrameOffset(
|
| - AllocatedOperand::cast(op)->index(), frame(), extra);
|
| - return Operand(offset.from_stack_pointer() ? esp : ebp, offset.offset());
|
| + FrameOffset offset =
|
| + linkage()->GetFrameOffset(AllocatedOperand::cast(op)->index(), frame());
|
| + return Operand(offset.from_stack_pointer() ? esp : ebp,
|
| + offset.offset() + extra);
|
| }
|
|
|
| Operand HighOperand(InstructionOperand* op) {
|
| @@ -1568,6 +1565,7 @@ void CodeGenerator::AssemblePrologue() {
|
| void CodeGenerator::AssembleReturn() {
|
| CallDescriptor* descriptor = linkage()->GetIncomingDescriptor();
|
| int stack_slots = frame()->GetSpillSlotCount();
|
| + int pop_count = static_cast<int>(descriptor->StackParameterCount());
|
| if (descriptor->kind() == CallDescriptor::kCallAddress) {
|
| const RegList saves = descriptor->CalleeSavedRegisters();
|
| if (frame()->GetRegisterSaveAreaSize() > 0) {
|
| @@ -1583,30 +1581,26 @@ void CodeGenerator::AssembleReturn() {
|
| }
|
| }
|
| __ pop(ebp); // Pop caller's frame pointer.
|
| - __ ret(0);
|
| } else {
|
| // No saved registers.
|
| __ mov(esp, ebp); // Move stack pointer back to frame pointer.
|
| __ pop(ebp); // Pop caller's frame pointer.
|
| - __ ret(0);
|
| }
|
| } else if (descriptor->IsJSFunctionCall() || needs_frame_) {
|
| // Canonicalize JSFunction return sites for now.
|
| if (return_label_.is_bound()) {
|
| __ jmp(&return_label_);
|
| + return;
|
| } else {
|
| __ bind(&return_label_);
|
| __ mov(esp, ebp); // Move stack pointer back to frame pointer.
|
| __ pop(ebp); // Pop caller's frame pointer.
|
| - int pop_count = static_cast<int>(descriptor->StackParameterCount());
|
| - if (pop_count == 0) {
|
| - __ ret(0);
|
| - } else {
|
| - __ Ret(pop_count * kPointerSize, ebx);
|
| - }
|
| }
|
| - } else {
|
| + }
|
| + if (pop_count == 0) {
|
| __ ret(0);
|
| + } else {
|
| + __ Ret(pop_count * kPointerSize, ebx);
|
| }
|
| }
|
|
|
|
|