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 Uint32 Proc_CloneInt(Uint32 *SP, Uint32 *MemPtr, bool ClearUser);
extern tVAddr MM_NewKStack(int bGlobal); // TODO: Move out into a header
extern tVAddr MM_NewUserStack(void);
extern char kernel_table0[];
void Proc_StartUser(Uint Entrypoint, Uint Base, int ArgC, const char **ArgV, int DataSize)
{
- Uint32 *usr_sp;
int i;
const char **envp;
tVAddr delta;
// Entrypoint, Base, ArgC, ArgV, DataSize);
// Write data to the user's stack
- usr_sp = (void*)MM_NewUserStack();
+ Uint32 *usr_sp = (void*)MM_NewUserStack();
+ if( !usr_sp ) {
+ Log_KernelPanic("Proc", "Creation of user stack failed");
+ }
usr_sp -= (DataSize+3)/4;
memcpy(usr_sp, ArgV, DataSize);
free(ArgV);
if(!new) return -1;
// Actual clone magic
- pc = Proc_CloneInt(&sp, &mem);
+ pc = Proc_CloneInt(&sp, &mem, (Flags & CLONE_NOUSER ? 1 : 0));
if(pc == 0) {
Log("Proc_Clone: In child");
return 0;
return new->TID;
}
-int Proc_SpawnWorker( void (*Fnc)(void*), void *Ptr )
+tThread *Proc_SpawnWorker( void (*Fnc)(void*), void *Ptr )
{
tThread *new;
Uint32 sp;
new = Threads_CloneThreadZero();
- if(!new) return -1;
+ if(!new) return NULL;
if(new->ThreadName) free(new->ThreadName);
new->ThreadName = NULL;
if(!new->KernelStack) {
// TODO: Delete thread
Log_Error("Proc", "Unable to allocate kernel stack");
- return -1;
+ return NULL;
}
sp = new->KernelStack;
Threads_AddActive(new);
- return new->TID;
+ return new;
}
tTID Proc_NewKThread( void (*Fnc)(void*), void *Ptr )
if(!next) next = gpIdleThread;
if(!next || next == cur) return;
- 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->Process->MemState.Base,
- next->SavedState.UserSP
- );
-
- Log("Requested by %p", __builtin_return_address(0));
+// 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->Process->MemState.Base,
+// next->SavedState.UserSP
+// );
+// Log("Requested by %p", __builtin_return_address(0));
gpCurrentThread = next;