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;
+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;
// === CODE ===
void ArchThreads_Init(void)
{
+ gThreadZero.MemState.Base = (tPAddr)&kernel_table0 - KERNEL_BASE;
}
void Proc_IdleThread(void *unused)
{
+ Threads_SetPriority(gpIdleThread, -1);
for(;;) {
- __asm__ __volatile__ ("wfi");
Proc_Reschedule();
+ __asm__ __volatile__ ("wfi");
}
}
tid = Proc_NewKThread( Proc_IdleThread, NULL );
gpIdleThread = Threads_GetThread(tid);
+ gpIdleThread->ThreadName = (char*)"Idle Thread";
}
int GetCPUNum(void)
return gpCurrentThread;
}
-tTID Proc_Clone(Uint Flags)
+void Proc_StartUser(Uint Entrypoint, Uint Base, int ArgC, char **ArgV, int DataSize)
{
- return -1;
+ 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;
+ Log("delta = %x", delta);
+ 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;
+ Log("envp = %p", envp);
+
+ *--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_StartUser(Uint Entrypoint, Uint *Bases, int ArgC, char **ArgV, char **EnvP, int DataSize)
+tTID Proc_Clone(Uint Flags)
{
+ tThread *new;
+ Uint32 pc, sp, mem;
+
+ new = Threads_CloneTCB(Flags);
+ if(!new) return -1;
+
+ // Actual clone magic
+ pc = Proc_CloneInt(&sp, &mem);
+ if(pc == 0) {
+ Log("Proc_Clone: In child");
+ return 0;
+ }
+
+ new->SavedState.IP = pc;
+ new->SavedState.SP = sp;
+ new->MemState.Base = mem;
+
+ Threads_AddActive(new);
+
+ return new->TID;
}
tTID Proc_SpawnWorker( void (*Fnc)(void*), void *Ptr )
{
- return -1;
+ tThread *new;
+ Uint32 sp;
+
+ new = Threads_CloneThreadZero();
+ if(!new) return -1;
+ if(new->ThreadName) free(new->ThreadName);
+ new->ThreadName = NULL;
+
+ new->KernelStack = MM_NewKStack(1);
+ if(!new->KernelStack) {
+ // TODO: Delete thread
+ Log_Error("Proc", "Unable to allocate kernel stack");
+ return -1;
+ }
+
+ sp = new->KernelStack;
+
+ *(Uint32*)(sp -= 4) = (Uint)Ptr;
+ *(Uint32*)(sp -= 4) = (Uint)Fnc;
+ *(Uint32*)(sp -= 4) = (Uint)new;
+
+ new->SavedState.SP = sp;
+ new->SavedState.IP = (Uint)KernelThreadHeader;
+
+ Threads_AddActive(new);
+
+ return new->TID;
}
tTID Proc_NewKThread( void (*Fnc)(void*), void *Ptr )
tThread *new;
Uint32 sp;
- new = Threads_CloneTCB(NULL, 0);
+ new = Threads_CloneTCB(0);
if(!new) return -1;
+ free(new->ThreadName);
+ new->ThreadName = NULL;
+ // TODO: Non-shared stack
new->KernelStack = MM_NewKStack(1);
if(!new->KernelStack) {
// TODO: Delete thread
sp = new->KernelStack;
- *(Uint32*)(sp -= 4) = (Uint)new;
- *(Uint32*)(sp -= 4) = (Uint)Fnc;
- *(Uint32*)(sp -= 4) = 1;
*(Uint32*)(sp -= 4) = (Uint)Ptr;
+ *(Uint32*)(sp -= 4) = (Uint)Fnc;
+ *(Uint32*)(sp -= 4) = (Uint)new;
new->SavedState.SP = sp;
new->SavedState.IP = (Uint)KernelThreadHeader;
if(!next) next = gpIdleThread;
if(!next || next == cur) return;
- Log("Switching to %p (%i) IP=%p SP=%p", next, next->TID, next->SavedState.IP, next->SavedState.SP);
+ Log("Switching to %p (%i %s) IP=%p SP=%p TTBR0=%p",
+ next, next->TID, next->ThreadName,
+ next->SavedState.IP, next->SavedState.SP, next->MemState.Base
+ );
+ Log("Requested by %p", __builtin_return_address(0));
gpCurrentThread = next;
- // TODO: Change kernel stack?
SwitchTask(
next->SavedState.SP, &cur->SavedState.SP,