# include <mp.h>
#endif
#include <hal_proc.h>
+#include <arch_int.h>
// === FLAGS ===
-#define DEBUG_TRACE_SWITCH 1
+#define DEBUG_TRACE_SWITCH 0
#define DEBUG_DISABLE_DOUBLEFAULT 1
-#define DEBUG_VERY_SLOW_SWITCH 0
+#define DEBUG_VERY_SLOW_PERIOD 0
// === CONSTANTS ===
// Base is 1193182
{
int i;
tMPTable_Ent *ents;
+ #if DUMP_MP_TABLE
Log("gMPFloatPtr = %p", gMPFloatPtr);
Log("*gMPFloatPtr = {");
Log("\t.Sig = 0x%08x", gMPFloatPtr->Sig);
gMPFloatPtr->Features[4]
);
Log("}");
-
+ #endif
+
mptable = (void*)( KERNEL_BASE|gMPFloatPtr->MPConfig );
+ #if DUMP_MP_TABLE
Log("mptable = %p", mptable);
Log("*mptable = {");
Log("\t.Sig = 0x%08x", mptable->Sig);
Log("\t.ExtendedTableLen = 0x%04x", mptable->ExtendedTableLen);
Log("\t.ExtendedTableChecksum = 0x%02x", mptable->ExtendedTableChecksum);
Log("}");
+ #endif
gpMP_LocalAPIC = (void*)MM_MapHWPages(mptable->LocalAPICMemMap, 1);
{
case 0: // Processor
entSize = 20;
+ #if DUMP_MP_TABLE
Log("%i: Processor", i);
Log("\t.APICID = %i", ents->Proc.APICID);
Log("\t.APICVer = 0x%02x", ents->Proc.APICVer);
Log("\t.CPUFlags = 0x%02x", ents->Proc.CPUFlags);
Log("\t.CPUSignature = 0x%08x", ents->Proc.CPUSignature);
Log("\t.FeatureFlags = 0x%08x", ents->Proc.FeatureFlags);
-
+ #endif
if( !(ents->Proc.CPUFlags & 1) ) {
Log("DISABLED");
break;
- #if DUMP_MP_TABLES
+ #if DUMP_MP_TABLE >= 2
case 1: // Bus
entSize = 8;
Log("%i: Bus", i);
#else
// Create Idle Task
tid = Proc_NewKThread(Proc_IdleThread, &gaCPUs[0]);
- gaCPUs[0].IdleThread = Threads_GetThread(tid);
+// gaCPUs[0].IdleThread = Threads_GetThread(tid);
// Set current task
gaCPUs[0].Current = &gThreadZero;
void Proc_ClearThread(tThread *Thread)
{
- Log_Warning("Proc", "TODO: Nuke address space etc");
+ MM_ClearSpace(Thread->MemState.CR3);
if(Thread->SavedState.SSE) {
free(Thread->SavedState.SSE);
Thread->SavedState.SSE = NULL;
if(!newThread) return -1;
// Set CR3
+ MM_RefPhys( cur->MemState.CR3 );
newThread->MemState.CR3 = cur->MemState.CR3;
// Create new KStack
Proc_DisableSSE();
}
- SwitchTasks(
- nextthread->SavedState.ESP, &curthread->SavedState.ESP,
- nextthread->SavedState.EIP, &curthread->SavedState.EIP,
- nextthread->MemState.CR3
- );
+ if( curthread )
+ {
+ SwitchTasks(
+ nextthread->SavedState.ESP, &curthread->SavedState.ESP,
+ nextthread->SavedState.EIP, &curthread->SavedState.EIP,
+ nextthread->MemState.CR3
+ );
+ }
+ else
+ {
+ SwitchTasks(
+ nextthread->SavedState.ESP, 0,
+ nextthread->SavedState.EIP, 0,
+ nextthread->MemState.CR3
+ );
+ }
return ;
}
*/
void Proc_Scheduler(int CPU)
{
+#if 0
tThread *thread;
// If the spinlock is set, let it complete
regs->eflags &= ~0x100; // Clear TF
}
-#if 0
// TODO: Ack timer?
#if USE_MP
if( GetCPUNum() )