Modules/UHCI - Fixed edge case NULL dereference

[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 50f712f..3594552 100644 (file)
--- a/Kernel/arch/x86_64/proc.c
+++ b/Kernel/arch/x86_64/proc.c
@@ -16,7 +16,7 @@
 #include <hal_proc.h>
 
 // === FLAGS ===
-#define DEBUG_TRACE_SWITCH     1
+#define DEBUG_TRACE_SWITCH     0
 #define BREAK_ON_SWITCH        0       // Break into bochs debugger on a task switch
 
 // === CONSTANTS ===
@@ -39,9 +39,11 @@ extern Uint  GetRIP(void);   // start.asm
 extern Uint    SaveState(Uint *RSP, Uint *Regs);
 extern Uint    Proc_CloneInt(Uint *RSP, Uint *CR3);
 extern void    NewTaskHeader(void);    // Actually takes cdecl args
+extern void    Proc_InitialiseSSE(void);
+extern void    Proc_SaveSSE(Uint DestPtr);
+extern void    Proc_DisableSSE(void);
 
 extern Uint64  gInitialPML4[512];      // start.asm
-extern tShortSpinlock  glThreadListLock;
 extern int     giNumCPUs;
 extern int     giNextTID;
 extern int     giTotalTickets;
@@ -61,7 +63,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);
@@ -323,6 +325,8 @@ void ArchThreads_Init(void)
                Warning("Oh, hell, Unable to allocate PPD for Thread#0");
        }
 
+       Proc_InitialiseSSE();
+
        Log_Log("Proc", "Multithreading initialised");
 }
 
@@ -413,7 +417,7 @@ void Proc_Start(void)
        __asm__ __volatile__("sti");
        #endif
        MM_FinishVirtualInit();
-       Log("Multithreading started");
+       Log_Log("Proc", "Multithreading started");
 }
 
 /**
@@ -429,13 +433,24 @@ tThread *Proc_GetCurThread(void)
        #endif
 }
 
+/*
+ * 
+ */
+void Proc_ClearThread(tThread *Thread)
+{
+       Log_Warning("Proc", "TODO: Nuke address space etc");
+}
+
+/**
+ * \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
@@ -457,6 +472,7 @@ int Proc_NewKThread(void (*Fcn)(void*), void *Data)
        
        newThread->SavedState.RSP = rsp;
        newThread->SavedState.RIP = (Uint)&NewTaskHeader;
+       newThread->SavedState.SSE = NULL;
 //     Log("New (KThread) %p, rsp = %p\n", newThread->SavedState.RIP, newThread->SavedState.RSP);
        
 //     MAGIC_BREAK();  
@@ -481,7 +497,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
@@ -489,14 +505,17 @@ int Proc_Clone(Uint Flags)
        if(rip == 0)    return 0;       // Child
        newThread->KernelStack = cur->KernelStack;
        newThread->SavedState.RIP = rip;
+       newThread->SavedState.SSE = NULL;
 
-       // DEBUG        
+       // DEBUG
+       #if 0
        Log("New (Clone) %p, rsp = %p, cr3 = %p", rip, newThread->SavedState.RSP, newThread->MemState.CR3);
        {
                Uint cr3;
                __asm__ __volatile__ ("mov %%cr3, %0" : "=r" (cr3));
                Log("Current CR3 = 0x%x, PADDR(RSP) = 0x%x", cr3, MM_GetPhysAddr(newThread->SavedState.RSP));
        }
+       #endif
        // /DEBUG
        
        // Lock list and add to active
@@ -538,6 +557,7 @@ int Proc_SpawnWorker(void (*Fcn)(void*), void *Data)
 
        new->SavedState.RSP = new->KernelStack - sizeof(stack_contents);
        new->SavedState.RIP = (Uint)&NewTaskHeader;
+       new->SavedState.SSE = NULL;
        
 //     Log("New (Worker) %p, rsp = %p\n", new->SavedState.RIP, new->SavedState.RSP);
        
@@ -573,7 +593,6 @@ Uint Proc_MakeUserStack(void)
        for( ; i < USER_STACK_SZ/0x1000; i++ )
        {
                tPAddr  alloc = MM_Allocate( base + (i<<12) );
-               Log_Debug("Proc", "Proc_MakeUserStack: alloc = %P", alloc);
                if( !alloc )
                {
                        // Error
@@ -587,42 +606,43 @@ Uint Proc_MakeUserStack(void)
        return base + USER_STACK_SZ;
 }
 
-
-/**
- * \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;
         int    i;
-       Uint    delta;
+       char    **envp = NULL;
        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;
        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;
+       if(DataSize)
+       {
+               Uint    delta = (Uint)stack - (Uint)ArgV;
+               ArgV = (char**)stack;
+               for( i = 0; ArgV[i]; i++ )      ArgV[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);
 }
@@ -634,9 +654,8 @@ void Proc_StartProcess(Uint16 SS, Uint Stack, Uint Flags, Uint16 CS, Uint IP)
                        CS, SS);
                Threads_Exit(0, -1);
        }
-       Log("Proc_StartProcess: (SS=%x, Stack=%p, Flags=%x, CS=%x, IP=%p)",
-               SS, Stack, Flags, CS, IP);
-       MM_DumpTables(0, USER_MAX);
+//     Log("Proc_StartProcess: (SS=%x, Stack=%p, Flags=%x, CS=%x, IP=%p)", SS, Stack, Flags, CS, IP);
+//     MM_DumpTables(0, USER_MAX);
        if(CS == 0x1B)
        {
                // 32-bit return
@@ -724,12 +743,12 @@ void Proc_Reschedule(void)
                return ;
 
        #if DEBUG_TRACE_SWITCH
-       LogF("\nSwitching to task %i, CR3 = 0x%x, RIP = %p, RSP = %p, KStack = %p\n",
-               nextthread->TID,
+       LogF("\nSwitching to task CR3 = 0x%x, RIP = %p, RSP = %p - %i (%s)\n",
                nextthread->MemState.CR3,
                nextthread->SavedState.RIP,
                nextthread->SavedState.RSP,
-               nextthread->KernelStack
+               nextthread->TID,
+               nextthread->ThreadName
                );
        #endif
 
@@ -738,6 +757,14 @@ void Proc_Reschedule(void)
        gTSSs[cpu].RSP0 = nextthread->KernelStack-4;
        __asm__ __volatile__ ("mov %0, %%db0" : : "r" (nextthread));
 
+       // Save FPU/MMX/XMM/SSE state
+       if( curthread->SavedState.SSE )
+       {
+               Proc_SaveSSE( ((Uint)curthread->SavedState.SSE + 0xF) & ~0xF );
+               curthread->SavedState.bSSEModified = 0;
+               Proc_DisableSSE();
+       }
+
        SwitchTasks(
                nextthread->SavedState.RSP, &curthread->SavedState.RSP,
                nextthread->SavedState.RIP, &curthread->SavedState.RIP,