diff options
| author | David Srbecky <dsrbecky@google.com> | 2015-04-13 20:00:39 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-04-13 20:00:40 +0000 |
| commit | daba9dff2ba0160332fe54ab14fc4283b8ea86fb (patch) | |
| tree | 0984e431727fe4dd8b56d2891a2d343882daebbf /compiler | |
| parent | c4542866d2e68dcdfa2c7efa5cddbb131003da81 (diff) | |
| parent | 9d8606de5e274c00242ee73ffb693bc34589f184 (diff) | |
| download | art-daba9dff2ba0160332fe54ab14fc4283b8ea86fb.tar.gz art-daba9dff2ba0160332fe54ab14fc4283b8ea86fb.tar.bz2 art-daba9dff2ba0160332fe54ab14fc4283b8ea86fb.zip | |
Merge "Whitespace cleanup in DWARFReg helper functions."
Diffstat (limited to 'compiler')
| -rw-r--r-- | compiler/optimizing/code_generator_arm.cc | 8 | ||||
| -rw-r--r-- | compiler/optimizing/code_generator_x86.cc | 2 | ||||
| -rw-r--r-- | compiler/optimizing/code_generator_x86_64.cc | 5 |
3 files changed, 8 insertions, 7 deletions
diff --git a/compiler/optimizing/code_generator_arm.cc b/compiler/optimizing/code_generator_arm.cc index e434e9e7ef..332c99ae64 100644 --- a/compiler/optimizing/code_generator_arm.cc +++ b/compiler/optimizing/code_generator_arm.cc @@ -514,11 +514,11 @@ void CodeGeneratorARM::ComputeSpillMask() { } static dwarf::Reg DWARFReg(Register reg) { - return dwarf::Reg::ArmCore(static_cast<int>(reg)); + return dwarf::Reg::ArmCore(static_cast<int>(reg)); } static dwarf::Reg DWARFReg(SRegister reg) { - return dwarf::Reg::ArmFp(static_cast<int>(reg)); + return dwarf::Reg::ArmFp(static_cast<int>(reg)); } void CodeGeneratorARM::GenerateFrameEntry() { @@ -542,12 +542,12 @@ void CodeGeneratorARM::GenerateFrameEntry() { uint32_t push_mask = (core_spill_mask_ & (~(1 << PC))) | 1 << LR; __ PushList(push_mask); __ cfi().AdjustCFAOffset(kArmWordSize * POPCOUNT(push_mask)); - __ cfi().RelOffsetForMany(DWARFReg(Register(0)), 0, push_mask, kArmWordSize); + __ cfi().RelOffsetForMany(DWARFReg(R0), 0, push_mask, kArmWordSize); if (fpu_spill_mask_ != 0) { SRegister start_register = SRegister(LeastSignificantBit(fpu_spill_mask_)); __ vpushs(start_register, POPCOUNT(fpu_spill_mask_)); __ cfi().AdjustCFAOffset(kArmWordSize * POPCOUNT(fpu_spill_mask_)); - __ cfi().RelOffsetForMany(DWARFReg(SRegister(0)), 0, fpu_spill_mask_, kArmWordSize); + __ cfi().RelOffsetForMany(DWARFReg(S0), 0, fpu_spill_mask_, kArmWordSize); } int adjust = GetFrameSize() - FrameEntrySpillSize(); __ AddConstant(SP, -adjust); diff --git a/compiler/optimizing/code_generator_x86.cc b/compiler/optimizing/code_generator_x86.cc index 637064d101..38f9ef8efe 100644 --- a/compiler/optimizing/code_generator_x86.cc +++ b/compiler/optimizing/code_generator_x86.cc @@ -461,7 +461,7 @@ InstructionCodeGeneratorX86::InstructionCodeGeneratorX86(HGraph* graph, CodeGene codegen_(codegen) {} static dwarf::Reg DWARFReg(Register reg) { - return dwarf::Reg::X86Core(static_cast<int>(reg)); + return dwarf::Reg::X86Core(static_cast<int>(reg)); } void CodeGeneratorX86::GenerateFrameEntry() { diff --git a/compiler/optimizing/code_generator_x86_64.cc b/compiler/optimizing/code_generator_x86_64.cc index 0cb35d2b88..7a928d4d7d 100644 --- a/compiler/optimizing/code_generator_x86_64.cc +++ b/compiler/optimizing/code_generator_x86_64.cc @@ -484,10 +484,11 @@ void CodeGeneratorX86_64::SetupBlockedRegisters(bool is_baseline) const { } static dwarf::Reg DWARFReg(Register reg) { - return dwarf::Reg::X86_64Core(static_cast<int>(reg)); + return dwarf::Reg::X86_64Core(static_cast<int>(reg)); } + static dwarf::Reg DWARFReg(FloatRegister reg) { - return dwarf::Reg::X86_64Fp(static_cast<int>(reg)); + return dwarf::Reg::X86_64Fp(static_cast<int>(reg)); } void CodeGeneratorX86_64::GenerateFrameEntry() { |