diff options
Diffstat (limited to 'libunwindstack/DwarfEhFrameWithHdr.cpp')
| -rw-r--r-- | libunwindstack/DwarfEhFrameWithHdr.cpp | 36 |
1 files changed, 24 insertions, 12 deletions
diff --git a/libunwindstack/DwarfEhFrameWithHdr.cpp b/libunwindstack/DwarfEhFrameWithHdr.cpp index 9a49013..fd6a457 100644 --- a/libunwindstack/DwarfEhFrameWithHdr.cpp +++ b/libunwindstack/DwarfEhFrameWithHdr.cpp @@ -22,12 +22,18 @@ #include "Check.h" #include "DwarfEhFrameWithHdr.h" +#include "DwarfEncoding.h" namespace unwindstack { +static inline bool IsEncodingRelative(uint8_t encoding) { + encoding >>= 4; + return encoding > 0 && encoding <= DW_EH_PE_funcrel; +} + template <typename AddressType> -bool DwarfEhFrameWithHdr<AddressType>::Init(uint64_t offset, uint64_t size) { - uint8_t data[4]; +bool DwarfEhFrameWithHdr<AddressType>::Init(uint64_t offset, uint64_t size, uint64_t load_bias) { + load_bias_ = load_bias; memory_.clear_func_offset(); memory_.clear_text_offset(); @@ -35,6 +41,7 @@ bool DwarfEhFrameWithHdr<AddressType>::Init(uint64_t offset, uint64_t size) { memory_.set_cur_offset(offset); // Read the first four bytes all at once. + uint8_t data[4]; if (!memory_.ReadBytes(data, 4)) { last_error_.code = DWARF_ERROR_MEMORY_INVALID; last_error_.address = memory_.cur_offset(); @@ -100,7 +107,7 @@ DwarfEhFrameWithHdr<AddressType>::GetFdeInfoFromIndex(size_t index) { memory_.set_data_offset(entries_data_offset_); memory_.set_cur_offset(entries_offset_ + 2 * index * table_entry_size_); - memory_.set_pc_offset(memory_.cur_offset()); + memory_.set_pc_offset(0); uint64_t value; if (!memory_.template ReadEncodedValue<AddressType>(table_encoding_, &value) || !memory_.template ReadEncodedValue<AddressType>(table_encoding_, &info->offset)) { @@ -109,6 +116,11 @@ DwarfEhFrameWithHdr<AddressType>::GetFdeInfoFromIndex(size_t index) { fde_info_.erase(index); return nullptr; } + + // Relative encodings require adding in the load bias. + if (IsEncodingRelative(table_encoding_)) { + value += load_bias_; + } info->pc = value; return info; } @@ -174,27 +186,27 @@ bool DwarfEhFrameWithHdr<AddressType>::GetFdeOffsetSequential(uint64_t pc, uint6 memory_.set_data_offset(entries_data_offset_); memory_.set_cur_offset(cur_entries_offset_); + memory_.set_pc_offset(0); cur_entries_offset_ = 0; FdeInfo* prev_info = nullptr; for (size_t current = fde_info_.size(); current < fde_count_ && memory_.cur_offset() < entries_end_; current++) { - memory_.set_pc_offset(memory_.cur_offset()); + FdeInfo* info = &fde_info_[current]; uint64_t value; - if (!memory_.template ReadEncodedValue<AddressType>(table_encoding_, &value)) { + if (!memory_.template ReadEncodedValue<AddressType>(table_encoding_, &value) || + !memory_.template ReadEncodedValue<AddressType>(table_encoding_, &info->offset)) { + fde_info_.erase(current); last_error_.code = DWARF_ERROR_MEMORY_INVALID; last_error_.address = memory_.cur_offset(); return false; } - FdeInfo* info = &fde_info_[current]; - if (!memory_.template ReadEncodedValue<AddressType>(table_encoding_, &info->offset)) { - fde_info_.erase(current); - last_error_.code = DWARF_ERROR_MEMORY_INVALID; - last_error_.address = memory_.cur_offset(); - return false; + // Relative encodings require adding in the load bias. + if (IsEncodingRelative(table_encoding_)) { + value += load_bias_; } - info->pc = value + 4; + info->pc = value; if (pc < info->pc) { if (prev_info == nullptr) { |