RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-24 17:15:07 +00:00
Code Issues Activity Actions

CPU: Use dbg() instead of dbgprintf()

Browse source
This commit is contained in:
Liav A 2020-02-24 19:03:18 +02:00 • committed by Andreas Kling
parent 9e520fd0d6
commit b41e2d25b4
2 changed files with 5 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

16
Kernel/Arch/i386/CPU.cpp
View file

@ -245,15 +245,7 @@ void page_fault_handler(RegisterState regs)
#ifdef PAGE_FAULT_DEBUG #ifdef PAGE_FAULT_DEBUG
u32 fault_page_directory = read_cr3(); u32 fault_page_directory = read_cr3();
dbgprintf("%s(%u): ring%u %s page fault in PD=%x, %s%s V%08x\n", dbg() << (current ? Process::current->name().characters() : "(none)") << "(" << (current ? Process::current->pid() : 0) << "): ring" << (regs.cs & 3) << " " << (regs.exception_code & 1 ? "PV" : "NP") << " page fault in PD=" << String::format("%x", fault_page_directory) << ", " << (regs.exception_code & 8 ? "reserved-bit " : "") << regs.exception_code & 2 ? "write" : "read" <<" V" << String::format("%08x", fault_address);
current ? Process::current->name().characters() : "(none)",
current ? Process::current->pid() : 0,
regs.cs & 3,
regs.exception_code & 1 ? "PV" : "NP",
fault_page_directory,
regs.exception_code & 8 ? "reserved-bit " : "",
regs.exception_code & 2 ? "write" : "read",
fault_address);
#endif #endif
#ifdef PAGE_FAULT_DEBUG #ifdef PAGE_FAULT_DEBUG
@ -262,7 +254,7 @@ void page_fault_handler(RegisterState regs)
bool faulted_in_userspace = (regs.cs & 3) == 3; bool faulted_in_userspace = (regs.cs & 3) == 3;
if (faulted_in_userspace && !MM.validate_user_stack(*Process::current, VirtualAddress(regs.userspace_esp))) { if (faulted_in_userspace && !MM.validate_user_stack(*Process::current, VirtualAddress(regs.userspace_esp))) {
dbgprintf("Invalid stack pointer: %p\n", regs.userspace_esp); dbg() << "Invalid stack pointer: " << String::format("%p", regs.userspace_esp);
handle_crash(regs, "Bad stack on page fault", SIGSTKFLT); handle_crash(regs, "Bad stack on page fault", SIGSTKFLT);
ASSERT_NOT_REACHED(); ASSERT_NOT_REACHED();
} }
@ -309,7 +301,7 @@ void page_fault_handler(RegisterState regs)
handle_crash(regs, "Page Fault", SIGSEGV); handle_crash(regs, "Page Fault", SIGSEGV);
} else if (response == PageFaultResponse::Continue) { } else if (response == PageFaultResponse::Continue) {
#ifdef PAGE_FAULT_DEBUG #ifdef PAGE_FAULT_DEBUG
dbgprintf("Continuing after resolved page fault\n"); dbg() << "Continuing after resolved page fault";
#endif #endif
} else { } else {
ASSERT_NOT_REACHED(); ASSERT_NOT_REACHED();
@ -674,7 +666,7 @@ void handle_interrupt(RegisterState regs)
s_interrupt_handler[irq]->increment_invoking_counter(); s_interrupt_handler[irq]->increment_invoking_counter();
s_interrupt_handler[irq]->eoi(); s_interrupt_handler[irq]->eoi();
} else { } else {
dbgprintf("No IRQ %d Handler installed!\n", irq); dbg() << "No IRQ " << irq << " Handler installed!";
hang(); hang();
} }
--g_in_irq; --g_in_irq;

2
Kernel/Arch/i386/CPU.h
View file

@ -526,7 +526,7 @@ public:
SplitQword end; SplitQword end;
read_tsc(end.lsw, end.msw); read_tsc(end.lsw, end.msw);
uint64_t diff = end.qw - m_start.qw; uint64_t diff = end.qw - m_start.qw;
dbgprintf("Stopwatch(%s): %Q ticks\n", m_name, diff); dbg() << "Stopwatch(" << m_name << "): " << diff << " ticks";
} }
private: private: