diff options
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/interrupts.c | 2 | ||||
| -rw-r--r-- | kernel/kernel.c | 14 | ||||
| -rw-r--r-- | kernel/task.c | 12 |
3 files changed, 10 insertions, 18 deletions
diff --git a/kernel/interrupts.c b/kernel/interrupts.c index 348972e..e67e74d 100644 --- a/kernel/interrupts.c +++ b/kernel/interrupts.c @@ -48,7 +48,7 @@ void int_def_handler() { X86_IRQ_BEGIN - int_unhandled++; + panic(FOOLOS_MODULE_NAME,"unhandled EXCEPTION!"); X86_IRQ_END } diff --git a/kernel/kernel.c b/kernel/kernel.c index 3eebef6..287a62a 100644 --- a/kernel/kernel.c +++ b/kernel/kernel.c @@ -24,12 +24,6 @@ void int_floppy_handler(); uint32_t read_eip(); -void int_unhandled() -{ - X86_IRQ_BEGIN - panic(FOOLOS_MODULE_NAME,"unhandled EXCEPTION!"); - X86_IRQ_END -} void int_irq0(){ X86_IRQ_BEGIN panic(FOOLOS_MODULE_NAME,"Divide by 0"); X86_IRQ_END } void int_irq1(){ X86_IRQ_BEGIN panic(FOOLOS_MODULE_NAME,"Single step (debugger)"); X86_IRQ_END } @@ -99,11 +93,11 @@ void kernel_main(uint32_t initial_stack) // uint32_t vesa_physbase=vesa_init(0x8300,0x8400,0x7200); + // initial stack log(FOOLOS_MODULE_NAME,FOOLOS_LOG_INFO,"initial esp: 0x%08X",initial_stack); // PIT config (timer) timer_init(); - // we know that here, the bootloader placed the mamory map! mem_init(0x7c00+0x400,*((uint16_t *)(0x7c00+0x600))); @@ -134,8 +128,6 @@ void kernel_main(uint32_t initial_stack) // install floppy interrupt handler int_install_ir(38, 0b10001110, 0x08,&int_floppy_handler); - // install test software interrupt handler - int_install_ir(88, 0b10001110, 0x08,&int_unhandled); // exceptions int_install_ir(0, 0b10001110, 0x08,&int_irq0); @@ -167,14 +159,14 @@ void kernel_main(uint32_t initial_stack) pci_init(); // floppy - floppy_init(); - + floppy_init(); //init shell shell_init(); // multitasking task_init(); + /* log(FOOLOS_MODULE_NAME,FOOLOS_LOG_INFO,"test mem"); diff --git a/kernel/task.c b/kernel/task.c index 8884079..df9367d 100644 --- a/kernel/task.c +++ b/kernel/task.c @@ -9,14 +9,14 @@ int started; void task_test1() { - uint8_t c1; + uint16_t c1; while(1) { c1++; asm("cli"); - PutString("task1: %03d", 0,560,0xffffff, c1); + PutString("task1: %03d", 0,560,0xffffff, c1/100); asm("sti"); } @@ -25,13 +25,13 @@ void task_test1() void task_test2() { - uint8_t c2; + uint16_t c2; while(1) { c2++; asm("cli"); - PutString("task2: %03d", 0,580,0xffffff, c2); + PutString("task2: %03d", 0,580,0xffffff, c2/100); asm("sti"); } @@ -105,7 +105,7 @@ uint32_t task_switch_next(uint32_t oldesp) } uint32_t esp=0; - log(FOOLOS_MODULE_NAME,FOOLOS_LOG_INFO,"oldesp: 0x%08X saved / next task: %d (esp: 0x%08X) ",oldesp, CurrentTask,Threads[CurrentTask].esp0); + log(FOOLOS_MODULE_NAME,FOOLOS_LOG_FINE,"oldesp: 0x%08X saved / next task: %d (esp: 0x%08X) ",oldesp, CurrentTask,Threads[CurrentTask].esp0); return Threads[CurrentTask].esp0; //Return new stack pointer to ASM } @@ -123,10 +123,10 @@ void stack_trace(uint32_t *stack,int size) void task_init() { - started=0xabcde; log(FOOLOS_MODULE_NAME,FOOLOS_LOG_INFO,"init multitasking."); task_create(0,task_test1); task_create(1,task_test2); + started=0xabcde; } |