@@ -108,12 +108,18 @@ void Tasks::saveRegisterToTask(Task *dest, void *regs) { // internal consistency. ASSERT(((((struct modeswitch_registers *)regs)->callback.cs - 0x08) / 0x11) == dest->cpl); - if (!dest->cpl > 0) { + if (dest->cpl == 0) { // update the tip of stack pointer so we can restore later + // Akari->console->putString("ks saved as 0x"); + // Akari->console->putInt((u32)regs, 16); + // Akari->console->putString("\n"); dest->ks = (u32)regs; } else { // update utks pointer dest->utks = (u32)regs; + // Akari->console->putString("utks saved as 0x"); + // Akari->console->putInt((u32)regs, 16); + // Akari->console->putString("\n"); } } @@ -152,7 +158,7 @@ void *Tasks::assignInternalTask(Task *task) { task->userCall = 0; } - return (void *)((!task->cpl > 0) ? task->ks : task->utks); + return (void *)((task->cpl == 0) ? task->ks : task->utks); } Tasks::Task *Tasks::Task::BootstrapInitialTask(u8 cpl, Memory::PageDirectory *pageDirBase) { @@ -177,17 +183,37 @@ Tasks::Task *Tasks::Task::BootstrapInitialTask(u8 cpl, Memory::PageDirectory *pa Tasks::Task *Tasks::Task::CreateTask(u32 entry, u8 cpl, bool interruptFlag, u8 iopl, Memory::PageDirectory *pageDirBase) { Task *nt = new Task(cpl); - nt->ks = (u32)Akari->memory->allocAligned(USER_TASK_STACK_SIZE) + USER_TASK_STACK_SIZE; + + nt->pageDir = pageDirBase->clone(); struct modeswitch_registers *regs = 0; if (cpl > 0) { + // Allocate the user's stack to top out at USER_TASK_BASE (i.e. it goes below that). + // We need to do the frame allocs ourselves so they're visible and writable by the user. + // We also save nt->ks as the top of the first frame (physically). + for (u32 i = 0, page = USER_TASK_BASE - 0x1000; i < USER_TASK_STACK_SIZE; i += 0x1000, page -= 0x1000) { + Memory::Page *ksp = nt->pageDir->getPage(page, true); + ksp->allocAnyFrame(false, true); + /** + * This appears to be completely unneeded. + if (i == 0) { + nt->ks = ksp->pageAddress * 0x1000 + 0x1000; + } + */ + } + + Akari->console->putString("alloced nt->ks at 0x"); + Akari->console->putInt(nt->ks, 16); + Akari->console->putString("\n"); + nt->utks = (u32)Akari->memory->allocAligned(USER_TASK_KERNEL_STACK_SIZE) + USER_TASK_KERNEL_STACK_SIZE - sizeof(struct modeswitch_registers); regs = (struct modeswitch_registers *)(nt->utks); - regs->useresp = nt->ks; + regs->useresp = USER_TASK_BASE; regs->ss = 0x10 + (cpl * 0x11); // same as ds: ss is set by TSS, ds is manually set by irq_timer_multitask after } else { + nt->ks = (u32)Akari->memory->allocAligned(USER_TASK_STACK_SIZE) + USER_TASK_STACK_SIZE; nt->ks -= sizeof(struct callback_registers); regs = (struct modeswitch_registers *)(nt->ks); } @@ -202,8 +228,6 @@ Tasks::Task *Tasks::Task::CreateTask(u32 entry, u8 cpl, bool interruptFlag, u8 i regs->callback.eip = entry; regs->callback.cs = 0x08 + (cpl * 0x11); // note the low 2 bits are the CPL regs->callback.eflags = (interruptFlag ? 0x200 : 0x0) | (iopl << 12); - - nt->pageDir = pageDirBase->clone(); #define _PROCESS_HEAP_START 0x0500000 #define _PROCESS_HEAP_SIZE 0x500000 // 5MiB Tasks.cpp @@ -64,7 +64,7 @@ void KeyboardProcess() { // 128-bit=16 bytes bitfield u8 held_scancodes[16]; - bool echo_mode = true; + bool echo_mode = false; bool capslock_down = false, numlock_down = false, scrolllock_down = false; bool pressed_ctrl = false, pressed_alt = false, pressed_shift = false; TmpKb.cpp @@ -1,12 +1,11 @@ #include <UserGates.hpp> -static u32 stdin; -static char *getline() { +static char *getline(u32 in) { u32 cs = 8, n = 0; char *kbbuf = (char *)syscall_malloc(cs); while (true) { - u32 incoming = syscall_readNode("system.io.keyboard", "input", stdin, kbbuf + n, 1); + u32 incoming = syscall_readNode("system.io.keyboard", "input", in, kbbuf + n, 1); syscall_putc(kbbuf[n]); if (kbbuf[n] == '\n') break; @@ -27,7 +26,7 @@ static char *getline() { void ShellProcess() { - stdin = (u32)-1; + u32 stdin = (u32)-1; while (stdin == (u32)-1) { stdin = syscall_obtainNodeListener("system.io.keyboard", "input"); } @@ -37,7 +36,7 @@ void ShellProcess() { syscall_puts(".\n"); while (true) { - char *l = getline(); + char *l = getline(stdin); syscall_puts("got line (0x"); syscall_putl((u32)l, 16); syscall_puts("): "); TmpShell.cpp @@ -79,7 +79,7 @@ static void AkariEntryCont() { // Shell Tasks::Task *shell = Tasks::Task::CreateTask((u32)&ShellProcess, 3, true, 0, Akari->memory->_kernelDirectory); - // kbdriver->next = shell; + kbdriver->next = shell; // Now we need our own directory! BootstrapTask should've been nice enough to make us one anyway. Akari->memory->switchPageDirectory(base->pageDir); entry.cpp @@ -13,7 +13,9 @@ // user task kernel stack is used for state when it's // pre-empted, and for system calls, etc. #define USER_TASK_KERNEL_STACK_SIZE 0x2000 -#define USER_TASK_STACK_SIZE 0x4000 +#define USER_TASK_STACK_SIZE 0x4000 + +#define USER_TASK_BASE 0x50000000 class Tasks : public Subsystem { public: inc/Tasks.hpp 11719f787287dfdbc5d92e809197e637dfc676e1 Arlen Cuss celtic@sairyx.org http://github.com/celtic/akari/commit/52bbd2396e3dd09c295bcb39878e1a6c27b04c22 52bbd2396e3dd09c295bcb39878e1a6c27b04c22 2009-10-10T20:28:37-07:00 2009-10-10T20:28:37-07:00 We have a defined user stack now, which is important. Starting to resolve some confusing/ambiguous lines (like "!a > 0"), and realising that the ks/utks distinction may be completely gone/pointless now. bf67d0fd57eff0353501f4653434a6f2aa90aee5 Arlen Cuss celtic@sairyx.org