From 6a6f4fdb0cce6558bac6b30ce312555bb48a2c0a Mon Sep 17 00:00:00 2001 From: John Hodge Date: Wed, 12 Oct 2011 12:37:55 +0800 Subject: [PATCH] Kernel/armv7 - Threading work - Fixed WFI being executed while tasks are waiting - Starting work on Proc_Clone --- Kernel/arch/armv7/proc.c | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/Kernel/arch/armv7/proc.c b/Kernel/arch/armv7/proc.c index 318cabda..146899c1 100644 --- a/Kernel/arch/armv7/proc.c +++ b/Kernel/arch/armv7/proc.c @@ -13,6 +13,7 @@ extern tThread gThreadZero; extern void SwitchTask(Uint32 NewSP, Uint32 *OldSP, Uint32 NewIP, Uint32 *OldIP, Uint32 MemPtr); extern void KernelThreadHeader(void); // Actually takes args on stack +extern void Proc_CloneInt(Uint32 *SP, Uint32 *MemPtr); extern tVAddr MM_NewKStack(int bGlobal); // TODO: Move out into a header // === PROTOTYPES === @@ -33,8 +34,8 @@ void Proc_IdleThread(void *unused) Threads_SetPriority(gpIdleThread, -1); Threads_SetName("Idle Thread"); for(;;) { - __asm__ __volatile__ ("wfi"); Proc_Reschedule(); + __asm__ __volatile__ ("wfi"); } } @@ -56,13 +57,22 @@ tThread *Proc_GetCurThread(void) return gpCurrentThread; } -tTID Proc_Clone(Uint Flags) +void Proc_StartUser(Uint Entrypoint, Uint *Bases, int ArgC, char **ArgV, char **EnvP, int DataSize) { - return -1; + Log_Debug("Proc", "Proc_StartUser: (Entrypoint=%p, Bases=%p, ArgC=%i, ...)", + Entrypoint, Bases, ArgC); } -void Proc_StartUser(Uint Entrypoint, Uint *Bases, int ArgC, char **ArgV, char **EnvP, int DataSize) +tTID Proc_Clone(Uint Flags) { + tThread *new; + + new = Threads_CloneTCB(Flags); + if(!new) return -1; + + Log_Error("Proc", "TODO: Implement Proc_Clone"); + + return -1; } tTID Proc_SpawnWorker( void (*Fnc)(void*), void *Ptr ) @@ -70,7 +80,7 @@ tTID Proc_SpawnWorker( void (*Fnc)(void*), void *Ptr ) tThread *new; Uint32 sp; - new = Threads_CloneTCB(NULL, 0); + new = Threads_CloneThreadZero(); if(!new) return -1; new->KernelStack = MM_NewKStack(1); @@ -100,7 +110,7 @@ tTID Proc_NewKThread( void (*Fnc)(void*), void *Ptr ) tThread *new; Uint32 sp; - new = Threads_CloneTCB(NULL, 0); + new = Threads_CloneTCB(0); if(!new) return -1; // TODO: Non-shared stack -- 2.20.1