diff options
| author | 2015-09-30 17:48:51 +0000 | |
|---|---|---|
| committer | 2015-09-30 17:48:51 +0000 | |
| commit | 0dbcaee559dc6005dec335119982b73692300e45 (patch) | |
| tree | 8537357c1718c8b93ec42c3fd8192e2a3347849d | |
| parent | a841bc3fb000a9cdbbb7b3cedf2cb7a11e2c82ce (diff) | |
| parent | 88a95ba893fcda974d492917dd77a9b11693dbf2 (diff) | |
Merge "Don't use floating point callee saves in debuggable."
| -rw-r--r-- | compiler/optimizing/code_generator_arm.cc | 8 | ||||
| -rw-r--r-- | compiler/optimizing/code_generator_arm64.cc | 11 |
2 files changed, 14 insertions, 5 deletions
diff --git a/compiler/optimizing/code_generator_arm.cc b/compiler/optimizing/code_generator_arm.cc index f29e2ba8af..c775e03717 100644 --- a/compiler/optimizing/code_generator_arm.cc +++ b/compiler/optimizing/code_generator_arm.cc @@ -428,8 +428,12 @@ CodeGeneratorARM::CodeGeneratorARM(HGraph* graph, kNumberOfRegisterPairs, ComputeRegisterMask(reinterpret_cast<const int*>(kCoreCalleeSaves), arraysize(kCoreCalleeSaves)), - ComputeRegisterMask(reinterpret_cast<const int*>(kFpuCalleeSaves), - arraysize(kFpuCalleeSaves)), + graph->IsDebuggable() + // If the graph is debuggable, we need to save the fpu registers ourselves, + // as the stubs do not do it. + ? 0 + : ComputeRegisterMask(reinterpret_cast<const int*>(kFpuCalleeSaves), + arraysize(kFpuCalleeSaves)), compiler_options, stats), block_labels_(nullptr), diff --git a/compiler/optimizing/code_generator_arm64.cc b/compiler/optimizing/code_generator_arm64.cc index c97e367b18..70327af878 100644 --- a/compiler/optimizing/code_generator_arm64.cc +++ b/compiler/optimizing/code_generator_arm64.cc @@ -119,8 +119,11 @@ static void SaveRestoreLiveRegistersHelper(CodeGenerator* codegen, CPURegList core_list = CPURegList(CPURegister::kRegister, kXRegSize, register_set->GetCoreRegisters() & (~callee_saved_core_registers.list())); - CPURegList fp_list = CPURegList(CPURegister::kFPRegister, kDRegSize, - register_set->GetFloatingPointRegisters() & (~callee_saved_fp_registers.list())); + CPURegList fp_list = CPURegList( + CPURegister::kFPRegister, + kDRegSize, + register_set->GetFloatingPointRegisters() + & (~(codegen->GetGraph()->IsDebuggable() ? 0 : callee_saved_fp_registers.list()))); MacroAssembler* masm = down_cast<CodeGeneratorARM64*>(codegen)->GetVIXLAssembler(); UseScratchRegisterScope temps(masm); @@ -534,7 +537,9 @@ CodeGeneratorARM64::CodeGeneratorARM64(HGraph* graph, kNumberOfAllocatableFPRegisters, kNumberOfAllocatableRegisterPairs, callee_saved_core_registers.list(), - callee_saved_fp_registers.list(), + // If the graph is debuggable, we need to save the fpu registers ourselves, + // as the stubs do not do it. + graph->IsDebuggable() ? 0 : callee_saved_fp_registers.list(), compiler_options, stats), block_labels_(nullptr), |