# include <mp.h>
#endif
#include <arch_config.h>
+#include <hal_proc.h>
// === FLAGS ===
#define DEBUG_TRACE_SWITCH 0
+//#define BREAK_ON_SWITCH 1 // Break into bochs debugger on a task switch
// === CONSTANTS ===
#define SWITCH_MAGIC 0x55ECAFFF##FFFACE55 // There is no code in this area
extern tThread gThreadZero;
extern void Threads_Dump(void);
extern void Proc_ReturnToUser(void);
-extern int GetCPUNum(void);
extern void Time_UpdateTimestamp(void);
// === PROTOTYPES ===
-void ArchThreads_Init(void);
+//void ArchThreads_Init(void);
#if USE_MP
void MP_StartAP(int CPU);
void MP_SendIPI(Uint8 APICID, int Vector, int DeliveryMode);
// int Proc_Clone(Uint *Err, Uint Flags);
// int Proc_SpawnWorker(void);
Uint Proc_MakeUserStack(void);
-void Proc_StartUser(Uint Entrypoint, Uint *Bases, int ArgC, char **ArgV, char **EnvP, int DataSize);
+//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);
int Proc_Demote(Uint *Err, int Dest, tRegs *Regs);
-void Proc_CallFaultHandler(tThread *Thread);
-void Proc_DumpThreadCPUState(tThread *Thread);
+//void Proc_CallFaultHandler(tThread *Thread);
+//void Proc_DumpThreadCPUState(tThread *Thread);
void Proc_Scheduler(int CPU);
// === GLOBALS ===
#if USE_MP
}
for(pos=0;pos<giNumCPUs;pos++) {
- #endif
__asm__ __volatile__ ("ltr %%ax"::"a"(0x38+pos*16));
- #if USE_MP
}
+ #else
+ __asm__ __volatile__ ("ltr %%ax"::"a"(0x38));
#endif
// Set Debug registers
while( giNumInitingCPUs ) __asm__ __volatile__ ("hlt");
#else
// Create Idle Task
- if(Proc_Clone(0, 0) == 0)
+ if(Proc_Clone(0) == 0)
{
gaCPUs[0].IdleThread = Proc_GetCurThread();
gaCPUs[0].IdleThread->ThreadName = (char*)"Idle Thread";
}
/**
- * \fn int Proc_Clone(Uint *Err, Uint Flags)
+ * \fn int Proc_Clone(Uint Flags)
* \brief Clone the current process
*/
-int Proc_Clone(Uint *Err, Uint Flags)
+int Proc_Clone(Uint Flags)
{
tThread *newThread;
tThread *cur = Proc_GetCurThread();
__asm__ __volatile__ ("mov %%rsp, %0": "=r"(rsp));
__asm__ __volatile__ ("mov %%rbp, %0": "=r"(rbp));
- newThread = Threads_CloneTCB(Err, Flags);
+ newThread = Threads_CloneTCB(NULL, Flags);
if(!newThread) return -1;
Log("Proc_Clone: newThread = %p", newThread);
Log("Proc_Clone: Cloning VM");
newThread->MemState.CR3 = MM_Clone();
newThread->KernelStack = cur->KernelStack;
+// MAGIC_BREAK();
} else {
Uint tmp_rbp, old_rsp = rsp;
if(rip == SWITCH_MAGIC) {
outb(0x20, 0x20); // ACK Timer and return as child
__asm__ __volatile__ ("sti");
+// MAGIC_BREAK();
return 0;
}
// Set EIP as parent
new->SavedState.RIP = rip;
// Mark as active
- new->Status = THREAD_STAT_ACTIVE;
+ new->Status = THREAD_STAT_PREINIT;
Threads_AddActive( new );
return new->TID;
thread->SavedState.UserCS = regs->CS;
thread->SavedState.UserRIP = regs->RIP;
}
-
+
+ #if BREAK_ON_SWITCH
+ {
+ tThread *oldthread = thread;
+ #endif
+
// Get next thread
thread = Threads_GetNextToRun(CPU, thread);
if(thread == NULL) {
thread = gaCPUs[CPU].IdleThread;
//Warning("Hmm... Threads_GetNextToRun returned NULL, I don't think this should happen.\n");
- //LogF("Zzzzz.\n");
- return;
+// LogF("Zzzzz.\n");
+ //return;
+ }
+ if(thread == NULL ) {
+ return ;
+ }
+ #if BREAK_ON_SWITCH
+ if( thread != oldthread ) {
+ MAGIC_BREAK();
}
+ }
+ #endif
#if DEBUG_TRACE_SWITCH
LogF("Switching to task %i, CR3 = 0x%x, RIP = %p",
// Update Kernel Stack pointer
gTSSs[CPU].RSP0 = thread->KernelStack-4;
- // Set address space
- __asm__ __volatile__ ("mov %0, %%cr3"::"a"(thread->MemState.CR3));
-
// Switch threads
__asm__ __volatile__ (
+ "mov %4, %%cr3\n\t"
"mov %1, %%rsp\n\t" // Restore RSP
"mov %2, %%rbp\n\t" // and RBP
"jmp *%3" : : // And return to where we saved state (Proc_Clone or Proc_Scheduler)
- "a"(SWITCH_MAGIC), "b"(thread->SavedState.RSP),
- "d"(thread->SavedState.RBP), "c"(thread->SavedState.RIP)
+ "a"(SWITCH_MAGIC), "r"(thread->SavedState.RSP),
+ "r"(thread->SavedState.RBP), "r"(thread->SavedState.RIP),
+ "r"(thread->MemState.CR3)
);
for(;;); // Shouldn't reach here
}