RepoMirrors/gperftools
1
0
Fork 0
mirror of https://github.com/gperftools/gperftools synced 2025-02-07 23:21:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

extend generic frame pointer backtracer to support i386

Browse Source
This commit is contained in:
Aliaksey Kandratsenka 2023-06-27 23:14:38 -04:00
parent 58d6842576
commit f56c27910a
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/stacktrace.cc
View File

@ -122,7 +122,7 @@ struct GetStackImplementation {
// Sadly, different OSes have very different mcontexts even for
// identical hardware arch. So keep it linux-only for now.
#if defined(__GNUC__) && __linux__ && (defined(__x86_64__) || defined(__aarch64__) || defined(__riscv))
#if defined(__GNUC__) && __linux__ && (defined(__x86_64__) || defined(__i386__) || defined(__aarch64__) || defined(__riscv))
#define STACKTRACE_INL_HEADER "stacktrace_generic_fp-inl.h"
#define GST_SUFFIX generic_fp
#include "stacktrace_impl_setup-inl.h"

14
src/stacktrace_generic_fp-inl.h
View File

@ -107,15 +107,14 @@ int capture(void **result, int max_depth, int skip_count,
constexpr uintptr_t kTooSmallAddr = 16 << 10;
constexpr uintptr_t kFrameSizeThreshold = 128 << 10;
// This is simplistic yet. Here we're targeting x86-64, aarch64 and
// riscv. All have 16 bytes stack alignment (even 32 bit
// This is simplistic yet. Here we're targeting x86, aarch64 and
// riscv. They all have 16 bytes stack alignment (even 32 bit
// riscv). This can be made more elaborate as we consider more
// architectures. Note, it allows us to only readability of check
// f->parent address.
// architectures.
constexpr uintptr_t kAlignment = 16;
uintptr_t initial_frame_addr = reinterpret_cast<uintptr_t>(initial_frame);
if ((initial_frame_addr & (kAlignment - 1)) != 0) {
if (((initial_frame_addr + sizeof(frame)) & (kAlignment - 1)) != 0) {
return i;
}
if (initial_frame_addr < kTooSmallAddr) {
@ -156,7 +155,7 @@ int capture(void **result, int max_depth, int skip_count,
break;
}
if ((parent_frame_addr & (kAlignment - 1)) != 0) {
if (((parent_frame_addr + sizeof(frame)) & (kAlignment - 1)) != 0) {
// not aligned, so we keep it safe and assume frame is bogus
break;
}
@ -208,6 +207,9 @@ static int GET_STACK_TRACE_OR_FRAMES {
#elif __aarch64__
initial_pc = reinterpret_cast<void* const *>(&uc->uc_mcontext.pc);
initial_frame = reinterpret_cast<void*>(uc->uc_mcontext.regs[29]);
#elif __i386__
initial_pc = reinterpret_cast<void* const *>(&uc->uc_mcontext.gregs[REG_EIP]);
initial_frame = reinterpret_cast<void*>(uc->uc_mcontext.gregs[REG_EBP]);
#else
initial_pc = reinterpret_cast<void* const *>(&uc->uc_mcontext.gregs[REG_RIP]);
initial_frame = reinterpret_cast<void*>(uc->uc_mcontext.gregs[REG_RBP]);