X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Kernel%2Farch%2Farmv7%2Fproc.c;h=b5a867cfca71a3a8536fe38bebb247798fe5648b;hb=1baac59e0cea8985a60093e7415a1796bad138ae;hp=c336fc3f3334f552159ee579c26c5ff3096cab8a;hpb=d3f9be02956fb2633d2322ffad4198e03117d353;p=tpg%2Facess2.git

diff --git a/Kernel/arch/armv7/proc.c b/Kernel/arch/armv7/proc.c
index c336fc3f..b5a867cf 100644
--- a/Kernel/arch/armv7/proc.c
+++ b/Kernel/arch/armv7/proc.c
@@ -13,12 +13,15 @@
 extern tThread	gThreadZero;
 extern void	SwitchTask(Uint32 NewSP, Uint32 *OldSP, Uint32 NewIP, Uint32 *OldIP, Uint32 MemPtr);
 extern void	KernelThreadHeader(void);	// Actually takes args on stack
+extern void	Proc_int_DropToUser(Uint32 IP, Uint32 SP) NORETURN __attribute__((long_call));
+extern Uint32	Proc_int_SwapUserSP(Uint32 NewSP);
 extern Uint32	Proc_CloneInt(Uint32 *SP, Uint32 *MemPtr);
 extern tVAddr	MM_NewKStack(int bGlobal);	// TODO: Move out into a header
+extern tVAddr	MM_NewUserStack(void);
+extern char	kernel_table0[];
 
 // === PROTOTYPES ===
 void	Proc_IdleThread(void *unused);
-tTID	Proc_NewKThread(void (*Fnc)(void*), void *Ptr);
 
 // === GLOBALS ===
 tThread	*gpCurrentThread = &gThreadZero;
@@ -27,6 +30,7 @@ tThread *gpIdleThread = NULL;
 // === CODE ===
 void ArchThreads_Init(void)
 {
+	gThreadZero.MemState.Base = (tPAddr)&kernel_table0 - KERNEL_BASE;
 }
 
 void Proc_IdleThread(void *unused)
@@ -57,10 +61,42 @@ tThread *Proc_GetCurThread(void)
 	return gpCurrentThread;
 }
 
-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)
 {
-	Log_Debug("Proc", "Proc_StartUser: (Entrypoint=%p, Bases=%p, ArgC=%i, ...)",
-		Entrypoint, Bases, ArgC);
+	Uint32	*usr_sp;
+	 int	i;
+	char	**envp;
+	tVAddr	delta;
+
+//	Log_Debug("Proc", "Proc_StartUser: (Entrypoint=%p, Base=%p, ArgC=%i, ArgV=%p, DataSize=0x%x)",
+//		Entrypoint, Base, ArgC, ArgV, DataSize);
+
+	// Write data to the user's stack
+	usr_sp = (void*)MM_NewUserStack();
+	usr_sp -= (DataSize+3)/4;
+	memcpy(usr_sp, ArgV, DataSize);
+	free(ArgV);
+
+	// Adjust user's copy of the arguments
+	delta = (tVAddr)usr_sp -  (tVAddr)ArgV;
+	ArgV = (void*)usr_sp;
+	for(i = 0; ArgV[i]; i ++)	ArgV[i] += delta;
+	envp = &ArgV[i+1];
+	for(i = 0; envp[i]; i ++)	envp[i] += delta;
+	
+	*--usr_sp = (Uint32)envp;
+	*--usr_sp = (Uint32)ArgV;
+	*--usr_sp = (Uint32)ArgC;
+	*--usr_sp = Base;
+	
+	// Drop to user code
+	Log_Debug("Proc", "Proc_int_DropToUser(%p, %p)", Entrypoint, usr_sp);
+	Proc_int_DropToUser(Entrypoint, (Uint32)usr_sp);
+}
+
+void Proc_ClearThread(tThread *Thread)
+{
+	Log_Warning("Proc", "TODO: Nuke address space etc");
 }
 
 tTID Proc_Clone(Uint Flags)
@@ -80,6 +116,8 @@ tTID Proc_Clone(Uint Flags)
 	
 	new->SavedState.IP = pc;
 	new->SavedState.SP = sp;
+	new->SavedState.UserSP = Proc_int_SwapUserSP(0);
+	new->SavedState.UserIP = Proc_GetCurThread()->SavedState.UserIP;
 	new->MemState.Base = mem;
 
 	Threads_AddActive(new);
@@ -94,7 +132,7 @@ tTID Proc_SpawnWorker( void (*Fnc)(void*), void *Ptr )
 
 	new = Threads_CloneThreadZero();
 	if(!new)	return -1;
-	free(new->ThreadName);
+	if(new->ThreadName)	free(new->ThreadName);
 	new->ThreadName = NULL;
 
 	new->KernelStack = MM_NewKStack(1);
@@ -107,7 +145,6 @@ tTID Proc_SpawnWorker( void (*Fnc)(void*), void *Ptr )
 	sp = new->KernelStack;
 	
 	*(Uint32*)(sp -= 4) = (Uint)Ptr;
-	*(Uint32*)(sp -= 4) = 1;
 	*(Uint32*)(sp -= 4) = (Uint)Fnc;
 	*(Uint32*)(sp -= 4) = (Uint)new;
 
@@ -140,7 +177,6 @@ tTID Proc_NewKThread( void (*Fnc)(void*), void *Ptr )
 	sp = new->KernelStack;
 	
 	*(Uint32*)(sp -= 4) = (Uint)Ptr;
-	*(Uint32*)(sp -= 4) = 1;
 	*(Uint32*)(sp -= 4) = (Uint)Fnc;
 	*(Uint32*)(sp -= 4) = (Uint)new;
 
@@ -167,12 +203,17 @@ void Proc_Reschedule(void)
 	if(!next)	next = gpIdleThread;
 	if(!next || next == cur)	return;
 
-	Log("Switching to %p (%i %s)", next, next->TID, next->ThreadName);
-	Log(" IP=%p SP=%p TTBR0=%p", next->SavedState.IP, next->SavedState.SP, next->MemState.Base);
+	Log("Switching to %p (%i %s) IP=%p SP=%p TTBR0=%p UsrSP=%p",
+		next, next->TID, next->ThreadName,
+		next->SavedState.IP, next->SavedState.SP, next->MemState.Base,
+		next->SavedState.UserSP
+		);
 	Log("Requested by %p", __builtin_return_address(0));
 	
 	gpCurrentThread = next;
 
+	cur->SavedState.UserSP = Proc_int_SwapUserSP( next->SavedState.UserSP );
+
 	SwitchTask(
 		next->SavedState.SP, &cur->SavedState.SP,
 		next->SavedState.IP, &cur->SavedState.IP,