diff options
| author | Vladimir Marko <vmarko@google.com> | 2015-10-22 15:25:54 +0100 |
|---|---|---|
| committer | Vladimir Marko <vmarko@google.com> | 2015-11-04 14:54:23 +0000 |
| commit | 10ef6941648aad04d54527d4a7a6070bf7065e88 (patch) | |
| tree | 50fe6b50a3020ec7d25fbd5e4393db1c04452ce7 /compiler/utils/assembler.cc | |
| parent | c74e69f831608964f89ac7a641fbcc09156eefaa (diff) | |
Delay emitting CFI PC adjustments until after Thumb2/Mips fixup.
On Mips also take into account out-of-order CFI data emitted
from EmitBranches().
Change-Id: I03b0b0b4c2b1ea31a02699ef5fa1c55aa42c23c3
Diffstat (limited to 'compiler/utils/assembler.cc')
| -rw-r--r-- | compiler/utils/assembler.cc | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/compiler/utils/assembler.cc b/compiler/utils/assembler.cc index b01b0fe4e0..f784d2c3f8 100644 --- a/compiler/utils/assembler.cc +++ b/compiler/utils/assembler.cc @@ -38,6 +38,7 @@ #ifdef ART_ENABLE_CODEGEN_x86_64 #include "x86_64/assembler_x86_64.h" #endif +#include "base/casts.h" #include "globals.h" #include "memory_region.h" @@ -119,7 +120,13 @@ void AssemblerBuffer::ExtendCapacity(size_t min_capacity) { } void DebugFrameOpCodeWriterForAssembler::ImplicitlyAdvancePC() { - this->AdvancePC(assembler_->CodeSize()); + uint32_t pc = dchecked_integral_cast<uint32_t>(assembler_->CodeSize()); + if (delay_emitting_advance_pc_) { + uint32_t stream_pos = dchecked_integral_cast<uint32_t>(opcodes_.size()); + delayed_advance_pcs_.push_back(DelayedAdvancePC {stream_pos, pc}); + } else { + AdvancePC(pc); + } } Assembler* Assembler::Create(InstructionSet instruction_set, |