Kernel/armv7 - Fixing bugs, Proc_Clone works now

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

diff --git a/Kernel/arch/armv7/proc.c b/Kernel/arch/armv7/proc.c
index 318cabd..e369648 100644 (file)
--- 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 Uint32  Proc_CloneInt(Uint32 *SP, Uint32 *MemPtr);
 extern tVAddr  MM_NewKStack(int bGlobal);      // TODO: Move out into a header
 
 // === PROTOTYPES ===
@@ -31,10 +32,9 @@ void ArchThreads_Init(void)
 void Proc_IdleThread(void *unused)
 {
        Threads_SetPriority(gpIdleThread, -1);
-       Threads_SetName("Idle Thread");
        for(;;) {
-               __asm__ __volatile__ ("wfi");
                Proc_Reschedule();
+               __asm__ __volatile__ ("wfi");
        }
 }
 
@@ -44,6 +44,7 @@ void Proc_Start(void)
 
        tid = Proc_NewKThread( Proc_IdleThread, NULL );
        gpIdleThread = Threads_GetThread(tid);
+       gpIdleThread->ThreadName = (char*)"Idle Thread";
 }
 
 int GetCPUNum(void)
@@ -56,13 +57,34 @@ 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;
+       Uint32  pc, sp, mem;
+
+       new = Threads_CloneTCB(Flags);
+       if(!new)        return -1;
+
+       // Actual clone magic
+       pc = Proc_CloneInt(&sp, &mem);
+       if(pc == 0) {
+               Log("Proc_Clone: In child");
+               return 0;
+       }
+       
+       new->SavedState.IP = pc;
+       new->SavedState.SP = sp;
+       new->MemState.Base = mem;
+
+       Threads_AddActive(new);
+
+       return new->TID;
 }
 
 tTID Proc_SpawnWorker( void (*Fnc)(void*), void *Ptr )
@@ -70,8 +92,10 @@ tTID Proc_SpawnWorker( void (*Fnc)(void*), void *Ptr )
        tThread *new;
        Uint32  sp;
 
-       new = Threads_CloneTCB(NULL, 0);
+       new = Threads_CloneThreadZero();
        if(!new)        return -1;
+       free(new->ThreadName);
+       new->ThreadName = NULL;
 
        new->KernelStack = MM_NewKStack(1);
        if(!new->KernelStack) {
@@ -100,8 +124,10 @@ 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;
+       free(new->ThreadName);
+       new->ThreadName = NULL;
 
        // TODO: Non-shared stack
        new->KernelStack = MM_NewKStack(1);
@@ -141,11 +167,13 @@ void Proc_Reschedule(void)
        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("Switching to %p (%i %s) IP=%p SP=%p TTBR0=%p",
+               next, next->TID, next->ThreadName,
+               next->SavedState.IP, next->SavedState.SP, next->MemState.Base
+               );
        Log("Requested by %p", __builtin_return_address(0));
        
        gpCurrentThread = next;
-       // TODO: Change kernel stack?
 
        SwitchTask(
                next->SavedState.SP, &cur->SavedState.SP,