Kernel/armv7 - Moved to asssembly 32-bit divide

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

diff --git a/Kernel/arch/x86_64/proc.c b/Kernel/arch/x86_64/proc.c
index 415901f..e3d7e90 100644 (file)
--- a/Kernel/arch/x86_64/proc.c
+++ b/Kernel/arch/x86_64/proc.c
@@ -429,13 +429,16 @@ tThread *Proc_GetCurThread(void)
        #endif
 }
 
+/**
+ * \brief Create a new kernel thread
+ */
 int Proc_NewKThread(void (*Fcn)(void*), void *Data)
 {
        Uint    rsp;
        tThread *newThread, *cur;
        
        cur = Proc_GetCurThread();
-       newThread = Threads_CloneTCB(NULL, 0);
+       newThread = Threads_CloneTCB(0);
        if(!newThread)  return -1;
        
        // Set CR3
@@ -481,7 +484,7 @@ int Proc_Clone(Uint Flags)
        }
 
        // Create new TCB
-       newThread = Threads_CloneTCB(NULL, Flags);
+       newThread = Threads_CloneTCB(Flags);
        if(!newThread)  return -1;
        
        // Save core machine state
@@ -589,41 +592,43 @@ Uint Proc_MakeUserStack(void)
 }
 
 
-/**
- * \fn void Proc_StartUser(Uint Entrypoint, Uint *Bases, int ArgC, char **ArgV, char **EnvP, int DataSize)
- * \brief Starts a user task
- */
-void Proc_StartUser(Uint Entrypoint, Uint *Bases, int ArgC, char **ArgV, char **EnvP, int DataSize)
+void Proc_StartUser(Uint Entrypoint, Uint Base, int ArgC, char **ArgV, int DataSize)
 {
-       Uint    *stack = (void*)Proc_MakeUserStack();
+       Uint    *stack;
+       char    **envp;
         int    i;
        Uint    delta;
        Uint16  ss, cs;
        
-       LOG("stack = 0x%x", stack);
        
        // Copy Arguments
-       stack = (void*)( (Uint)stack - DataSize );
+       stack = (void*)Proc_MakeUserStack();
+       if(!stack) {
+               Log_Error("Proc", "Unable to create user stack!");
+               Threads_Exit(0, -1);
+       }
+       stack -= (DataSize+7)/8;
+       LOG("stack = 0x%x", stack);
+       Log("stack = %p, DataSize = %i", stack, DataSize);
        memcpy( stack, ArgV, DataSize );
+       free(ArgV);
        
        // Adjust Arguments and environment
        delta = (Uint)stack - (Uint)ArgV;
        ArgV = (char**)stack;
        for( i = 0; ArgV[i]; i++ )      ArgV[i] += delta;
-       i ++;
-       EnvP = &ArgV[i];
-       for( i = 0; EnvP[i]; i++ )      EnvP[i] += delta;
+       envp = &ArgV[i+1];
+       for( i = 0; envp[i]; i++ )      envp[i] += delta;
        
        // User Mode Segments
        // 0x2B = 64-bit
        ss = 0x23;      cs = 0x2B;
        
        // Arguments
-       *--stack = (Uint)EnvP;
+       *--stack = (Uint)envp;
        *--stack = (Uint)ArgV;
        *--stack = (Uint)ArgC;
-       while(*Bases)
-               *--stack = *Bases++;
+       *--stack = Base;
        
        Proc_StartProcess(ss, (Uint)stack, 0x202, cs, Entrypoint);
 }