Skip to content

Commit 3ad14de

Browse files
committed
FIX
1 parent 4eaaa25 commit 3ad14de

6 files changed

Lines changed: 53 additions & 11 deletions

File tree

‎include/stdarg.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#ifndef STDARG_H
1+
#ifndef STDARG_H
22
#define STDARG_H
33

44
typedef __builtin_va_list va_list;

‎src/arch/timer.c‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
#include "types.h"
22
#include "timer.h"
3+
#include "serial.h"
34

45
// This counter increments every time the PIT timer fires
56
static uint64_t global_ticks = 0;
@@ -11,9 +12,12 @@ uint64_t timer_get_ticks() {
1112
// This is called by your interrupt handler in isr.c
1213
void timer_handler(void) {
1314
global_ticks++;
15+
if (global_ticks % 100 == 0) {
16+
serial_write_string("DEBUG: Timer tick 100\n");
17+
}
1418
}
1519

1620
// Basic PIT initialization (100Hz)
1721
void timer_init(void) {
18-
// You can add outb() commands here later to set the frequency
22+
pit_init(100);
1923
}

‎src/cpu/idt.c‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -57,9 +57,6 @@ extern void irq15(void);
5757
extern void isr128(void);
5858

5959
void pic_remap(void) {
60-
uint8_t a1 = inb(0x21);
61-
uint8_t a2 = inb(0xA1);
62-
6360
outb(0x20, 0x11);
6461
io_wait();
6562
outb(0xA0, 0x11);
@@ -77,8 +74,8 @@ void pic_remap(void) {
7774
outb(0xA1, 0x01);
7875
io_wait();
7976

80-
outb(0x21, a1);
81-
outb(0xA1, a2);
77+
outb(0x21, 0x0);
78+
outb(0xA1, 0x0);
8279
}
8380

8481
void idt_set_gate(uint8_t num, uint32_t base, uint16_t selector, uint8_t type, uint8_t dpl, uint8_t present) {

‎src/cpu/isr.c‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -190,16 +190,18 @@ static registers_t* irq0_handler(registers_t* regs) {
190190
kswapd_tick();
191191
process_t* previous = 0;
192192
process_t* next = switch_task(regs, &previous);
193-
if (!previous || !next || next == previous) {
193+
if (!next || next == previous) {
194194
return regs;
195195
}
196196

197-
previous->esp = (uint32_t)regs;
197+
if (previous) {
198+
previous->esp = (uint32_t)regs;
199+
}
198200

199201
if (next->page_directory) {
200202
load_cr3(next->page_directory);
201203
}
202-
204+
203205
return (registers_t*)next->esp;
204206
}
205207

‎src/drivers/vga.c‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,15 @@ static void vga_write_at(const char* text, uint8_t color, uint8_t x, uint8_t y)
9797
}
9898

9999
static void wait_ticks(uint64_t ticks) {
100+
uint32_t eflags;
101+
asm volatile("pushf; pop %0" : "=r"(eflags));
102+
if (!(eflags & 0x200)) {
103+
// Interrupts are disabled, use a busy loop instead
104+
for (uint64_t i = 0; i < ticks * 1000000; ++i) {
105+
asm volatile("nop");
106+
}
107+
return;
108+
}
100109
uint64_t start = timer_get_ticks();
101110
while ((timer_get_ticks() - start) < ticks) { }
102111
}

‎src/kernel.c‎

Lines changed: 31 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -359,6 +359,7 @@ void kernel_main(unsigned int multiboot_magic, unsigned int multiboot_info_addr)
359359
serial_init();
360360
diag_init();
361361
diag_log(DIAG_INFO, "boot start");
362+
serial_write_string("DEBUG: GDT/IDT/ISR Initialized\n");
362363

363364
multiboot_info_t* info = 0;
364365
uint32_t mem_bytes = 16u * 1024u * 1024u;
@@ -368,12 +369,16 @@ void kernel_main(unsigned int multiboot_magic, unsigned int multiboot_info_addr)
368369
mem_bytes = (info->mem_upper + 1024) * 1024;
369370
}
370371
}
372+
serial_write_string("DEBUG: Multiboot info parsed\n");
373+
371374
if (mem_bytes > 0x100000) {
372375
pmm_init(0x100000, mem_bytes - 0x100000);
373376
} else {
374377
pmm_init(0x100000, 0);
375378
}
376379
diag_log_hex32(DIAG_INFO, "mem_bytes", mem_bytes);
380+
serial_write_string("DEBUG: PMM Initialized\n");
381+
377382
pmm_reserve_region((uint32_t)&kernel_start, (uint32_t)&kernel_end - (uint32_t)&kernel_start);
378383
if (info) {
379384
pmm_reserve_region(align_down((uint32_t)info, 4096), align_up(sizeof(multiboot_info_t), 4096));
@@ -387,12 +392,19 @@ void kernel_main(unsigned int multiboot_magic, unsigned int multiboot_info_addr)
387392
}
388393
}
389394
}
395+
serial_write_string("DEBUG: Memory regions reserved\n");
390396

391397
acpi_scan();
398+
serial_write_string("DEBUG: ACPI scan complete\n");
399+
392400
paging_init();
401+
serial_write_string("DEBUG: Paging Initialized\n");
402+
393403
apex_intc_init();
394404
msgi_init();
395405
smp_rally_init();
406+
serial_write_string("DEBUG: SMP/Interrupt Controller Initialized\n");
407+
396408
power_plane_init();
397409
acpi_power_init();
398410
secure_hard_init();
@@ -414,16 +426,22 @@ void kernel_main(unsigned int multiboot_magic, unsigned int multiboot_info_addr)
414426
proc_view_init();
415427
sys_view_init();
416428
sys_config_init();
429+
serial_write_string("DEBUG: Subsystems Initialized\n");
430+
417431
if (cpu_has_sse()) {
418432
sse_enable();
419433
ai_set_simd_enabled(cpu_has_sse41());
420434
} else {
421435
ai_set_simd_enabled(0);
422436
}
423437
ai_model_init();
438+
serial_write_string("DEBUG: AI Model Initialized\n");
439+
424440
heap_init();
425441
slab_init();
426442
kswapd_init();
443+
serial_write_string("DEBUG: Memory Management (Heap/Slab) Initialized\n");
444+
427445
numa_init(get_ram_size());
428446
ipc_init();
429447
io_sched_init();
@@ -435,29 +453,41 @@ void kernel_main(unsigned int multiboot_magic, unsigned int multiboot_info_addr)
435453
xfs_init();
436454
btrfs_init();
437455
job_init();
456+
serial_write_string("DEBUG: FS/IPC/Jobs Initialized\n");
457+
438458
fb_init(info);
439459
fb_clear(0);
440460
fb_console_init(0xFFFFFF, 0);
441461
fb_console_write("Kernel Loaded Successfully\n");
462+
serial_write_string("DEBUG: Framebuffer Initialized\n");
463+
442464
vfs_init();
465+
serial_write_string("DEBUG: VFS Initialized\n");
443466

444467
if (info && info->mods_count > 0) {
445468
multiboot_module_t* module = (multiboot_module_t*)info->mods_addr;
446469
uint32_t size = module->mod_end - module->mod_start;
447470
vfs_set_root(ramdisk_init(module->mod_start, size));
448471
}
472+
serial_write_string("DEBUG: Ramdisk mounted\n");
449473

450474
scheduler_init();
451475
process_create(task_a, 0);
452476
process_create(task_b, 0);
453477
pit_init(100);
454-
enable_interrupts();
478+
serial_write_string("DEBUG: Scheduler/PIT Initialized. Displaying splash...\n");
479+
455480
vga_display_splash();
481+
456482
fb_clear(0);
457483
fb_console_init(0xFFFFFF, 0);
458484
keyboard_init();
459485
keyboard_set_callback(shell_on_input);
460486
shell_init();
487+
488+
serial_write_string("DEBUG: Kernel Main complete, enabling interrupts...\n");
489+
enable_interrupts();
490+
serial_write_string("DEBUG: Interrupts enabled\n");
461491
#ifdef SELFTEST_AUTORUN
462492
selftest_run();
463493
#endif

0 commit comments

Comments
 (0)