X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Kernel%2Farch%2Fx86%2Fproc.c;h=8cff256fa08ad0674d0f56ffc4f183f5101accb8;hb=37de13c0c8c88fa6edba679c20becec15547533e;hp=89335291a97bcc9c80fe33ceb28f32a829131bd3;hpb=0f8226381e0a19e8e8e11eafbf4589532e45d430;p=tpg%2Facess2.git

diff --git a/Kernel/arch/x86/proc.c b/Kernel/arch/x86/proc.c
index 89335291..8cff256f 100644
--- a/Kernel/arch/x86/proc.c
+++ b/Kernel/arch/x86/proc.c
@@ -11,6 +11,7 @@
 #if USE_MP
 # include <mp.h>
 #endif
+#include <hal_proc.h>
 
 // === FLAGS ===
 #define DEBUG_TRACE_SWITCH	0
@@ -46,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;
@@ -61,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);
@@ -71,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 ===
@@ -93,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 ---
@@ -371,13 +368,7 @@ 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) )
@@ -480,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");
@@ -566,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();
@@ -575,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)
@@ -591,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();
@@ -1050,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
@@ -1067,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
 }