Merge branch 'master' of git://git.ucc.asn.au/tpg/acess2

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

diff --git a/Kernel/arch/armv7/proc.c b/Kernel/arch/armv7/proc.c
index 146899c..cd998f2 100644 (file)
--- a/Kernel/arch/armv7/proc.c
+++ b/Kernel/arch/armv7/proc.c
@@ -11,14 +11,18 @@
 
 // === IMPORTS ===
 extern tThread gThreadZero;
+extern tProcess        gProcessZero;
 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 void    Proc_int_DropToUser(Uint32 IP, Uint32 SP) NORETURN __attribute__((long_call));
+extern Uint32  Proc_int_SwapUserSP(Uint32 NewSP);
+extern Uint32  Proc_CloneInt(Uint32 *SP, Uint32 *MemPtr);
 extern tVAddr  MM_NewKStack(int bGlobal);      // TODO: Move out into a header
+extern tVAddr  MM_NewUserStack(void);
+extern char    kernel_table0[];
 
 // === PROTOTYPES ===
 void   Proc_IdleThread(void *unused);
-tTID   Proc_NewKThread(void (*Fnc)(void*), void *Ptr);
 
 // === GLOBALS ===
 tThread        *gpCurrentThread = &gThreadZero;
@@ -27,12 +31,12 @@ tThread *gpIdleThread = NULL;
 // === CODE ===
 void ArchThreads_Init(void)
 {
+       gProcessZero.MemState.Base = (tPAddr)&kernel_table0 - KERNEL_BASE;
 }
 
 void Proc_IdleThread(void *unused)
 {
        Threads_SetPriority(gpIdleThread, -1);
-       Threads_SetName("Idle Thread");
        for(;;) {
                Proc_Reschedule();
                __asm__ __volatile__ ("wfi");
@@ -45,6 +49,7 @@ void Proc_Start(void)
 
        tid = Proc_NewKThread( Proc_IdleThread, NULL );
        gpIdleThread = Threads_GetThread(tid);
+       gpIdleThread->ThreadName = (char*)"Idle Thread";
 }
 
 int GetCPUNum(void)
@@ -57,31 +62,83 @@ tThread *Proc_GetCurThread(void)
        return gpCurrentThread;
 }
 
-void Proc_StartUser(Uint Entrypoint, Uint *Bases, int ArgC, char **ArgV, char **EnvP, int DataSize)
+void Proc_StartUser(Uint Entrypoint, Uint Base, int ArgC, const char **ArgV, int DataSize)
+{
+       Uint32  *usr_sp;
+        int    i;
+       const char      **envp;
+       tVAddr  delta;
+
+//     Log_Debug("Proc", "Proc_StartUser: (Entrypoint=%p, Base=%p, ArgC=%i, ArgV=%p, DataSize=0x%x)",
+//             Entrypoint, Base, ArgC, ArgV, DataSize);
+
+       // Write data to the user's stack
+       usr_sp = (void*)MM_NewUserStack();
+       usr_sp -= (DataSize+3)/4;
+       memcpy(usr_sp, ArgV, DataSize);
+       free(ArgV);
+
+       // Adjust user's copy of the arguments
+       delta = (tVAddr)usr_sp -  (tVAddr)ArgV;
+       ArgV = (void*)usr_sp;
+       for(i = 0; ArgV[i]; i ++)       ArgV[i] += delta;
+       envp = &ArgV[i+1];
+       for(i = 0; envp[i]; i ++)       envp[i] += delta;
+       
+       *--usr_sp = (Uint32)envp;
+       *--usr_sp = (Uint32)ArgV;
+       *--usr_sp = (Uint32)ArgC;
+       *--usr_sp = Base;
+       
+       // Drop to user code
+       Log_Debug("Proc", "Proc_int_DropToUser(%p, %p)", Entrypoint, usr_sp);
+       Proc_int_DropToUser(Entrypoint, (Uint32)usr_sp);
+}
+
+void Proc_ClearProcess(tProcess *Process)
+{
+       Log_Warning("Proc", "TODO: Nuke address space etc");
+}
+
+void Proc_ClearThread(tThread *Thread)
 {
-       Log_Debug("Proc", "Proc_StartUser: (Entrypoint=%p, Bases=%p, ArgC=%i, ...)",
-               Entrypoint, Bases, ArgC);
 }
 
 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;
+       }
        
-       Log_Error("Proc", "TODO: Implement Proc_Clone");
-       
-       return -1;
+       new->SavedState.IP = pc;
+       new->SavedState.SP = sp;
+       new->SavedState.UserSP = Proc_int_SwapUserSP(0);
+       new->SavedState.UserIP = Proc_GetCurThread()->SavedState.UserIP;
+       new->Process->MemState.Base = mem;
+
+       Threads_AddActive(new);
+
+       return new->TID;
 }
 
-tTID Proc_SpawnWorker( void (*Fnc)(void*), void *Ptr )
+int Proc_SpawnWorker( void (*Fnc)(void*), void *Ptr )
 {
        tThread *new;
        Uint32  sp;
 
        new = Threads_CloneThreadZero();
        if(!new)        return -1;
+       if(new->ThreadName)     free(new->ThreadName);
+       new->ThreadName = NULL;
 
        new->KernelStack = MM_NewKStack(1);
        if(!new->KernelStack) {
@@ -93,7 +150,6 @@ tTID Proc_SpawnWorker( void (*Fnc)(void*), void *Ptr )
        sp = new->KernelStack;
        
        *(Uint32*)(sp -= 4) = (Uint)Ptr;
-       *(Uint32*)(sp -= 4) = 1;
        *(Uint32*)(sp -= 4) = (Uint)Fnc;
        *(Uint32*)(sp -= 4) = (Uint)new;
 
@@ -112,6 +168,8 @@ tTID Proc_NewKThread( void (*Fnc)(void*), void *Ptr )
 
        new = Threads_CloneTCB(0);
        if(!new)        return -1;
+       free(new->ThreadName);
+       new->ThreadName = NULL;
 
        // TODO: Non-shared stack
        new->KernelStack = MM_NewKStack(1);
@@ -124,7 +182,6 @@ tTID Proc_NewKThread( void (*Fnc)(void*), void *Ptr )
        sp = new->KernelStack;
        
        *(Uint32*)(sp -= 4) = (Uint)Ptr;
-       *(Uint32*)(sp -= 4) = 1;
        *(Uint32*)(sp -= 4) = (Uint)Fnc;
        *(Uint32*)(sp -= 4) = (Uint)new;
 
@@ -151,16 +208,22 @@ 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 UsrSP=%p",
+               next, next->TID, next->ThreadName,
+               next->SavedState.IP, next->SavedState.SP, next->Process->MemState.Base,
+               next->SavedState.UserSP
+               );
+
        Log("Requested by %p", __builtin_return_address(0));
        
        gpCurrentThread = next;
-       // TODO: Change kernel stack?
+
+       cur->SavedState.UserSP = Proc_int_SwapUserSP( next->SavedState.UserSP );
 
        SwitchTask(
                next->SavedState.SP, &cur->SavedState.SP,
                next->SavedState.IP, &cur->SavedState.IP,
-               next->MemState.Base
+               next->Process->MemState.Base
                );
        
 }