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..b270147206a5ee1016f1fafe2505f3443ca00eb3 100644 |
--- a/src/compiler/mips64/code-generator-mips64.cc |
+++ b/src/compiler/mips64/code-generator-mips64.cc |
@@ -1135,16 +1135,23 @@ 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. |
paul.l...
2015/06/23 02:15:02
I think we should remove this if clause, here and
akos.palfi.imgtec
2015/06/23 19:48:57
Done.
|
- // 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); |
+ DCHECK(kNumCalleeSaved == base::bits::CountPopulation32(saves)); |
+ register_save_area_size += kNumCalleeSaved * kPointerSize; |
+ } |
+ const RegList saves_fpu = descriptor->CalleeSavedFPRegisters(); |
+ if (saves_fpu != 0) { // Save callee-saved FPU registers. |
+ __ MultiPushFPU(saves_fpu); |
+ DCHECK(kNumCalleeSavedFPU == base::bits::CountPopulation32(saves_fp)); |
+ register_save_area_size += |
+ kNumCalleeSavedFPU * kDoubleSize * kPointerSize; |
+ } |
+ if (register_save_area_size > 0) { |
+ frame()->SetRegisterSaveAreaSize(register_save_area_size); |
} |
} else if (descriptor->IsJSFunctionCall()) { |
CompilationInfo* info = this->info(); |
@@ -1188,7 +1195,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->CalleeSavedFPRegisters(); |
+ if (saves_fpu != 0) { |
+ __ MultiPopFPU(saves_fpu); |
+ } |
+ // Restore GP registers. |
const RegList saves = descriptor->CalleeSavedRegisters(); |
if (saves != 0) { |
__ MultiPop(saves); |