From 84c2be604a062fe553c8a0edf755286499a2221b Mon Sep 17 00:00:00 2001 From: Brian Gianforcaro Date: Sat, 2 Jan 2021 00:38:43 +0000 Subject: [PATCH] Kernel+LibELF: Use hex instead of decimal for stack offsets in back traces (#4728) Hex is the de facto format for representing memory addresses, make backtraces conform to that convention. --- Kernel/KSyms.cpp | 2 +- Libraries/LibELF/Image.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Kernel/KSyms.cpp b/Kernel/KSyms.cpp index 7d10e91ecf..8d1f93a870 100644 --- a/Kernel/KSyms.cpp +++ b/Kernel/KSyms.cpp @@ -171,7 +171,7 @@ NEVER_INLINE static void dump_backtrace_impl(FlatPtr base_pointer, bool use_ksym if (symbol.symbol->address == g_highest_kernel_symbol_address && offset > 4096) dbgln("{:p}", symbol.address); else - dbgln("{:p} {} +{}", symbol.address, demangle(symbol.symbol->name), offset); + dbgln("{:p} {} +0x{:x}", symbol.address, demangle(symbol.symbol->name), offset); } } diff --git a/Libraries/LibELF/Image.cpp b/Libraries/LibELF/Image.cpp index cea997746e..ba1a7380d4 100644 --- a/Libraries/LibELF/Image.cpp +++ b/Libraries/LibELF/Image.cpp @@ -397,7 +397,7 @@ String Image::symbolicate(u32 address, u32* out_offset) const *out_offset = address - symbol.address; return demangled_name; } - return String::format("%s +%u", demangled_name.characters(), address - symbol.address); + return String::format("%s +0x%x", demangled_name.characters(), address - symbol.address); } } if (out_offset)