| 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 5296ea82f7af01cb7ff304df99db54fba9017ab9..ed0d5c5bd64594063ee39f57fb1a3d17b6ee1c3e 100644
|
| --- a/src/compiler/mips64/code-generator-mips64.cc
|
| +++ b/src/compiler/mips64/code-generator-mips64.cc
|
| @@ -1135,17 +1135,26 @@ void CodeGenerator::AssemblePrologue() {
|
| if (descriptor->kind() == CallDescriptor::kCallAddress) {
|
| __ Push(ra, fp);
|
| __ mov(fp, sp);
|
| + int register_save_area_size = 0;
|
| const RegList saves = descriptor->CalleeSavedRegisters();
|
| if (saves != 0) { // Save callee-saved registers.
|
| // TODO(plind): make callee save size const, possibly DCHECK it.
|
| - int register_save_area_size = 0;
|
| for (int i = Register::kNumRegisters - 1; i >= 0; i--) {
|
| if (!((1 << i) & saves)) continue;
|
| register_save_area_size += kPointerSize;
|
| }
|
| - frame()->SetRegisterSaveAreaSize(register_save_area_size);
|
| __ MultiPush(saves);
|
| }
|
| + const RegList saves_fpu = descriptor->CalleeSavedFPURegisters();
|
| + if (saves_fpu != 0) { // Save callee-saved FPU registers.
|
| + // TODO(plind): make callee save size const, possibly DCHECK it.
|
| + for (int i = FPURegister::kMaxNumRegisters - 1; i >= 0; i--) {
|
| + if (!((1 << i) & saves_fpu)) continue;
|
| + register_save_area_size += kPointerSize;
|
| + }
|
| + __ MultiPushFPU(saves_fpu);
|
| + }
|
| + frame()->SetRegisterSaveAreaSize(register_save_area_size);
|
| } else if (descriptor->IsJSFunctionCall()) {
|
| CompilationInfo* info = this->info();
|
| __ Prologue(info->IsCodePreAgingActive());
|
| @@ -1188,7 +1197,12 @@ void CodeGenerator::AssembleReturn() {
|
| if (stack_slots > 0) {
|
| __ Daddu(sp, sp, Operand(stack_slots * kPointerSize));
|
| }
|
| - // Restore registers.
|
| + // Restore FPU registers.
|
| + const RegList saves_fpu = descriptor->CalleeSavedFPURegisters();
|
| + if (saves_fpu != 0) {
|
| + __ MultiPopFPU(saves_fpu);
|
| + }
|
| + // Restore GP registers.
|
| const RegList saves = descriptor->CalleeSavedRegisters();
|
| if (saves != 0) {
|
| __ MultiPop(saves);
|
|
|