X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Kernel%2Farch%2Fx86_64%2Fproc.c;h=ce6ebbdec394302f3bf564104f48c37cb73097cc;hb=dc42c3998b01e66a609fed5d503a81a972e636d6;hp=497139597358677adb2655289601a3d2c6c61250;hpb=a12f34dd45f08acd22664db795423a238ca6e569;p=tpg%2Facess2.git diff --git a/Kernel/arch/x86_64/proc.c b/Kernel/arch/x86_64/proc.c index 49713959..ce6ebbde 100644 --- a/Kernel/arch/x86_64/proc.c +++ b/Kernel/arch/x86_64/proc.c @@ -48,7 +48,7 @@ extern int giTotalTickets; extern int giNumActiveThreads; extern tThread gThreadZero; extern void Threads_Dump(void); -extern void Proc_ReturnToUser(void); +extern void Proc_ReturnToUser(tVAddr Handler, tVAddr KStackTop, int Argument); extern void Time_UpdateTimestamp(void); extern void SwitchTasks(Uint NewSP, Uint *OldSP, Uint NewIP, Uint *OldIO, Uint CR3); @@ -364,7 +364,10 @@ void Proc_IdleTask(void *ptr) cpu->IdleThread->ThreadName = (char*)"Idle Thread"; Threads_SetPriority( cpu->IdleThread, -1 ); // Never called randomly cpu->IdleThread->Quantum = 1; // 1 slice quantum - for(;;) HALT(); // Just yeilds + for(;;) { + HALT(); // Just yeilds + Threads_Yield(); + } } /** @@ -410,7 +413,7 @@ void Proc_Start(void) __asm__ __volatile__("sti"); #endif MM_FinishVirtualInit(); - Log("Multithreading started"); + Log_Log("Proc", "Multithreading started"); } /** @@ -426,13 +429,16 @@ tThread *Proc_GetCurThread(void) #endif } +/** + * \brief Create a new kernel thread + */ int Proc_NewKThread(void (*Fcn)(void*), void *Data) { Uint rsp; tThread *newThread, *cur; cur = Proc_GetCurThread(); - newThread = Threads_CloneTCB(NULL, 0); + newThread = Threads_CloneTCB(0); if(!newThread) return -1; // Set CR3 @@ -454,7 +460,7 @@ int Proc_NewKThread(void (*Fcn)(void*), void *Data) newThread->SavedState.RSP = rsp; newThread->SavedState.RIP = (Uint)&NewTaskHeader; - Log("New (KThread) %p, rsp = %p\n", newThread->SavedState.RIP, newThread->SavedState.RSP); +// Log("New (KThread) %p, rsp = %p\n", newThread->SavedState.RIP, newThread->SavedState.RSP); // MAGIC_BREAK(); Threads_AddActive(newThread); @@ -478,26 +484,24 @@ int Proc_Clone(Uint Flags) } // Create new TCB - newThread = Threads_CloneTCB(NULL, Flags); + newThread = Threads_CloneTCB(Flags); if(!newThread) return -1; // Save core machine state rip = Proc_CloneInt(&newThread->SavedState.RSP, &newThread->MemState.CR3); - if(rip == 0) { - outb(0x20, 0x20); // ACK Timer and return as child - __asm__ __volatile__ ("sti"); - return 0; - } + if(rip == 0) return 0; // Child newThread->KernelStack = cur->KernelStack; newThread->SavedState.RIP = rip; - // DEBUG + // DEBUG + #if 0 Log("New (Clone) %p, rsp = %p, cr3 = %p", rip, newThread->SavedState.RSP, newThread->MemState.CR3); { Uint cr3; __asm__ __volatile__ ("mov %%cr3, %0" : "=r" (cr3)); Log("Current CR3 = 0x%x, PADDR(RSP) = 0x%x", cr3, MM_GetPhysAddr(newThread->SavedState.RSP)); } + #endif // /DEBUG // Lock list and add to active @@ -540,7 +544,7 @@ int Proc_SpawnWorker(void (*Fcn)(void*), void *Data) new->SavedState.RSP = new->KernelStack - sizeof(stack_contents); new->SavedState.RIP = (Uint)&NewTaskHeader; - Log("New (Worker) %p, rsp = %p\n", new->SavedState.RIP, new->SavedState.RSP); +// Log("New (Worker) %p, rsp = %p\n", new->SavedState.RIP, new->SavedState.RSP); // Mark as active new->Status = THREAD_STAT_PREINIT; @@ -550,7 +554,6 @@ int Proc_SpawnWorker(void (*Fcn)(void*), void *Data) } /** - * \fn Uint Proc_MakeUserStack(void) * \brief Creates a new user stack */ Uint Proc_MakeUserStack(void) @@ -560,15 +563,22 @@ Uint Proc_MakeUserStack(void) // Check Prospective Space for( i = USER_STACK_SZ >> 12; i--; ) + { if( MM_GetPhysAddr( base + (i<<12) ) != 0 ) break; + } if(i != -1) return 0; // Allocate Stack - Allocate incrementally to clean up MM_Dump output - for( i = 0; i < USER_STACK_SZ/0x1000; i++ ) + for( i = 0; i < (USER_STACK_SZ-USER_STACK_PREALLOC)/0x1000; i++ ) { - if( !MM_Allocate( base + (i<<12) ) ) + MM_AllocateZero( base + (i<<12) ); + } + for( ; i < USER_STACK_SZ/0x1000; i++ ) + { + tPAddr alloc = MM_Allocate( base + (i<<12) ); + if( !alloc ) { // Error Log_Error("Proc", "Unable to allocate user stack (%i pages requested)", USER_STACK_SZ/0x1000); @@ -628,8 +638,8 @@ void Proc_StartProcess(Uint16 SS, Uint Stack, Uint Flags, Uint16 CS, Uint IP) CS, SS); Threads_Exit(0, -1); } - Log("Proc_StartProcess: (SS=%x, Stack=%p, Flags=%x, CS=%x, IP=%p)", - SS, Stack, Flags, CS, IP); +// Log("Proc_StartProcess: (SS=%x, Stack=%p, Flags=%x, CS=%x, IP=%p)", SS, Stack, Flags, CS, IP); +// MM_DumpTables(0, USER_MAX); if(CS == 0x1B) { // 32-bit return @@ -688,9 +698,8 @@ int Proc_Demote(Uint *Err, int Dest, tRegs *Regs) */ void Proc_CallFaultHandler(tThread *Thread) { - // Rewinds the stack and calls the user function // Never returns - __asm__ __volatile__ ("mov %0, %%rbp;\n\tcall Proc_ReturnToUser" :: "r"(Thread->FaultHandler)); + Proc_ReturnToUser(Thread->FaultHandler, Thread->KernelStack, Thread->CurFaultNum); for(;;); } @@ -718,17 +727,19 @@ void Proc_Reschedule(void) return ; #if DEBUG_TRACE_SWITCH - LogF("\nSwitching to task %i, CR3 = 0x%x, RIP = %p, RSP = %p\n", - nextthread->TID, + LogF("\nSwitching to task CR3 = 0x%x, RIP = %p, RSP = %p - %i (%s)\n", nextthread->MemState.CR3, nextthread->SavedState.RIP, - nextthread->SavedState.RSP + nextthread->SavedState.RSP, + nextthread->TID, + nextthread->ThreadName ); #endif // Update CPU state gaCPUs[cpu].Current = nextthread; gTSSs[cpu].RSP0 = nextthread->KernelStack-4; + __asm__ __volatile__ ("mov %0, %%db0" : : "r" (nextthread)); SwitchTasks( nextthread->SavedState.RSP, &curthread->SavedState.RSP, @@ -744,11 +755,10 @@ void Proc_Reschedule(void) */ void Proc_Scheduler(int CPU, Uint RSP, Uint RIP) { +#if 0 + { tThread *thread; - if( CPU == 0 ) - Time_UpdateTimestamp(); - // If the spinlock is set, let it complete if(IS_LOCKED(&glThreadListLock)) return; @@ -774,6 +784,8 @@ void Proc_Scheduler(int CPU, Uint RSP, Uint RIP) // ACK Timer here? Proc_Reschedule(); + } +#endif } // === EXPORTS ===