[fix] Better color?
This commit is contained in:
+2
-56
@@ -94,30 +94,6 @@ extern "C" void kernel_main() {
|
||||
serial_write("Sylva: init heap...\n");
|
||||
init_heap();
|
||||
|
||||
// test kmalloc/kfree
|
||||
serial_write("Sylva: kmalloc test...\n");
|
||||
void* p1 = kmalloc(64);
|
||||
void* p2 = kmalloc(128);
|
||||
void* p3 = kmalloc(256);
|
||||
serial_write("Sylva: p1 = ");
|
||||
serial_write_hex((UINTN)p1);
|
||||
serial_write(" p2 = ");
|
||||
serial_write_hex((UINTN)p2);
|
||||
serial_write(" p3 = ");
|
||||
serial_write_hex((UINTN)p3);
|
||||
serial_write("\n");
|
||||
|
||||
serial_write("Sylva: kfree test...\n");
|
||||
kfree(p2);
|
||||
kfree(p1);
|
||||
kfree(p3);
|
||||
|
||||
void* p4 = kmalloc(32);
|
||||
serial_write("Sylva: realloc p4 = ");
|
||||
serial_write_hex((UINTN)p4);
|
||||
serial_write("\n");
|
||||
kfree(p4);
|
||||
|
||||
serial_write("Sylva: memory init done.\n");
|
||||
|
||||
serial_write("Sylva: FS init...\n");
|
||||
@@ -129,10 +105,10 @@ extern "C" void kernel_main() {
|
||||
fs_list();
|
||||
}
|
||||
|
||||
pf_print("Welcome to Sylva OS!\n");
|
||||
serial_write(" Kernel prepared well.\n");
|
||||
|
||||
prepare((UINT32) g_gfx.vr, (UINT32) g_gfx.hr);
|
||||
pf_print("Hello from SylvaOS!", 100, 100);
|
||||
|
||||
// --- Interrupt infrastructure ---
|
||||
serial_write("Sylva: init GDT...\n");
|
||||
@@ -155,37 +131,7 @@ extern "C" void kernel_main() {
|
||||
ASM("sti");
|
||||
serial_write("Sylva: interrupts enabled\n");
|
||||
|
||||
// --- Multitasking demo ---
|
||||
serial_write("Sylva: creating tasks...\n");
|
||||
|
||||
// Task A: prints messages — preemption handles time slicing
|
||||
task_create("taskA", []() {
|
||||
for (int i = 0; i < 10; i++) {
|
||||
serial_write("[taskA] running iteration ");
|
||||
serial_write_hex(i);
|
||||
serial_write("\n");
|
||||
for (volatile int j = 0; j < 50000000; j++) {}
|
||||
}
|
||||
serial_write("[taskA] done\n");
|
||||
});
|
||||
|
||||
// Task B: prints messages
|
||||
task_create("taskB", []() {
|
||||
for (int i = 0; i < 5; i++) {
|
||||
serial_write("[taskB] hello from taskB #");
|
||||
serial_write_hex(i);
|
||||
serial_write("\n");
|
||||
for (volatile int j = 0; j < 50000000; j++) {}
|
||||
}
|
||||
serial_write("[taskB] done\n");
|
||||
});
|
||||
|
||||
// Task C: short task
|
||||
task_create("taskC", []() {
|
||||
serial_write("[taskC] quick task\n");
|
||||
for (volatile int j = 0; j < 50000000; j++) {}
|
||||
serial_write("[taskC] finished\n");
|
||||
});
|
||||
// 现在还没有任何tasks
|
||||
|
||||
serial_write("Sylva: starting preemptive scheduler\n");
|
||||
scheduler_run(); // never returns
|
||||
|
||||
Reference in New Issue
Block a user