X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;ds=sidebyside;f=KernelLand%2FKernel%2Farch%2Fx86_64%2Fproc.c;h=b35b5074d39a5cde3a6cfec1954355c2471899d9;hb=74ea5e7e82ed3a4f7fa981907177cf55b9b88f07;hp=5f71a45f08c9d986a9bf5c201eb797ed272787c4;hpb=48743e39650eb1ef988380e9d95f27fd40d3a9ce;p=tpg%2Facess2.git

diff --git a/KernelLand/Kernel/arch/x86_64/proc.c b/KernelLand/Kernel/arch/x86_64/proc.c
index 5f71a45f..b35b5074 100644
--- a/KernelLand/Kernel/arch/x86_64/proc.c
+++ b/KernelLand/Kernel/arch/x86_64/proc.c
@@ -37,7 +37,7 @@ extern void	APStartup(void);	// 16-bit AP startup code
 
 extern Uint	GetRIP(void);	// start.asm
 extern Uint	SaveState(Uint *RSP, Uint *Regs);
-extern Uint	Proc_CloneInt(Uint *RSP, Uint *CR3);
+extern Uint	Proc_CloneInt(Uint *RSP, Uint *CR3, int bCopyUserVM);
 extern void	NewTaskHeader(void);	// Actually takes cdecl args
 extern void	Proc_InitialiseSSE(void);
 extern void	Proc_SaveSSE(Uint DestPtr);
@@ -75,6 +75,7 @@ void	Proc_StartProcess(Uint16 SS, Uint Stack, Uint Flags, Uint16 CS, Uint IP) NO
 //void	Proc_DumpThreadCPUState(tThread *Thread);
 //void	Proc_Reschedule(void);
 void	Proc_Scheduler(int CPU, Uint RSP, Uint RIP);
+Uint	Proc_int_SetIRQIP(Uint RIP);
 
 // === GLOBALS ===
 //!\brief Used by desctab.asm in SyscallStub
@@ -86,7 +87,9 @@ tMPInfo	*gMPFloatPtr = NULL;
 tAPIC	*gpMP_LocalAPIC = NULL;
 Uint8	gaAPIC_to_CPU[256] = {0};
 #endif
-tCPU	gaCPUs[MAX_CPUS];
+tCPU	gaCPUs[MAX_CPUS] = {
+	{.Current = &gThreadZero}
+	};
 tTSS	*gTSSs = NULL;
 tTSS	gTSS0 = {0};
 // --- Error Recovery ---
@@ -455,9 +458,8 @@ void Proc_ClearThread(tThread *Thread)
 tTID Proc_NewKThread(void (*Fcn)(void*), void *Data)
 {
 	Uint	rsp;
-	tThread	*newThread, *cur;
+	tThread	*newThread;
 	
-	cur = Proc_GetCurThread();
 	newThread = Threads_CloneTCB(0);
 	if(!newThread)	return -1;
 	
@@ -505,7 +507,7 @@ tTID Proc_Clone(Uint Flags)
 	if(!newThread)	return -1;
 	
 	// Save core machine state
-	rip = Proc_CloneInt(&newThread->SavedState.RSP, &newThread->Process->MemState.CR3);
+	rip = Proc_CloneInt(&newThread->SavedState.RSP, &newThread->Process->MemState.CR3, !!(Flags & CLONE_NOUSER));
 	if(rip == 0)	return 0;	// Child
 	newThread->KernelStack = cur->KernelStack;
 	newThread->SavedState.RIP = rip;
@@ -532,18 +534,16 @@ tTID Proc_Clone(Uint Flags)
  * \fn int Proc_SpawnWorker(void)
  * \brief Spawns a new worker thread
  */
-int Proc_SpawnWorker(void (*Fcn)(void*), void *Data)
+tThread *Proc_SpawnWorker(void (*Fcn)(void*), void *Data)
 {
-	tThread	*new, *cur;
+	tThread	*new;
 	Uint	stack_contents[3];
 
-	cur = Proc_GetCurThread();
-	
 	// Create new thread
 	new = Threads_CloneThreadZero();
 	if(!new) {
 		Warning("Proc_SpawnWorker - Out of heap space!\n");
-		return -1;
+		return NULL;
 	}
 
 	// Create the stack contents
@@ -565,7 +565,7 @@ int Proc_SpawnWorker(void (*Fcn)(void*), void *Data)
 	new->Status = THREAD_STAT_PREINIT;
 	Threads_AddActive( new );
 	
-	return new->TID;
+	return new;
 }
 
 /**
@@ -579,7 +579,7 @@ Uint Proc_MakeUserStack(void)
 	// Check Prospective Space
 	for( i = USER_STACK_SZ >> 12; i--; )
 	{
-		if( MM_GetPhysAddr( base + (i<<12) ) != 0 )
+		if( MM_GetPhysAddr( (void*)(base + (i<<12)) ) != 0 )
 			break;
 	}
 	
@@ -723,7 +723,14 @@ void Proc_CallFaultHandler(tThread *Thread)
 
 void Proc_DumpThreadCPUState(tThread *Thread)
 {
-	Log("  At %04x:%016llx", Thread->SavedState.UserCS, Thread->SavedState.UserRIP);
+	if( Thread->CurCPU == GetCPUNum() ) {
+		// TODO: Backtrace to IRQ
+		Log("  IRQ %016llx", Thread->SavedState.UserRIP);
+	}
+	else {
+		Log("  At %016llx, SP=%016llx", Thread->SavedState.RIP, Thread->SavedState.RSP);
+		Log("  User %04x:%016llx", Thread->SavedState.UserCS, Thread->SavedState.UserRIP);
+	}
 }
 
 void Proc_Reschedule(void)
@@ -756,7 +763,7 @@ void Proc_Reschedule(void)
 
 	// Update CPU state
 	gaCPUs[cpu].Current = nextthread;
-	gTSSs[cpu].RSP0 = nextthread->KernelStack-4;
+	gTSSs[cpu].RSP0 = nextthread->KernelStack-sizeof(void*);
 	__asm__ __volatile__ ("mov %0, %%db0" : : "r" (nextthread));
 
 	if( curthread )
@@ -823,5 +830,14 @@ void Proc_Scheduler(int CPU, Uint RSP, Uint RIP)
 #endif
 }
 
+Uint Proc_int_SetIRQIP(Uint RIP)
+{
+	 int	cpu = GetCPUNum();
+	tThread	*thread = gaCPUs[cpu].Current;
+	Uint	rv = thread->SavedState.UserRIP;
+	thread->SavedState.UserRIP = RIP;
+	return rv;
+}
+
 // === EXPORTS ===
 EXPORT(Proc_SpawnWorker);