xamidev/pepperOS
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Efficient DEBUG logging system with __FILE__ and fctprintf

Browse Source
This commit is contained in:
xamidev
2025-12-28 12:15:32 +01:00
parent ead0ed6ae1
commit 3853a1ace3
9 changed files with 55 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
src/idt/idt.c
View File

@@ -3,6 +3,7 @@
#include <stddef.h> #include <stddef.h>
#include "../io/serial/serial.h" #include "../io/serial/serial.h"
#include "../io/kbd/ps2.h" #include "../io/kbd/ps2.h"
#include <kernel.h>
struct interrupt_descriptor idt[256]; struct interrupt_descriptor idt[256];
struct idtr idt_reg; struct idtr idt_reg;
@@ -49,7 +50,7 @@ void idt_init()
idt_set_entry(i, vector_0_handler + (i*16), 0); idt_set_entry(i, vector_0_handler + (i*16), 0);
} }
idt_load(&idt); idt_load(&idt);
serial_kputs("kernel: idt: Initialized IDT!\n"); DEBUG("IDT initialized");
} }
struct cpu_status_t* interrupt_dispatch(struct cpu_status_t* context) struct cpu_status_t* interrupt_dispatch(struct cpu_status_t* context)
@@ -57,74 +58,74 @@ struct cpu_status_t* interrupt_dispatch(struct cpu_status_t* context)
switch(context->vector_number) switch(context->vector_number)
{ {
case 0: case 0:
serial_kputs("kernel: idt: Divide Error!\n"); DEBUG("Divide Error!");
break; break;
case 1: case 1:
serial_kputs("kernel: idt: Debug Exception!\n"); DEBUG("Debug Exception!");
break; break;
case 2: case 2:
serial_kputs("kernel: idt: NMI Interrupt!\n"); DEBUG("NMI Interrupt!");
break; break;
case 3: case 3:
serial_kputs("kernel: idt: Breakpoint Interrupt!\n"); DEBUG("Breakpoint Interrupt!");
break; break;
case 4: case 4:
serial_kputs("kernel: idt: Overflow Trap!\n"); DEBUG("Overflow Trap!");
break; break;
case 5: case 5:
serial_kputs("kernel: idt: BOUND Range Exceeded!\n"); DEBUG("BOUND Range Exceeded!");
break; break;
case 6: case 6:
serial_kputs("kernel: idt: Invalid Opcode!\n"); DEBUG("Invalid Opcode!");
break; break;
case 7: case 7:
serial_kputs("kernel: idt: Device Not Available!\n"); DEBUG("Device Not Available!");
break; break;
case 8: case 8:
serial_kputs("kernel: idt: Double Fault!\n"); DEBUG("Double Fault!");
break; break;
case 9: case 9:
serial_kputs("kernel: idt: Coprocessor Segment Overrun!\n"); DEBUG("Coprocessor Segment Overrun!");
break; break;
case 10: case 10:
serial_kputs("kernel: idt: Invalid TSS!\n"); DEBUG("Invalid TSS!");
break; break;
case 11: case 11:
serial_kputs("kernel: idt: Segment Not Present!\n"); DEBUG("Segment Not Present!");
break; break;
case 12: case 12:
serial_kputs("kernel: idt: Stack-Segment Fault!\n"); DEBUG("Stack-Segment Fault!");
break; break;
case 13: case 13:
serial_kputs("kernel: idt: General Protection Fault!\n"); DEBUG("General Protection Fault!");
break; break;
case 14: case 14:
serial_kputs("kernel: idt: Page Fault!\n"); DEBUG("Page Fault!");
break; break;
case 15: case 15:
serial_kputs("kernel: idt: Intel Reserved Interrupt! (Achievement unlocked: How Did We Get Here?)\n"); DEBUG("Intel Reserved Interrupt! (Achievement unlocked: How Did We Get Here?)");
break; break;
case 16: case 16:
serial_kputs("kernel: idt: x87 Floating-Point Error!\n"); DEBUG("x87 Floating-Point Error!");
break; break;
case 17: case 17:
serial_kputs("kernel: idt: Alignment Check Fault!\n"); DEBUG("Alignment Check Fault!");
break; break;
case 18: case 18:
serial_kputs("kernel: idt: Machine Check!\n"); DEBUG("Machine Check!");
break; break;
case 19: case 19:
serial_kputs("kernel: idt: SIMD Floating-Point Exception!\n"); DEBUG("SIMD Floating-Point Exception!");
break; break;
case 20: case 20:
serial_kputs("kernel: idt: Virtualization Exception!\n"); DEBUG("Virtualization Exception!");
break; break;
case 21: case 21:
serial_kputs("kernel: idt: Control Protection Exception!\n"); DEBUG("Control Protection Exception!");
break; break;
case 32: case 32:
//serial_kputs("Tick!"); DEBUG("Tick!");
ticks++; ticks++;
// Send an EOI so that we can continue having interrupts // Send an EOI so that we can continue having interrupts
outb(0x20, 0x20); outb(0x20, 0x20);
@@ -135,7 +136,7 @@ struct cpu_status_t* interrupt_dispatch(struct cpu_status_t* context)
break; break;
default: default:
serial_kputs("kernel: idt: Unexpected interrupt\n"); DEBUG("Unexpected interrupt");
break; break;
} }

9
src/io/kbd/ps2.c
View File

@@ -1,10 +1,10 @@
// PS/2 Keyboard support // PS/2 Keyboard support
#include "../serial/serial.h" #include "../serial/serial.h"
#include "../term/printf.h"
#include "ps2.h" #include "ps2.h"
#include <stdint.h> #include <stdint.h>
#include "../term/term.h" #include "../term/term.h"
#include <kernel.h>
// The key status bitfield will be used to see if ALT, CONTROL, or SHIFT is pressed // The key status bitfield will be used to see if ALT, CONTROL, or SHIFT is pressed
uint8_t key_status = 0b00000000; uint8_t key_status = 0b00000000;
@@ -206,7 +206,7 @@ void keyboard_handler()
} }
} }
serial_kputs("key pressed!\n"); skputs("key pressed!\n");
} }
// End of Interrupt (to master PIC) // End of Interrupt (to master PIC)
@@ -230,7 +230,8 @@ void keyboard_init(unsigned char layout)
break; break;
default: default:
serial_kputs("Unsupported layout."); skputs("Unsupported layout.");
break; return;
} }
DEBUG("PS/2 Keyboard initialized");
} }

10
src/io/serial/serial.c
View File

@@ -36,7 +36,7 @@ int serial_init()
// Set normal operation mode // Set normal operation mode
outb(PORT + 4, 0x0F); outb(PORT + 4, 0x0F);
serial_kputs("\n\nkernel: serial: Serial initialization OK!\n"); DEBUG("serial initialized");
return 0; return 0;
} }
@@ -45,18 +45,20 @@ static int is_transmit_empty()
return inb(PORT + 5) & 0x20; return inb(PORT + 5) & 0x20;
} }
void write_serial(char c) // Serial kernel putchar
void skputc(char c)
{ {
while (!is_transmit_empty()); // wait for free spot while (!is_transmit_empty()); // wait for free spot
outb(PORT, c); outb(PORT, c);
} }
void serial_kputs(const char* str) // Serial kernel putstring
void skputs(const char* str)
{ {
unsigned int i=0; unsigned int i=0;
while (str[i]) while (str[i])
{ {
write_serial(str[i]); skputc(str[i]);
i++; i++;
} }
} }

3
src/io/serial/serial.h
View File

@@ -5,6 +5,7 @@ void outb(int port, unsigned char data);
unsigned char inb(int port); unsigned char inb(int port);
int serial_init(); int serial_init();
void serial_kputs(const char* str); void skputs(const char* str);
void skputc(char c);
#endif #endif

1
src/io/term/term.c
View File

@@ -35,6 +35,7 @@ int term_init()
if (framebuffer) if (framebuffer)
{ {
fb = framebuffer->address; fb = framebuffer->address;
DEBUG("terminal initialized");
return 0; return 0;
} }
return -ENOMEM; return -ENOMEM;

6
src/kernel.h
View File

@@ -10,4 +10,10 @@ enum ErrorCodes
#define CLEAR_INTERRUPTS __asm__ volatile("cli") #define CLEAR_INTERRUPTS __asm__ volatile("cli")
#define SET_INTERRUPTS __asm__ volatile("sti") #define SET_INTERRUPTS __asm__ volatile("sti")
#include "io/serial/serial.h"
#include "io/term/printf.h"
#define DEBUG(log) \
fctprintf((void*)&skputc, 0, "debug: [%s]: %s\n", __FILE__, log)
#endif #endif

10
src/kmain.c
View File

@@ -48,9 +48,8 @@ void kmain()
// Get the first framebuffer from the response // Get the first framebuffer from the response
framebuffer = framebuffer_request.response->framebuffers[0]; framebuffer = framebuffer_request.response->framebuffers[0];
if (term_init()) hcf(); term_init();
serial_init();
if (serial_init()) kputs("kernel: serial: error: Cannot init serial communication!");
CLEAR_INTERRUPTS; CLEAR_INTERRUPTS;
gdt_init(); gdt_init();
@@ -61,8 +60,9 @@ void kmain()
keyboard_init(FR); keyboard_init(FR);
// Draw something // Draw something
printf("%s, %s!", "Hello", "world"); printf("%s, %s!\n", "Hello", "world");
//printf("%d", 4/0); // Yoohoooooo!
DEBUG("kernel initialized successfully! hanging...");
hcf(); hcf();
} }

3
src/mem/gdt/gdt.c
View File

@@ -1,6 +1,7 @@
#include "gdt.h" #include "gdt.h"
#include <stdint.h> #include <stdint.h>
#include "../../io/serial/serial.h" #include "../../io/serial/serial.h"
#include <kernel.h>
// Descriptors are 8-byte wide (64bits) // Descriptors are 8-byte wide (64bits)
// So the selectors will be (in bytes): 0x0, 0x8, 0x10, 0x18, etc.. // So the selectors will be (in bytes): 0x0, 0x8, 0x10, 0x18, etc..
@@ -78,5 +79,5 @@ void gdt_init()
gdt_load(); gdt_load();
gdt_flush(); gdt_flush();
serial_kputs("kernel: gdt: Initialized GDT!\n"); DEBUG("GDT initialized");
} }

2
src/time/timer.c
View File

@@ -1,5 +1,6 @@
#include <stdint.h> #include <stdint.h>
#include "../io/serial/serial.h" #include "../io/serial/serial.h"
#include <kernel.h>
/* /*
For now, the timer module will be using the PIC. For now, the timer module will be using the PIC.
@@ -72,4 +73,5 @@ void timer_init()
pic_remap(); pic_remap();
pic_enable(); pic_enable();
pit_init(); pit_init();
DEBUG("PIT initialized");
} }