X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Kernel%2Farch%2Fx86_64%2Fproc.c;h=3594552b4add0156e9b47af1310556b83dd7ff05;hb=a3ca5c97e1e761815f1890dccdbe9dce243b5c8f;hp=6ed99eead86f18138473133c09fef20631bdf320;hpb=fb80e752428843b891e8fde12f2263bcd84d06be;p=tpg%2Facess2.git

diff --git a/Kernel/arch/x86_64/proc.c b/Kernel/arch/x86_64/proc.c
index 6ed99eea..3594552b 100644
--- 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,16 +39,18 @@ 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;
 extern int	giNumActiveThreads;
 extern tThread	gThreadZero;
 extern void	Threads_Dump(void);
-extern void	Proc_ReturnToUser(void);
+extern void	Proc_ReturnToUser(tVAddr Handler, tVAddr KStackTop, int Argument);
 extern void	Time_UpdateTimestamp(void);
 extern void	SwitchTasks(Uint NewSP, Uint *OldSP, Uint NewIP, Uint *OldIO, Uint CR3);
 
@@ -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,7 +472,8 @@ int Proc_NewKThread(void (*Fcn)(void*), void *Data)
 	
 	newThread->SavedState.RSP = rsp;
 	newThread->SavedState.RIP = (Uint)&NewTaskHeader;
-	Log("New (KThread) %p, rsp = %p\n", newThread->SavedState.RIP, newThread->SavedState.RSP);
+	newThread->SavedState.SSE = NULL;
+//	Log("New (KThread) %p, rsp = %p\n", newThread->SavedState.RIP, newThread->SavedState.RSP);
 	
 //	MAGIC_BREAK();	
 	Threads_AddActive(newThread);
@@ -481,26 +497,25 @@ 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
 	rip = Proc_CloneInt(&newThread->SavedState.RSP, &newThread->MemState.CR3);
-	if(rip == 0) {
-		outb(0x20, 0x20);	// ACK Timer and return as child
-		__asm__ __volatile__ ("sti");
-		return 0;
-	}
+	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
@@ -542,8 +557,9 @@ 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);
+//	Log("New (Worker) %p, rsp = %p\n", new->SavedState.RIP, new->SavedState.RSP);
 	
 	// Mark as active
 	new->Status = THREAD_STAT_PREINIT;
@@ -553,7 +569,6 @@ int Proc_SpawnWorker(void (*Fcn)(void*), void *Data)
 }
 
 /**
- * \fn Uint Proc_MakeUserStack(void)
  * \brief Creates a new user stack
  */
 Uint Proc_MakeUserStack(void)
@@ -563,15 +578,22 @@ Uint Proc_MakeUserStack(void)
 	
 	// Check Prospective Space
 	for( i = USER_STACK_SZ >> 12; i--; )
+	{
 		if( MM_GetPhysAddr( base + (i<<12) ) != 0 )
 			break;
+	}
 	
 	if(i != -1)	return 0;
 	
 	// Allocate Stack - Allocate incrementally to clean up MM_Dump output
-	for( i = 0; i < USER_STACK_SZ/0x1000; i++ )
+	for( i = 0; i < (USER_STACK_SZ-USER_STACK_PREALLOC)/0x1000; i++ )
+	{
+		MM_AllocateZero( base + (i<<12) );
+	}
+	for( ; i < USER_STACK_SZ/0x1000; i++ )
 	{
-		if( !MM_Allocate( base + (i<<12) ) )
+		tPAddr	alloc = MM_Allocate( base + (i<<12) );
+		if( !alloc )
 		{
 			// Error
 			Log_Error("Proc", "Unable to allocate user stack (%i pages requested)", USER_STACK_SZ/0x1000);
@@ -584,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);
 }
@@ -631,8 +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);
+//	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
@@ -646,24 +669,12 @@ void Proc_StartProcess(Uint16 SS, Uint Stack, Uint Flags, Uint16 CS, Uint IP)
 	else
 	{
 		// 64-bit return
-		#if 1
 		__asm__ __volatile__ (
 			"mov %0, %%rsp;\n\t"	// Set stack pointer
 			"mov %2, %%r11;\n\t"	// Set RFLAGS
 			"sysretq;\n\t"
 			: : "r" (Stack), "c" (IP), "r" (Flags)
 			);
-		#else
-		__asm__ __volatile__ (
-			"push $0x23;\n\t"	// SS
-			"push %0;\n\t"	// RSP
-			"push %2;\n\t"	// Flags
-			"push $0x2B;\n\t"	// CS
-			"push %1;\n\t"	// IP
-			"iretq"
-			: : "r" (Stack), "r" (IP), "r" (Flags)
-			);
-		#endif
 	}
 	for(;;);
 }
@@ -703,9 +714,8 @@ int Proc_Demote(Uint *Err, int Dest, tRegs *Regs)
  */
 void Proc_CallFaultHandler(tThread *Thread)
 {
-	// Rewinds the stack and calls the user function
 	// Never returns
-	__asm__ __volatile__ ("mov %0, %%rbp;\n\tcall Proc_ReturnToUser" :: "r"(Thread->FaultHandler));
+	Proc_ReturnToUser(Thread->FaultHandler, Thread->KernelStack, Thread->CurFaultNum);
 	for(;;);
 }
 
@@ -733,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
 
@@ -747,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,