From ae10c9d8ec3bddf2fde1cd4f4b170203caaf5c1d Mon Sep 17 00:00:00 2001 From: Andreas Kling Date: Sun, 8 Nov 2020 01:11:14 +0100 Subject: [PATCH] UserspaceEmulator: Fix busted backtraces with --report-to-debug Some of the output was still going to stderr in this mode, we need to use reportln() to make sure it goes to the right place. --- DevTools/UserspaceEmulator/Emulator.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/DevTools/UserspaceEmulator/Emulator.cpp b/DevTools/UserspaceEmulator/Emulator.cpp index cf705a0ad9..2a4de7b91a 100644 --- a/DevTools/UserspaceEmulator/Emulator.cpp +++ b/DevTools/UserspaceEmulator/Emulator.cpp @@ -230,11 +230,10 @@ void Emulator::dump_backtrace(const Vector& backtrace) u32 offset = 0; String symbol = m_elf->symbolicate(address, &offset); auto source_position = m_debug_info->get_source_position(address); - new_warn("=={}== {:p} {}", getpid(), address, symbol); if (source_position.has_value()) - reportln(" (\033[34;1m{}\033[0m:{})", LexicalPath(source_position.value().file_path).basename(), source_position.value().line_number); + reportln("=={}== {:p} {} (\033[34;1m{}\033[0m:{})", getpid(), address, symbol, LexicalPath(source_position.value().file_path).basename(), source_position.value().line_number); else - reportln(" +{:x}", offset); + reportln("=={}== {:p} {} +{:x}", getpid(), address, symbol, offset); } }