X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Kernel%2Farch%2Fx86_64%2Fproc.c;h=934bee90784e9b57c57f917fffdd7c77cf63c7cf;hb=fae7520daf355d4646ba73c46a2e701e5ef4e9f5;hp=038cc6129b2fe96eadf8b8ea0f3625887c12b78e;hpb=9f407c493c33928e0f19b834699d9694036ca42e;p=tpg%2Facess2.git diff --git a/Kernel/arch/x86_64/proc.c b/Kernel/arch/x86_64/proc.c index 038cc612..934bee90 100644 --- a/Kernel/arch/x86_64/proc.c +++ b/Kernel/arch/x86_64/proc.c @@ -1,5 +1,5 @@ /* - * AcessOS Microkernel Version + * Acess2 x86_64 port * proc.c */ #include @@ -22,8 +22,8 @@ // === IMPORTS === extern tGDT gGDT[]; -extern void APStartup(); // 16-bit AP startup code -extern Uint GetRIP(); // start.asm +extern void APStartup(void); // 16-bit AP startup code +extern Uint GetRIP(void); // start.asm extern Uint64 gInitialPML4[512]; // start.asm extern void gInitialKernelStack; extern tSpinlock glThreadListLock; @@ -36,23 +36,24 @@ extern tThread *gActiveThreads; extern tThread *gSleepingThreads; extern tThread *gDeleteThreads; extern tThread *Threads_GetNextToRun(int CPU); -extern void Threads_Dump(); +extern void Threads_Dump(void); extern tThread *Threads_CloneTCB(Uint *Err, Uint Flags); -extern void Proc_ReturnToUser(); +extern void Proc_ReturnToUser(void); +extern void GetCPUNum(void); // === PROTOTYPES === -void ArchThreads_Init(); +void ArchThreads_Init(void); #if USE_MP void MP_StartAP(int CPU); void MP_SendIPI(Uint8 APICID, int Vector, int DeliveryMode); #endif -void Proc_Start(); -tThread *Proc_GetCurThread(); -void Proc_ChangeStack(); +void Proc_Start(void); +tThread *Proc_GetCurThread(void); +void Proc_ChangeStack(void); int Proc_Clone(Uint *Err, Uint Flags); void Proc_StartProcess(Uint16 SS, Uint Stack, Uint Flags, Uint16 CS, Uint IP); void Proc_CallFaultHandler(tThread *Thread); -void Proc_Scheduler(); +void Proc_Scheduler(int CPU); // === GLOBALS === // --- Multiprocessing --- @@ -72,10 +73,10 @@ Uint32 gaDoubleFaultStack[1024]; // === CODE === /** - * \fn void ArchThreads_Init() + * \fn void ArchThreads_Init(void) * \brief Starts the process scheduler */ -void ArchThreads_Init() +void ArchThreads_Init(void) { Uint pos = 0; @@ -269,15 +270,16 @@ void ArchThreads_Init() pos = 0; #endif gTSSs[pos].RSP0 = 0; // Set properly by scheduler - gGDT[6+pos*2].BaseLow = ((Uint)(&gTSSs[pos])) & 0xFFFF; - gGDT[6+pos*2].BaseMid = ((Uint)(&gTSSs[pos])) >> 16; - gGDT[6+pos*2].BaseHi = ((Uint)(&gTSSs[pos])) >> 24; - gGDT[6+pos*2+1].DWord[0] = ((Uint)(&gTSSs[pos])) >> 32; + gGDT[7+pos*2].LimitLow = sizeof(tTSS) & 0xFFFF; + gGDT[7+pos*2].BaseLow = ((Uint)(&gTSSs[pos])) & 0xFFFF; + gGDT[7+pos*2].BaseMid = ((Uint)(&gTSSs[pos])) >> 16; + gGDT[7+pos*2].BaseHi = ((Uint)(&gTSSs[pos])) >> 24; + gGDT[7+pos*2+1].DWord[0] = ((Uint)(&gTSSs[pos])) >> 32; #if USE_MP } for(pos=0;posID.Val&0xFF] ].Current; + return gaCPUs[ GetCPUNum() ].Current; #else return gCurrentThread; #endif } /** - * \fn void Proc_ChangeStack() + * \fn void Proc_ChangeStack(void) * \brief Swaps the current stack for a new one (in the proper stack reigon) */ -void Proc_ChangeStack() +void Proc_ChangeStack(void) { Uint rsp, rbp; Uint tmp_rbp, old_rsp; @@ -378,11 +380,11 @@ void Proc_ChangeStack() curBase = (Uint)&gInitialKernelStack; - LOG("curBase = 0x%x, newBase = 0x%x", curBase, newBase); + Log("curBase = 0x%x, newBase = 0x%x", curBase, newBase); // Get ESP as a used size rsp = curBase - rsp; - LOG("memcpy( %p, %p, 0x%x )", (void*)(newBase - rsp), (void*)(curBase - rsp), rsp ); + Log("memcpy( %p, %p, 0x%x )", (void*)(newBase - rsp), (void*)(curBase - rsp), rsp ); // Copy used stack memcpy( (void*)(newBase - rsp), (void*)(curBase - rsp), rsp ); // Get ESP as an offset in the new stack @@ -390,16 +392,17 @@ void Proc_ChangeStack() // Adjust EBP rbp = newBase - (curBase - rbp); + Log("Update stack"); // Repair EBPs & Stack Addresses // Catches arguments also, but may trash stack-address-like values - for(tmp_rbp = rsp; tmp_rbp < newBase; tmp_rbp += 4) + for(tmp_rbp = rsp; tmp_rbp < newBase; tmp_rbp += sizeof(Uint)) { if(old_rsp < *(Uint*)tmp_rbp && *(Uint*)tmp_rbp < curBase) *(Uint*)tmp_rbp += newBase - curBase; } + Log("Applying Changes"); Proc_GetCurThread()->KernelStack = newBase; - __asm__ __volatile__ ("mov %0, %%rsp"::"r"(rsp)); __asm__ __volatile__ ("mov %0, %%rbp"::"r"(rbp)); } @@ -420,8 +423,11 @@ int Proc_Clone(Uint *Err, Uint Flags) newThread = Threads_CloneTCB(Err, Flags); if(!newThread) return -1; + Log("Proc_Clone: newThread = %p", newThread); + // Initialise Memory Space (New Addr space or kernel stack) if(Flags & CLONE_VM) { + Log("Proc_Clone: Cloning VM"); newThread->MemState.CR3 = MM_Clone(); newThread->KernelStack = cur->KernelStack; } else { @@ -432,6 +438,7 @@ int Proc_Clone(Uint *Err, Uint Flags) // Create new KStack newThread->KernelStack = MM_NewKStack(); + Log("Proc_Clone: newKStack = %p", newThread->KernelStack); // Check for errors if(newThread->KernelStack == 0) { free(newThread); @@ -453,7 +460,7 @@ int Proc_Clone(Uint *Err, Uint Flags) // Repair EBPs & Stack Addresses // Catches arguments also, but may trash stack-address-like values - for(tmp_rbp = rsp; tmp_rbp < newThread->KernelStack; tmp_rbp += 4) + for(tmp_rbp = rsp; tmp_rbp < newThread->KernelStack; tmp_rbp += sizeof(Uint)) { if(old_rsp < *(Uint*)tmp_rbp && *(Uint*)tmp_rbp < cur->KernelStack) *(Uint*)tmp_rbp += newThread->KernelStack - cur->KernelStack; @@ -479,10 +486,10 @@ int Proc_Clone(Uint *Err, Uint Flags) } /** - * \fn int Proc_SpawnWorker() + * \fn int Proc_SpawnWorker(void) * \brief Spawns a new worker thread */ -int Proc_SpawnWorker() +int Proc_SpawnWorker(void) { tThread *new, *cur; Uint rip, rsp, rbp; @@ -527,10 +534,10 @@ int Proc_SpawnWorker() } /** - * \fn Uint Proc_MakeUserStack() + * \fn Uint Proc_MakeUserStack(void) * \brief Creates a new user stack */ -Uint Proc_MakeUserStack() +Uint Proc_MakeUserStack(void) { int i; Uint base = USER_STACK_TOP - USER_STACK_SZ; @@ -624,7 +631,7 @@ void Proc_StartProcess(Uint16 SS, Uint Stack, Uint Flags, Uint16 CS, Uint IP) */ int Proc_Demote(Uint *Err, int Dest, tRegs *Regs) { - int cpl = Regs->cs & 3; + int cpl = Regs->CS & 3; // Sanity Check if(Dest > 3 || Dest < 0) { *Err = -EINVAL; @@ -638,8 +645,8 @@ int Proc_Demote(Uint *Err, int Dest, tRegs *Regs) } // Change the Segment Registers - Regs->cs = (((Dest+1)<<4) | Dest) - 8; - Regs->ss = ((Dest+1)<<4) | Dest; + Regs->CS = (((Dest+1)<<4) | Dest) - 8; + Regs->SS = ((Dest+1)<<4) | Dest; return 0; }