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 872eeb454a58f5816af49fa4fe32a1271563e1c2..ab5bb4b84c4b9997d1804c33729fa8e166b6de9d 100644 |
--- a/src/compiler/mips/code-generator-mips.cc |
+++ b/src/compiler/mips/code-generator-mips.cc |
@@ -1062,17 +1062,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; |
paul.l...
2015/06/15 23:05:17
Rather than computing this, use kNumCalleeSaved +
akos.palfi.imgtec
2015/06/22 17:33:20
Done.
|
} |
- 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()); |
@@ -1115,7 +1124,12 @@ void CodeGenerator::AssembleReturn() { |
if (stack_slots > 0) { |
__ Addu(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); |