diff --git a/DevTools/UserspaceEmulator/Emulator.cpp b/DevTools/UserspaceEmulator/Emulator.cpp index 1a2aaee0a7..8c6114a8b5 100644 --- a/DevTools/UserspaceEmulator/Emulator.cpp +++ b/DevTools/UserspaceEmulator/Emulator.cpp @@ -217,7 +217,7 @@ void Emulator::dump_backtrace(const Vector& backtrace) auto source_position = m_debug_info->get_source_position(address); dbgprintf("==%d== %#08x %s +%#x", getpid(), address, symbol.characters(), offset); if (source_position.has_value()) - dbgprintf(" (%s:%zu)", LexicalPath(source_position.value().file_path).basename().characters(), source_position.value().line_number); + dbgprintf(" (\033[34;1m%s\033[0m:%zu)", LexicalPath(source_position.value().file_path).basename().characters(), source_position.value().line_number); dbgprintf("\n"); } } @@ -775,7 +775,7 @@ u32 Emulator::virt$read(int fd, FlatPtr buffer, ssize_t size) void Emulator::virt$exit(int status) { - dbg() << "exit(" << status << "), shutting down!"; + dbgprintf("\n==%d== \033[33;1mSyscall: exit(%d)\033[0m, shutting down!\n", getpid(), status); m_exit_status = status; m_shutdown = true; } diff --git a/DevTools/UserspaceEmulator/MallocTracer.cpp b/DevTools/UserspaceEmulator/MallocTracer.cpp index 31e3da0636..f588cd6f28 100644 --- a/DevTools/UserspaceEmulator/MallocTracer.cpp +++ b/DevTools/UserspaceEmulator/MallocTracer.cpp @@ -209,7 +209,7 @@ void MallocTracer::dump_leak_report() ++leaks_found; bytes_leaked += mallocation.size; dbgprintf("\n"); - dbgprintf("==%d== \033[31;1mLeak\033[0m, %zu-byte allocation at address %p\n", getpid(), mallocation.size, mallocation.address); + dbgprintf("==%d== \033[31;1mLeak\033[0m, %zu-byte allocation at address %#08x\n", getpid(), mallocation.size, mallocation.address); Emulator::the().dump_backtrace(mallocation.malloc_backtrace); } diff --git a/DevTools/UserspaceEmulator/SoftCPU.cpp b/DevTools/UserspaceEmulator/SoftCPU.cpp index b5707ebb02..e0e666bb1c 100644 --- a/DevTools/UserspaceEmulator/SoftCPU.cpp +++ b/DevTools/UserspaceEmulator/SoftCPU.cpp @@ -62,7 +62,7 @@ void SoftCPU::warn_if_flags_tainted(const char* message) const { if (m_flags_tainted) { dbgprintf("\n"); - dbgprintf("==%d== \033[31;1mConditional instruction depends on uninitialized data (%s)\033[0m\n", getpid(), message); + dbgprintf("==%d== \033[31;1mConditional depends on uninitialized data\033[0m (%s)\n", getpid(), message); Emulator::the().dump_backtrace(); } }