Kernel/armv7 - Threading work

[tpg/acess2.git] / Kernel / arch / armv7 / proc.c

diff --git a/Kernel/arch/armv7/proc.c b/Kernel/arch/armv7/proc.c
index f4025cc..146899c 100644 (file)
--- a/Kernel/arch/armv7/proc.c
+++ b/Kernel/arch/armv7/proc.c
@@ -2,7 +2,7 @@
  * Acess2
  * - By John Hodge (thePowersGang)
  *
- * arch/arm7/proc.
+ * arch/arm7/proc.c
  * - ARM7 Process Switching
  */
 #include <acess.h>
@@ -12,12 +12,13 @@
 // === IMPORTS ===
 extern tThread gThreadZero;
 extern void    SwitchTask(Uint32 NewSP, Uint32 *OldSP, Uint32 NewIP, Uint32 *OldIP, Uint32 MemPtr);
-extern void    KernelThreadHeader(void);       // Actually takes args
+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 ===
 void   Proc_IdleThread(void *unused);
-tTID   Proc_NewKThread( void (*Fnc)(void*), void *Ptr );
+tTID   Proc_NewKThread(void (*Fnc)(void*), void *Ptr);
 
 // === GLOBALS ===
 tThread        *gpCurrentThread = &gThreadZero;
@@ -30,8 +31,12 @@ void ArchThreads_Init(void)
 
 void Proc_IdleThread(void *unused)
 {
-       for(;;)
+       Threads_SetPriority(gpIdleThread, -1);
+       Threads_SetName("Idle Thread");
+       for(;;) {
                Proc_Reschedule();
+               __asm__ __volatile__ ("wfi");
+       }
 }
 
 void Proc_Start(void)
@@ -52,18 +57,52 @@ 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 )
 {
-       return -1;
+       tThread *new;
+       Uint32  sp;
+
+       new = Threads_CloneThreadZero();
+       if(!new)        return -1;
+
+       new->KernelStack = MM_NewKStack(1);
+       if(!new->KernelStack) {
+               // TODO: Delete thread
+               Log_Error("Proc", "Unable to allocate kernel stack");
+               return -1;
+       }       
+
+       sp = new->KernelStack;
+       
+       *(Uint32*)(sp -= 4) = (Uint)Ptr;
+       *(Uint32*)(sp -= 4) = 1;
+       *(Uint32*)(sp -= 4) = (Uint)Fnc;
+       *(Uint32*)(sp -= 4) = (Uint)new;
+
+       new->SavedState.SP = sp;
+       new->SavedState.IP = (Uint)KernelThreadHeader;
+
+       Threads_AddActive(new);
+
+       return new->TID;
 }
 
 tTID Proc_NewKThread( void (*Fnc)(void*), void *Ptr )
@@ -71,21 +110,23 @@ 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;
 
-       new->KernelStack = MM_NewKStack(0);
+       // TODO: Non-shared stack
+       new->KernelStack = MM_NewKStack(1);
        if(!new->KernelStack) {
                // TODO: Delete thread
+               Log_Error("Proc", "Unable to allocate kernel stack");
                return -1;
        }       
 
        sp = new->KernelStack;
        
-       *(Uint32*)(sp -= 4) = (Uint)new;
-       *(Uint32*)(sp -= 4) = (Uint)Fnc;
-       *(Uint32*)(sp -= 4) = 1;
        *(Uint32*)(sp -= 4) = (Uint)Ptr;
+       *(Uint32*)(sp -= 4) = 1;
+       *(Uint32*)(sp -= 4) = (Uint)Fnc;
+       *(Uint32*)(sp -= 4) = (Uint)new;
 
        new->SavedState.SP = sp;
        new->SavedState.IP = (Uint)KernelThreadHeader;
@@ -109,7 +150,13 @@ void Proc_Reschedule(void)
        next = Threads_GetNextToRun(0, cur);
        if(!next)       next = gpIdleThread;
        if(!next || next == cur)        return;
+
+       Log("Switching to %p (%i %s) IP=%p SP=%p", next, next->TID, next->ThreadName, next->SavedState.IP, next->SavedState.SP);
+       Log("Requested by %p", __builtin_return_address(0));
        
+       gpCurrentThread = next;
+       // TODO: Change kernel stack?
+
        SwitchTask(
                next->SavedState.SP, &cur->SavedState.SP,
                next->SavedState.IP, &cur->SavedState.IP,