Kernel/x86_64 - Fixed bugs exposed by -O3

[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 d05e9ae..75778c2 100644 (file)
--- a/Kernel/arch/x86_64/proc.c
+++ b/Kernel/arch/x86_64/proc.c
@@ -41,7 +41,6 @@ extern Uint   Proc_CloneInt(Uint *RSP, Uint *CR3);
 extern void    NewTaskHeader(void);    // Actually takes cdecl args
 
 extern Uint64  gInitialPML4[512];      // start.asm
-extern tShortSpinlock  glThreadListLock;
 extern int     giNumCPUs;
 extern int     giNextTID;
 extern int     giTotalTickets;
@@ -61,7 +60,7 @@ void  MP_SendIPI(Uint8 APICID, int Vector, int DeliveryMode);
 void   Proc_IdleTask(void *unused);
 //void Proc_Start(void);
 //tThread      *Proc_GetCurThread(void);
- int   Proc_NewKThread(void (*Fcn)(void*), void *Data);
+// int Proc_NewKThread(void (*Fcn)(void*), void *Data);
 // int Proc_Clone(Uint *Err, Uint Flags);
 // int Proc_SpawnWorker(void);
 Uint   Proc_MakeUserStack(void);
@@ -429,6 +428,14 @@ tThread *Proc_GetCurThread(void)
        #endif
 }
 
+/*
+ * 
+ */
+void Proc_ClearThread(tThread *Thread)
+{
+       Log_Warning("Proc", "TODO: Nuke address space etc");
+}
+
 /**
  * \brief Create a new kernel thread
  */
@@ -594,16 +601,22 @@ Uint Proc_MakeUserStack(void)
 
 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*)( Proc_MakeUserStack() - 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);