From 27091163344a54b10f1a15a2cbd30fccd7744de2 Mon Sep 17 00:00:00 2001 From: Andreas Kling Date: Fri, 6 Mar 2020 10:41:08 +0100 Subject: Kernel: Fix strange looking output on unhandled page fault --- Kernel/Arch/i386/CPU.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'Kernel/Arch/i386') diff --git a/Kernel/Arch/i386/CPU.cpp b/Kernel/Arch/i386/CPU.cpp index 62624e3e53..b399f12d0c 100644 --- a/Kernel/Arch/i386/CPU.cpp +++ b/Kernel/Arch/i386/CPU.cpp @@ -259,7 +259,11 @@ void page_fault_handler(RegisterState regs) return; } - klog() << "tid - (" << Thread::current->tid() << ") Unrecoverable page fault, " << (regs.exception_code & PageFaultFlags::ReservedBitViolation ? "reserved bit violation / " : "") << ":" << (regs.exception_code & PageFaultFlags::InstructionFetch ? "instruction fetch / " : "") << ":" << (regs.exception_code & PageFaultFlags::Write ? "write to" : "read from") << " address " << String::format("%p", fault_address); + klog() << "Unrecoverable page fault, " + << (regs.exception_code & PageFaultFlags::ReservedBitViolation ? "reserved bit violation / " : "") + << (regs.exception_code & PageFaultFlags::InstructionFetch ? "instruction fetch / " : "") + << (regs.exception_code & PageFaultFlags::Write ? "write to" : "read from") + << " address " << VirtualAddress(fault_address); u32 malloc_scrub_pattern = explode_byte(MALLOC_SCRUB_BYTE); u32 free_scrub_pattern = explode_byte(FREE_SCRUB_BYTE); u32 kmalloc_scrub_pattern = explode_byte(KMALLOC_SCRUB_BYTE); -- cgit v1.2.3