#include <hal_proc.h>
// === FLAGS ===
-#define DEBUG_TRACE_SWITCH 1
+#define DEBUG_TRACE_SWITCH 0
#define DEBUG_DISABLE_DOUBLEFAULT 1
#define DEBUG_VERY_SLOW_SWITCH 0
extern Uint GetEIP(void); // start.asm
extern Uint GetEIP_Sched(void); // proc.asm
extern void NewTaskHeader(tThread *Thread, void *Fcn, int nArgs, ...); // Actually takes cdecl args
-extern Uint Proc_CloneInt(Uint *ESP, Uint *CR3);
+extern Uint Proc_CloneInt(Uint *ESP, Uint32 *CR3);
extern Uint32 gaInitPageDir[1024]; // start.asm
extern char Kernel_Stack_Top[];
extern tShortSpinlock glThreadListLock;
extern tThread gThreadZero;
extern void Isr8(void); // Double Fault
extern void Proc_ReturnToUser(tVAddr Handler, Uint Argument, tVAddr KernelStack);
-extern void scheduler_return; // Return address in SchedulerBase
-extern void IRQCommon; // Common IRQ handler code
-extern void IRQCommon_handled; // IRQCommon call return location
-extern void GetEIP_Sched_ret; // GetEIP call return location
+extern char scheduler_return[]; // Return address in SchedulerBase
+extern char IRQCommon[]; // Common IRQ handler code
+extern char IRQCommon_handled[]; // IRQCommon call return location
+extern char GetEIP_Sched_ret[]; // GetEIP call return location
extern void Threads_AddToDelete(tThread *Thread);
extern void SwitchTasks(Uint NewSP, Uint *OldSP, Uint NewIP, Uint *OldIO, Uint CR3);
+extern void Proc_InitialiseSSE(void);
+extern void Proc_SaveSSE(Uint DestPtr);
+extern void Proc_DisableSSE(void);
// === PROTOTYPES ===
//void ArchThreads_Init(void);
//void Proc_Start(void);
//tThread *Proc_GetCurThread(void);
void Proc_ChangeStack(void);
- int Proc_NewKThread(void (*Fcn)(void*), void *Data);
+// int Proc_NewKThread(void (*Fcn)(void*), void *Data);
// int Proc_Clone(Uint *Err, Uint Flags);
Uint Proc_MakeUserStack(void);
//void Proc_StartUser(Uint Entrypoint, Uint *Bases, int ArgC, char **ArgV, char **EnvP, int DataSize);
-void Proc_StartProcess(Uint16 SS, Uint Stack, Uint Flags, Uint16 CS, Uint IP);
+void Proc_StartProcess(Uint16 SS, Uint Stack, Uint Flags, Uint16 CS, Uint IP) NORETURN;
int Proc_Demote(Uint *Err, int Dest, tRegs *Regs);
//void Proc_CallFaultHandler(tThread *Thread);
//void Proc_DumpThreadCPUState(tThread *Thread);
{
Panic("OOM - No space for initial Per-Process Config");
}
+
+ // Initialise SSE support
+ Proc_InitialiseSSE();
// Change Stacks
Proc_ChangeStack();
tThread *newThread, *cur;
cur = Proc_GetCurThread();
- newThread = Threads_CloneTCB(NULL, 0);
+ newThread = Threads_CloneTCB(0);
if(!newThread) return -1;
// Set CR3
newThread->SavedState.ESP = esp;
newThread->SavedState.EIP = (Uint)&NewTaskHeader;
+ newThread->SavedState.SSE = NULL;
Log("New (KThread) %p, esp = %p\n", newThread->SavedState.EIP, newThread->SavedState.ESP);
// MAGIC_BREAK();
}
// New thread
- newThread = Threads_CloneTCB(NULL, Flags);
+ newThread = Threads_CloneTCB(Flags);
if(!newThread) return -1;
newThread->KernelStack = cur->KernelStack;
return 0;
}
newThread->SavedState.EIP = eip;
+ newThread->SavedState.SSE = NULL;
+ newThread->SavedState.bSSEModified = 0;
// Check for errors
if( newThread->MemState.CR3 == 0 ) {
// Save core machine state
new->SavedState.ESP = new->KernelStack - sizeof(stack_contents);
- new->SavedState.EBP = 0;
new->SavedState.EIP = (Uint)NewTaskHeader;
+ new->SavedState.SSE = NULL;
+ new->SavedState.bSSEModified = 0;
// Mark as active
new->Status = THREAD_STAT_PREINIT;
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 = %p", stack);
-
- // Copy Arguments
+ // Copy data to the user stack and free original buffer
+ stack = (void*)Proc_MakeUserStack();
stack -= DataSize/sizeof(*stack);
memcpy( stack, ArgV, DataSize );
+ free(ArgV);
- //Log("stack = %p", stack);
-
+ // Adjust Arguments and environment
if( DataSize )
{
- // Adjust Arguments and environment
- delta = (Uint)stack - (Uint)ArgV;
+ Uint delta = (Uint)stack - (Uint)ArgV;
ArgV = (char**)stack;
- for( i = 0; ArgV[i]; i++ )
- ArgV[i] += delta;
- i ++;
-
- // Do we care about EnvP?
- if( EnvP ) {
- EnvP = &ArgV[i];
- for( i = 0; EnvP[i]; i++ )
- EnvP[i] += delta;
- }
+ 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
ss = 0x23; cs = 0x1B;
// Arguments
- *--stack = (Uint)EnvP;
+ *--stack = (Uint)envp;
*--stack = (Uint)ArgV;
*--stack = (Uint)ArgC;
- while(*Bases)
- *--stack = *Bases++;
- *--stack = 0; // Return Address
+ *--stack = Base;
Proc_StartProcess(ss, (Uint)stack, 0x202, cs, Entrypoint);
}
return ;
}
- #if 1
tVAddr diffFromScheduler = Thread->SavedState.EIP - (tVAddr)SwitchTasks;
tVAddr diffFromClone = Thread->SavedState.EIP - (tVAddr)Proc_CloneInt;
tVAddr diffFromSpawn = Thread->SavedState.EIP - (tVAddr)NewTaskHeader;
}
if( diffFromScheduler > 0 && diffFromScheduler < 128 ) // When I last checked, GetEIP was at .+0x30
- #else
- Uint32 data[3];
- MM_ReadFromAddrSpace(Thread->MemState.CR3, Thread->SavedState.EBP, data, 12);
- if( data[1] == (Uint32)&IRQCommon + 25 )
- {
- tRegs *regs = (void *) data[2];
- Log(" oldebp = 0x%08x, ret = 0x%08x, regs = 0x%x",
- data[0], data[1], data[2]
- );
- // [EBP] = old EBP
- // [EBP+0x04] = Return Addr
- // [EBP+0x08] = Arg 1 (CPU Number)
- // [EBP+0x0C] = Arg 2 (Thread)
- // [EBP+0x10] = GS (start of tRegs)
- Log(" IRQ%i from %02x:%08x", regs->int_num regs->cs, regs->eip);
- }
- if( stack[1] == (Uint32)&scheduler_return )
- #endif
{
// Scheduled out
Log(" At %04x:%08x", Thread->SavedState.UserCS, Thread->SavedState.UserEIP);
tThread *nextthread, *curthread;
int cpu = GetCPUNum();
- // TODO: Wait for it?
+ // TODO: Wait for the lock?
if(IS_LOCKED(&glThreadListLock)) return;
curthread = Proc_GetCurThread();
gTSSs[cpu].ESP0 = nextthread->KernelStack-4;
__asm__ __volatile__("mov %0, %%db0\n\t" : : "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.ESP, &curthread->SavedState.ESP,
nextthread->SavedState.EIP, &curthread->SavedState.EIP,
nextthread->MemState.CR3
);
+
return ;
}
git.ucc.asn.au / tpg / acess2.git / blobdiff
UCC git Repository :: git.ucc.asn.au