luo980/cpptrace
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update for macos

Browse Source
This commit is contained in:
Jeremy 2024-05-02 11:05:22 -05:00
parent b125248b32
commit ce19421bb5
No known key found for this signature in database
GPG Key ID: 3E11861CB34E158C
1 changed files with 29 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/binary/object.hpp
View File

@ -13,7 +13,9 @@
#if IS_LINUX || IS_APPLE #if IS_LINUX || IS_APPLE
#include <unistd.h> #include <unistd.h>
#include <dlfcn.h> #include <dlfcn.h>
#include <link.h> #if IS_LINUX
#include <link.h> // needed for dladdr1's link_map info
#endif
#elif IS_WINDOWS #elif IS_WINDOWS
#include <windows.h> #include <windows.h>
#endif #endif
@ -21,6 +23,7 @@
namespace cpptrace { namespace cpptrace {
namespace detail { namespace detail {
#if IS_LINUX || IS_APPLE #if IS_LINUX || IS_APPLE
#if IS_LINUX
inline std::string resolve_l_name(const char* l_name) { inline std::string resolve_l_name(const char* l_name) {
if(l_name != nullptr && l_name[0] != 0) { if(l_name != nullptr && l_name[0] != 0) {
return l_name; return l_name;
@ -36,6 +39,7 @@ namespace detail {
} }
} }
} }
#endif
#ifdef CPPTRACE_HAS_DL_FIND_OBJECT #ifdef CPPTRACE_HAS_DL_FIND_OBJECT
inline object_frame get_frame_object_info(frame_ptr address) { inline object_frame get_frame_object_info(frame_ptr address) {
// Use _dl_find_object when we can, it's orders of magnitude faster // Use _dl_find_object when we can, it's orders of magnitude faster
@ -50,6 +54,7 @@ namespace detail {
return frame; return frame;
} }
#else #else
#if IS_LINUX
// dladdr queries are needed to get pre-ASLR addresses and targets to run addr2line on // dladdr queries are needed to get pre-ASLR addresses and targets to run addr2line on
inline object_frame get_frame_object_info(frame_ptr address) { inline object_frame get_frame_object_info(frame_ptr address) {
// reference: https://github.com/bminor/glibc/blob/master/debug/backtracesyms.c // reference: https://github.com/bminor/glibc/blob/master/debug/backtracesyms.c
@ -75,6 +80,29 @@ namespace detail {
} }
return frame; return frame;
} }
#else
// macos doesn't have dladdr1 but it seems its dli_fname behaves more sensibly?
// dladdr queries are needed to get pre-ASLR addresses and targets to run addr2line on
inline object_frame get_frame_object_info(frame_ptr address) {
// reference: https://github.com/bminor/glibc/blob/master/debug/backtracesyms.c
Dl_info info;
object_frame frame;
frame.raw_address = address;
frame.object_address = 0;
if(dladdr(reinterpret_cast<void*>(address), &info)) { // thread safe
frame.object_path = info.dli_fname;
auto base = get_module_image_base(info.dli_fname);
if(base.has_value()) {
frame.object_address = address
- reinterpret_cast<std::uintptr_t>(info.dli_fbase)
+ base.unwrap_value();
} else {
base.drop_error();
}
}
return frame;
}
#endif
#endif #endif
#else #else
inline std::string get_module_name(HMODULE handle) { inline std::string get_module_name(HMODULE handle) {