ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Fix bug in unwind_info display of exidx frame." am: f835ba6b66

Browse source 
am: a2a376964d

Change-Id: I9c688fa7951b799d8f13e13f8ce2e70294f055ed
This commit is contained in:
Christopher Ferris 2019-01-29 15:53:18 -08:00 • committed by android-build-merger
commit d89bc01f4e
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
libunwindstack/tools/unwind_info.cpp
View file

@ -44,10 +44,10 @@ void DumpArm(Elf* elf, ElfInterfaceArm* interface) {
} }
printf("ARM Unwind Information:\n"); printf("ARM Unwind Information:\n");
uint64_t load_bias = elf->GetLoadBias();
for (const auto& entry : interface->pt_loads()) { for (const auto& entry : interface->pt_loads()) {
uint64_t load_bias = entry.second.table_offset;
printf(" PC Range 0x%" PRIx64 " - 0x%" PRIx64 "\n", entry.second.offset + load_bias, printf(" PC Range 0x%" PRIx64 " - 0x%" PRIx64 "\n", entry.second.offset + load_bias,
entry.second.table_size + load_bias); entry.second.offset + entry.second.table_size + load_bias);
for (auto pc : *interface) { for (auto pc : *interface) {
std::string name; std::string name;
printf(" PC 0x%" PRIx64, pc + load_bias); printf(" PC 0x%" PRIx64, pc + load_bias);