dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Crashlog: Unix: Fix getting symbols using BFD

Browse Source
This commit is contained in:
Jonathan G Rennison
2020-06-30 23:53:51 +01:00
parent fa42151290
commit 610f8b9eca
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/os/unix/crashlog_unix.cpp
View File

@@ -426,12 +426,12 @@ class CrashLogUnix : public CrashLog {
unsigned int line_num = 0; unsigned int line_num = 0;
#if defined(WITH_BFD) #if defined(WITH_BFD)
/* subtract one to get the line before the return address, i.e. the function call line */ /* subtract one to get the line before the return address, i.e. the function call line */
sym_info_bfd bfd_info(reinterpret_cast<bfd_vma>(trace[i]) - 1); sym_info_bfd bfd_info(reinterpret_cast<bfd_vma>(trace[i]) - reinterpret_cast<bfd_vma>(info.dli_fbase) - 1);
if (dladdr_result && info.dli_fname) { if (dladdr_result && info.dli_fname) {
lookup_addr_bfd(info.dli_fname, bfd_info); lookup_addr_bfd(info.dli_fname, bfd_info);
if (bfd_info.file_name != nullptr) file_name = bfd_info.file_name; if (bfd_info.file_name != nullptr) file_name = bfd_info.file_name;
if (bfd_info.function_name != nullptr) func_name = bfd_info.function_name; if (bfd_info.function_name != nullptr) func_name = bfd_info.function_name;
if (bfd_info.function_addr != 0) func_addr = reinterpret_cast<void *>(bfd_info.function_addr); if (bfd_info.function_addr != 0) func_addr = reinterpret_cast<void *>(bfd_info.function_addr + reinterpret_cast<bfd_vma>(info.dli_fbase));
line_num = bfd_info.line; line_num = bfd_info.line;
} }
#endif /* WITH_BFD */ #endif /* WITH_BFD */