@@ -155,9 +155,7 @@ void *Memory::PageFault(struct modeswitch_registers *r) { Akari->console->putInt(faultingAddress, 16); Akari->console->putChar('\n'); - while (1) - __asm__ __volatile__("hlt"); - + // Return 0, which tells the interrupt handler to kill this process. return 0; } Memory.cpp @@ -80,11 +80,14 @@ static void AkariEntryCont() { // Shell Tasks::Task *shell = Tasks::Task::CreateTask((u32)&ShellProcess, 3, true, 0, Akari->memory->_kernelDirectory); kbdriver->next = shell; + Tasks::Task *anoshell = Tasks::Task::CreateTask((u32)&ShellProcess, 3, true, 0, Akari->memory->_kernelDirectory); + shell->next = anoshell; // Now we need our own directory! BootstrapTask should've been nice enough to make us one anyway. Akari->memory->switchPageDirectory(base->pageDir); Tasks::SwitchRing(3, 0); // switches to ring 3, uses IOPL 0 (no I/O access unless iomap gives it) and enables interrupts. + syscall_exit(); // We have a proper (kernel-mode) idle task we spawn above that hlts, so we // can exit, with an exit syscall. We can't actually call syscall_exit(), since entry.cpp @@ -3,6 +3,7 @@ #include <Console.hpp> #include <Descriptor.hpp> #include <debug.hpp> +#include <Tasks.hpp> static const char *isr_messages[] = { "Division by zero", @@ -51,10 +52,26 @@ void *isr_handler(struct modeswitch_registers *r) { Akari->console->putInt(r->callback.eflags, 16); Akari->console->putString(", user ESP (may be garbage): "); Akari->console->putInt(r->useresp, 16); - Akari->console->putString("\n"); + Akari->console->putString("\nProcess killed.\n"); - while (1) - __asm__ __volatile__("hlt"); + // TODO OMG: refactor this code! It's terrible! Half-copied from + // UserCalls.cpp and the surrounding architecture to skip a killed + // task in Syscalls. These can be unified, now. + + Tasks::Task *nextTask = Akari->tasks->getNextTask(); + + Tasks::Task **scanner = &Akari->tasks->start; + while (*scanner != Akari->tasks->current) { + scanner = &(*scanner)->next; + } + *scanner = (*scanner)->next; + + Akari->tasks->current = nextTask; + return Akari->tasks->assignInternalTask(Akari->tasks->current); + + + // while (1) + // __asm__ __volatile__("hlt"); } return resume; interrupts.cpp bcbdb966b5661b30c226ec39ee6d5b0f450ebf6f Arlen Cuss celtic@sairyx.org http://github.com/celtic/akari/commit/0ba778b89f10e90fb7b8f22b7930aaeaf772cdc5 0ba778b89f10e90fb7b8f22b7930aaeaf772cdc5 2009-10-10T20:39:21-07:00 2009-10-10T20:39:21-07:00 Duplicate shells, adding a syscall_exit to the entry since I know it'll fail, and letting the pagefault handler drop back to the interrupt handler so the process gets killed. 62279b733cdf6f39061bcbfb36b725e65f418a37 Arlen Cuss celtic@sairyx.org