Kernel - General fixing after ARM7 changes

[tpg/acess2.git] / Kernel / arch / x86 / proc.c

diff --git a/Kernel/arch/x86/proc.c b/Kernel/arch/x86/proc.c
index b677dfd..8cff256 100644 (file)
--- a/Kernel/arch/x86/proc.c
+++ b/Kernel/arch/x86/proc.c
@@ -11,16 +11,22 @@
 #if USE_MP
 # include <mp.h>
 #endif
+#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
 
 // === CONSTANTS ===
 #define        SWITCH_MAGIC    0xFF5317C8      // FF SWITCH - There is no code in this area
 // Base is 1193182
 #define TIMER_BASE      1193182
-#define TIMER_DIVISOR   11932  //~100Hz
+#if DEBUG_VERY_SLOW_PERIOD
+# define TIMER_DIVISOR 1193    //~10Hz switch, with 10 quantum = 1s per thread
+#else
+# define TIMER_DIVISOR 11932   //~100Hz
+#endif
 
 // === TYPES ===
 #if USE_MP
@@ -41,7 +47,6 @@ extern void APWait(void);     // 16-bit AP pause code
 extern void APStartup(void);   // 16-bit AP startup code
 extern Uint    GetEIP(void);   // start.asm
 extern Uint    GetEIP_Sched(void);     // proc.asm
-extern int     GetCPUNum(void);        // start.asm
 extern Uint32  gaInitPageDir[1024];    // start.asm
 extern char    Kernel_Stack_Top[];
 extern tShortSpinlock  glThreadListLock;
@@ -56,7 +61,7 @@ extern void   IRQCommon_handled;      // IRQCommon call return location
 extern void    GetEIP_Sched_ret;       // GetEIP call return location
 
 // === 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);
@@ -66,11 +71,11 @@ void        MP_SendIPI(Uint8 APICID, int Vector, int DeliveryMode);
 void   Proc_ChangeStack(void);
 // 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_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 ===
@@ -88,9 +93,6 @@ tTSS  gaTSSs[MAX_CPUS];       // TSS Array
 tThread        *gCurrentThread = NULL;
 tThread        *gpIdleThread = NULL;
 #endif
-#if USE_PAE
-Uint32 *gPML4s[4] = NULL;
-#endif
 tTSS   *gTSSs = NULL;  // Pointer to TSS array
 tTSS   gTSS0 = {0};
 // --- Error Recovery ---
@@ -366,18 +368,12 @@ void ArchThreads_Init(void)
        #endif
        gThreadZero.CurCPU = 0;
        
-       #if USE_PAE
-       gThreadZero.MemState.PDP[0] = 0;
-       gThreadZero.MemState.PDP[1] = 0;
-       gThreadZero.MemState.PDP[2] = 0;
-       #else
        gThreadZero.MemState.CR3 = (Uint)gaInitPageDir - KERNEL_BASE;
-       #endif
        
        // Create Per-Process Data Block
        if( !MM_Allocate(MM_PPD_CFG) )
        {
-               Panic("OOM - No space for initiali Per-Process Config");
+               Panic("OOM - No space for initial Per-Process Config");
        }
        
        // Change Stacks
@@ -475,7 +471,7 @@ void Proc_Start(void)
        while( giNumInitingCPUs )       __asm__ __volatile__ ("hlt");
        #else
        // Create Idle Task
-       if(Proc_Clone(0, 0) == 0)
+       if(Proc_Clone(0) == 0)
        {
                gpIdleThread = Proc_GetCurThread();
                gpIdleThread->ThreadName = strdup("Idle Thread");
@@ -561,7 +557,7 @@ void Proc_ChangeStack(void)
  * \fn int Proc_Clone(Uint *Err, 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();
@@ -570,7 +566,7 @@ int Proc_Clone(Uint *Err, Uint Flags)
        __asm__ __volatile__ ("mov %%esp, %0": "=r"(esp));
        __asm__ __volatile__ ("mov %%ebp, %0": "=r"(ebp));
        
-       newThread = Threads_CloneTCB(Err, Flags);
+       newThread = Threads_CloneTCB(NULL, Flags);
        if(!newThread)  return -1;
        
        // Initialise Memory Space (New Addr space or kernel stack)
@@ -586,11 +582,7 @@ int Proc_Clone(Uint *Err, Uint Flags)
                Uint    tmpEbp, oldEsp = esp;
 
                // Set CR3
-               #if USE_PAE
-               # warning "PAE Unimplemented"
-               #else
                newThread->MemState.CR3 = cur->MemState.CR3;
-               #endif
 
                // Create new KStack
                newThread->KernelStack = MM_NewKStack();
@@ -999,16 +991,6 @@ void Proc_Scheduler(int CPU)
        thread = Threads_GetNextToRun(CPU, thread);
        
        
-       #if DEBUG_TRACE_SWITCH
-       if(thread) {
-               Log("Switching to task %i, CR3 = 0x%x, EIP = %p",
-                       thread->TID,
-                       thread->MemState.CR3,
-                       thread->SavedState.EIP
-                       );
-       }
-       #endif
-       
        // No avaliable tasks, just go into low power mode (idle thread)
        if(thread == NULL) {
                #if USE_MP
@@ -1019,6 +1001,17 @@ void Proc_Scheduler(int CPU)
                #endif
        }
        
+       #if DEBUG_TRACE_SWITCH
+       if(thread && thread != Proc_GetCurThread() ) {
+               Log("Switching to task %i(%s), CR3 = 0x%x, EIP = %p",
+                       thread->TID,
+                       thread->ThreadName,
+                       thread->MemState.CR3,
+                       thread->SavedState.EIP
+                       );
+       }
+       #endif
+       
        // Set current thread
        #if USE_MP
        gaCPUs[CPU].Current = thread;
@@ -1044,9 +1037,6 @@ void Proc_Scheduler(int CPU)
                Log("%p Scheduled", thread);
        }
        
-       #if USE_PAE
-       # error "Todo: Implement PAE Address space switching"
-       #else
        // Set thread pointer
        __asm__ __volatile__("mov %0, %%db0\n\t" : : "r"(thread) );
        // Switch threads
@@ -1061,7 +1051,6 @@ void Proc_Scheduler(int CPU)
                "r"(thread->MemState.CR3),
                "r"(thread->bInstrTrace&&thread->SavedState.EIP==(Uint)&GetEIP_Sched_ret?0x100:0)
                );
-       #endif
        for(;;);        // Shouldn't reach here
 }