From 75d5b9bbd48edbe221d00dc85d25093977c6fa41 Mon Sep 17 00:00:00 2001 From: Nicolas Geoffray Date: Mon, 5 Oct 2015 07:40:35 +0000 Subject: [PATCH] Revert "Don't use floating point callee saves in debuggable." bug:24602865 bug:24605078 This reverts commit 88a95ba893fcda974d492917dd77a9b11693dbf2. Change-Id: Iba97eeab5c2ba725f66cc138f740dac337344828 --- compiler/optimizing/code_generator_arm.cc | 8 ++------ compiler/optimizing/code_generator_arm64.cc | 11 +++-------- 2 files changed, 5 insertions(+), 14 deletions(-) diff --git a/compiler/optimizing/code_generator_arm.cc b/compiler/optimizing/code_generator_arm.cc index 31498dc94..da7a6755e 100644 --- a/compiler/optimizing/code_generator_arm.cc +++ b/compiler/optimizing/code_generator_arm.cc @@ -428,12 +428,8 @@ CodeGeneratorARM::CodeGeneratorARM(HGraph* graph, kNumberOfRegisterPairs, ComputeRegisterMask(reinterpret_cast(kCoreCalleeSaves), arraysize(kCoreCalleeSaves)), - 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(kFpuCalleeSaves), - arraysize(kFpuCalleeSaves)), + ComputeRegisterMask(reinterpret_cast(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 78c94b051..31900d536 100644 --- a/compiler/optimizing/code_generator_arm64.cc +++ b/compiler/optimizing/code_generator_arm64.cc @@ -119,11 +119,8 @@ 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() - & (~(codegen->GetGraph()->IsDebuggable() ? 0 : callee_saved_fp_registers.list()))); + CPURegList fp_list = CPURegList(CPURegister::kFPRegister, kDRegSize, + register_set->GetFloatingPointRegisters() & (~callee_saved_fp_registers.list())); MacroAssembler* masm = down_cast(codegen)->GetVIXLAssembler(); UseScratchRegisterScope temps(masm); @@ -537,9 +534,7 @@ CodeGeneratorARM64::CodeGeneratorARM64(HGraph* graph, kNumberOfAllocatableFPRegisters, kNumberOfAllocatableRegisterPairs, callee_saved_core_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(), + callee_saved_fp_registers.list(), compiler_options, stats), block_labels_(nullptr), -- 2.11.0