apio/Luna
1
1
Fork 0
Code Issues Pull Requests Actions Projects Releases 8 Wiki Activity

Fix format specifiers

Browse Source
This commit is contained in:
apio 2022-09-06 18:31:27 +02:00
parent 86e53c3004
commit 97aef95daa
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
kernel/src/interrupts/Entry.cpp
View File

@ -9,13 +9,13 @@ extern "C" void common_handler(SavedContext* context)
if (context->number < 0x20) { Debug::DebugStatus::the()->ThrowException(context->number); } if (context->number < 0x20) { Debug::DebugStatus::the()->ThrowException(context->number); }
if (context->number == 13) if (context->number == 13)
{ {
printf("General protection fault at %zx, %d, %d, %zx, %d, %zx\n", context->rip, context->cs, context->ss, printf("General protection fault at %zx, %ld, %ld, %zx, %ld, %zx\n", context->rip, context->cs, context->ss,
context->rsp, context->error_code, context->cr2); context->rsp, context->error_code, context->cr2);
while (1) halt(); while (1) halt();
} }
if (context->number == 14) if (context->number == 14)
{ {
printf("Page fault at 0x%zx\n"); printf("Page fault at 0x%zx\n", context->rip);
hang(); hang();
} }
if (context->number >= 0x20 && context->number < 0x30) { IRQ::interrupt_handler(context); } if (context->number >= 0x20 && context->number < 0x30) { IRQ::interrupt_handler(context); }

4
kernel/src/interrupts/IRQ.cpp
View File

@ -16,10 +16,10 @@ void IRQ::interrupt_handler(SavedContext* context)
case 1: { case 1: {
volatile unsigned char scancode = IO::inb(0x60); volatile unsigned char scancode = IO::inb(0x60);
Debug::DebugStatus::the()->DebugKey(scancode); Debug::DebugStatus::the()->DebugKey(scancode);
printf("Keyboard key pressed, seconds since boot: %d\n", PIT::ms_since_boot / 1000); printf("Keyboard key pressed, seconds since boot: %ld\n", PIT::ms_since_boot / 1000);
break; break;
} }
default: printf("Unhandled IRQ: %d", context->irq_number); break; default: printf("Unhandled IRQ: %ld", context->irq_number); break;
} }
PIC::send_eoi(context->irq_number); PIC::send_eoi(context->irq_number);
return; return;