openkylin
/
platform_system_core
mirror of https://gitee.com/openkylin/platform_system_core.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

libunwindstack: expose static version of BuildFrameFromPcOnly. 

Bug: http://b/165206592
Test: unit tests and treehugger
Change-Id: Ic357ee6160281c5986570de5536b3247b231bc6f
This commit is contained in:
Josh Gao 2020-08-20 17:15:00 -07:00 committed by Christopher Ferris
parent 86f19217fb
commit 0d0f32369f
2 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
libunwindstack/Unwinder.cpp
View File

@ -397,19 +397,20 @@ bool UnwinderFromPid::Init(ArchEnum arch) {
return true;
}
FrameData Unwinder::BuildFrameFromPcOnly(uint64_t pc) {
FrameData Unwinder::BuildFrameFromPcOnly(uint64_t pc, ArchEnum arch, Maps* maps,
JitDebug* jit_debug,
std::shared_ptr<Memory> process_memory,
bool resolve_names) {
FrameData frame;
Maps* maps = GetMaps();
MapInfo* map_info = maps->Find(pc);
if (map_info == nullptr || regs_ == nullptr) {
if (map_info == nullptr || arch == ARCH_UNKNOWN) {
frame.pc = pc;
frame.rel_pc = pc;
return frame;
}
ArchEnum arch = regs_->Arch();
Elf* elf = map_info->GetElf(GetProcessMemory(), arch);
Elf* elf = map_info->GetElf(process_memory, arch);
uint64_t relative_pc = elf->GetRelPc(pc, map_info);
@ -419,9 +420,9 @@ FrameData Unwinder::BuildFrameFromPcOnly(uint64_t pc) {
uint64_t debug_pc = relative_pc;
// If we don't have a valid ELF file, check the JIT.
if (!elf->valid() && jit_debug_ != nullptr) {
if (!elf->valid() && jit_debug != nullptr) {
uint64_t jit_pc = pc - pc_adjustment;
Elf* jit_elf = jit_debug_->GetElf(maps, jit_pc);
Elf* jit_elf = jit_debug->GetElf(maps, jit_pc);
if (jit_elf != nullptr) {
debug_pc = jit_pc;
elf = jit_elf;
@ -439,7 +440,7 @@ FrameData Unwinder::BuildFrameFromPcOnly(uint64_t pc) {
frame.map_flags = map_info->flags;
frame.map_load_bias = elf->GetLoadBias();
if (!resolve_names_ ||
if (!resolve_names ||
!elf->GetFunctionName(debug_pc, &frame.function_name, &frame.function_offset)) {
frame.function_name = "";
frame.function_offset = 0;
@ -447,4 +448,9 @@ FrameData Unwinder::BuildFrameFromPcOnly(uint64_t pc) {
return frame;
}
FrameData Unwinder::BuildFrameFromPcOnly(uint64_t pc) {
return BuildFrameFromPcOnly(pc, regs_ ? regs_->Arch() : ARCH_UNKNOWN, maps_, jit_debug_,
process_memory_, resolve_names_);
}
} // namespace unwindstack

2
libunwindstack/include/unwindstack/Unwinder.h
View File

@ -120,6 +120,8 @@ class Unwinder {
// frames collected by frame-pointer unwinding that's done outside of
// libunwindstack. This is used by tombstoned to symbolize frame pointer-based
// stack traces that are collected by tools such as GWP-ASan and MTE.
static FrameData BuildFrameFromPcOnly(uint64_t pc, ArchEnum arch, Maps* maps, JitDebug* jit_debug,
std::shared_ptr<Memory> process_memory, bool resolve_names);
FrameData BuildFrameFromPcOnly(uint64_t pc);
protected: