Misc fiddling to ARMv7 for trimslice builds

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

diff --git a/Kernel/arch/armv7/proc.c b/Kernel/arch/armv7/proc.c
index 605b156..b5a867c 100644 (file)
--- a/Kernel/arch/armv7/proc.c
+++ b/Kernel/arch/armv7/proc.c
@@ -13,7 +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_int_DropToUser(Uint32 IP, Uint32 SP) NORETURN;
+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
@@ -68,8 +68,8 @@ void Proc_StartUser(Uint Entrypoint, Uint Base, int ArgC, char **ArgV, int DataS
        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);
+//     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();
@@ -79,12 +79,10 @@ void Proc_StartUser(Uint Entrypoint, Uint Base, int ArgC, char **ArgV, int DataS
 
        // Adjust user's copy of the arguments
        delta = (tVAddr)usr_sp -  (tVAddr)ArgV;
-       Log("delta = %x", delta);
        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;
-       Log("envp = %p", envp);
        
        *--usr_sp = (Uint32)envp;
        *--usr_sp = (Uint32)ArgV;
@@ -93,12 +91,12 @@ void Proc_StartUser(Uint Entrypoint, Uint Base, int ArgC, char **ArgV, int DataS
        
        // Drop to user code
        Log_Debug("Proc", "Proc_int_DropToUser(%p, %p)", Entrypoint, usr_sp);
+       Proc_int_DropToUser(Entrypoint, (Uint32)usr_sp);
+}
 
-       // Needed to get around relocation truncation
-       {
-               void    (*drop)(Uint32, Uint32) NORETURN = Proc_int_DropToUser;
-               drop(Entrypoint, (Uint32)usr_sp);
-       }
+void Proc_ClearThread(tThread *Thread)
+{
+       Log_Warning("Proc", "TODO: Nuke address space etc");
 }
 
 tTID Proc_Clone(Uint Flags)