X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Kernel%2Farch%2Fx86%2Fproc.c;h=62980674215919ebd538b0ee2ce2f0403e2c1795;hb=eb934b266052965b9c480d11d6866a994f30731b;hp=b2f7f8f5148a07238aa6b556f9fccd21bc6f0f05;hpb=049de1f2533477716a12a708c097b199eaa8fb6c;p=tpg%2Facess2.git

diff --git a/Kernel/arch/x86/proc.c b/Kernel/arch/x86/proc.c
index b2f7f8f5..62980674 100644
--- a/Kernel/arch/x86/proc.c
+++ b/Kernel/arch/x86/proc.c
@@ -4,6 +4,7 @@
  */
 #include <acess.h>
 #include <proc.h>
+#include <desctab.h>
 #include <mm_virt.h>
 #include <errno.h>
 #if USE_MP
@@ -20,6 +21,7 @@
 
 // === IMPORTS ===
 extern tGDT	gGDT[];
+extern tIDT	gIDT[];
 extern void APStartup();	// 16-bit AP startup code
 extern Uint	GetEIP();	// start.asm
 extern Uint32	gaInitPageDir[1024];	// start.asm
@@ -36,7 +38,7 @@ extern tThread	*gDeleteThreads;
 extern tThread	*Threads_GetNextToRun(int CPU);
 extern void	Threads_Dump();
 extern tThread	*Threads_CloneTCB(Uint *Err, Uint Flags);
-extern void	Isr7();
+extern void	Isr8();	// Double Fault
 
 // === PROTOTYPES ===
 void	ArchThreads_Init();
@@ -72,7 +74,12 @@ char	gaDoubleFaultStack[1024];
 tTSS	gDoubleFault_TSS = {
 	.ESP0 = (Uint)&gaDoubleFaultStack[1023],
 	.SS0 = 0x10,
-	.EIP = (Uint)Isr7
+	.CR3 = (Uint)gaInitPageDir - KERNEL_BASE,
+	.EIP = (Uint)Isr8,
+	.ESP = (Uint)&gaDoubleFaultStack[1023],
+	.CS = 0x08,	.SS = 0x10,
+	.DS = 0x10,	.ES = 0x10,
+	.FS = 0x10,	.GS = 0x10,
 };
 
 // === CODE ===
@@ -277,6 +284,17 @@ void ArchThreads_Init()
 	gGDT[5].BaseMid = (Uint)&gDoubleFault_TSS >> 16;
 	gGDT[5].BaseHi = (Uint)&gDoubleFault_TSS >> 24;
 	
+	Log_Debug("Proc", "gIDT[8] = {OffsetLo:%04x, CS:%04x, Flags:%04x, OffsetHi:%04x}", 
+		gIDT[8].OffsetLo, gIDT[8].CS, gIDT[8].Flags, gIDT[8].OffsetHi);
+	gIDT[8].OffsetLo = 0;
+	gIDT[8].CS = 5<<3;
+	gIDT[8].Flags = 0x8500;
+	gIDT[8].OffsetHi = 0;
+	Log_Debug("Proc", "gIDT[8] = {OffsetLo:%04x, CS:%04x, Flags:%04x, OffsetHi:%04x}", 
+		gIDT[8].OffsetLo, gIDT[8].CS, gIDT[8].Flags, gIDT[8].OffsetHi);
+	
+	//__asm__ __volatile__ ("xchg %bx, %bx");
+	
 	#if USE_MP
 	// Initialise Normal TSS(s)
 	for(pos=0;pos<giNumCPUs;pos++)
@@ -761,6 +779,14 @@ void Proc_Scheduler(int CPU)
 	#else
 		__asm__ __volatile__ ("mov %0, %%cr3"::"a"(thread->MemState.CR3));
 	#endif
+	
+	#if 0
+	if(thread->SavedState.ESP > 0xC0000000
+	&& thread->SavedState.ESP < thread->KernelStack-0x2000) {
+		Log_Warning("Proc", "Possible bad ESP %p (PID %i)", thread->SavedState.ESP);
+	}
+	#endif
+	
 	// Switch threads
 	__asm__ __volatile__ (
 		"mov %1, %%esp\n\t"	// Restore ESP