| Index: src/compiler/mips/code-generator-mips.cc
|
| diff --git a/src/compiler/mips/code-generator-mips.cc b/src/compiler/mips/code-generator-mips.cc
|
| index 3afb86af45556328c1af7f805c3cf578e4eb216a..cea5082ff1e6b94dafe1e4b7ea47653112f57f5b 100644
|
| --- a/src/compiler/mips/code-generator-mips.cc
|
| +++ b/src/compiler/mips/code-generator-mips.cc
|
| @@ -1062,17 +1062,20 @@ void CodeGenerator::AssemblePrologue() {
|
| if (descriptor->kind() == CallDescriptor::kCallAddress) {
|
| __ Push(ra, fp);
|
| __ mov(fp, sp);
|
| +
|
| 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);
|
| - }
|
| + // Save callee-saved registers.
|
| + __ MultiPush(saves);
|
| + DCHECK(kNumCalleeSaved == base::bits::CountPopulation32(saves));
|
| + int register_save_area_size = kNumCalleeSaved * kPointerSize;
|
| +
|
| + const RegList saves_fpu = descriptor->CalleeSavedFPRegisters();
|
| + // Save callee-saved FPU registers.
|
| + __ MultiPushFPU(saves_fpu);
|
| + DCHECK(kNumCalleeSavedFPU == base::bits::CountPopulation32(saves_fpu));
|
| + register_save_area_size += kNumCalleeSavedFPU * kDoubleSize * kPointerSize;
|
| +
|
| + frame()->SetRegisterSaveAreaSize(register_save_area_size);
|
| } else if (descriptor->IsJSFunctionCall()) {
|
| CompilationInfo* info = this->info();
|
| __ Prologue(info->IsCodePreAgingActive());
|
| @@ -1115,11 +1118,13 @@ void CodeGenerator::AssembleReturn() {
|
| if (stack_slots > 0) {
|
| __ Addu(sp, sp, Operand(stack_slots * kPointerSize));
|
| }
|
| - // Restore registers.
|
| + // Restore FPU registers.
|
| + const RegList saves_fpu = descriptor->CalleeSavedFPRegisters();
|
| + __ MultiPopFPU(saves_fpu);
|
| +
|
| + // Restore GP registers.
|
| const RegList saves = descriptor->CalleeSavedRegisters();
|
| - if (saves != 0) {
|
| - __ MultiPop(saves);
|
| - }
|
| + __ MultiPop(saves);
|
| }
|
| __ mov(sp, fp);
|
| __ Pop(ra, fp);
|
|
|