diff options
author | Christopher Ferris <cferris@google.com> | 2018-06-06 14:47:31 -0700 |
---|---|---|
committer | Christopher Ferris <cferris@google.com> | 2018-06-11 18:53:55 -0700 |
commit | fe05831f130ea19c95e0ac05d34190856bc23e59 (patch) | |
tree | a509b1b19ddb1b4c6ca7ca169f7dba68fc8cbdf3 /libunwindstack/ElfInterfaceArm.h | |
parent | 162b33112c398312fde7622190a50a22b8b670aa (diff) | |
download | unwinding-fe05831f130ea19c95e0ac05d34190856bc23e59.tar.gz |
Fix handling of load bias values.
It turns out that for the dwarf information, if a FDE indicates it's pc
relative, then pc has to be incremented by the load bias. If not, then
it should not be incremented.
Previously, the code always subtracted load bias values from pcs, and assumed
that all fdes were incremented by load bias values. The new code actually
reads the fdes and adjusted the pcs in the fde and in the eh frame hdr so
that load bias values are already handled properly.
In addition, add dumping of arm exidx values in unwind_reg_info. This allowed
verifying that the debug frame in those elf files was being handled properly.
Added a new unit test that only has a debug frame that has a non-zero load
bias and has fde entries that do not have pc relative encoding.
Fix a couple of other small bugs.
Bug: 109824792
Test: All libbacktrace/libunwindstack unit tests pass.
Test: Ran ART 137-cfi test and 004-ThreadStress.
Test: Verify that displaying the fde start and end pc actually match the
Test: real data for fde that have pc relative set, and that don't.
Test: Verified that the unwind information for arm exidx matches the
Test: debug frame data.
Change-Id: I707555286b5cb05df9f25489e8c5ede753cfe0fb
Diffstat (limited to 'libunwindstack/ElfInterfaceArm.h')
-rw-r--r-- | libunwindstack/ElfInterfaceArm.h | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/libunwindstack/ElfInterfaceArm.h b/libunwindstack/ElfInterfaceArm.h index c1597ce..18efb6c 100644 --- a/libunwindstack/ElfInterfaceArm.h +++ b/libunwindstack/ElfInterfaceArm.h @@ -64,28 +64,30 @@ class ElfInterfaceArm : public ElfInterface32 { iterator begin() { return iterator(this, 0); } iterator end() { return iterator(this, total_entries_); } + bool Init(uint64_t* load_bias) override; + bool GetPrel31Addr(uint32_t offset, uint32_t* addr); bool FindEntry(uint32_t pc, uint64_t* entry_offset); bool HandleType(uint64_t offset, uint32_t type, uint64_t load_bias) override; - bool Step(uint64_t pc, uint64_t load_bias, Regs* regs, Memory* process_memory, - bool* finished) override; + bool Step(uint64_t pc, Regs* regs, Memory* process_memory, bool* finished) override; - bool StepExidx(uint64_t pc, uint64_t load_bias, Regs* regs, Memory* process_memory, - bool* finished); + bool StepExidx(uint64_t pc, Regs* regs, Memory* process_memory, bool* finished); - bool GetFunctionName(uint64_t addr, uint64_t load_bias, std::string* name, - uint64_t* offset) override; + bool GetFunctionName(uint64_t addr, std::string* name, uint64_t* offset) override; uint64_t start_offset() { return start_offset_; } size_t total_entries() { return total_entries_; } + void set_load_bias(uint64_t load_bias) { load_bias_ = load_bias; } + protected: uint64_t start_offset_ = 0; size_t total_entries_ = 0; + uint64_t load_bias_ = 0; std::unordered_map<size_t, uint32_t> addrs_; }; |