X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Kernel%2Farch%2Fx86%2Ferrors.c;h=3ae4bb28ea7141c5fdd8f3e312e0bc5d453de1b6;hb=4b80e9762374558077e28e321d75029645529a45;hp=2f94972cc93667fe7e176a5a39be419b7d85f4a7;hpb=5fc81fa5e050f48374a6aff5636f3e60313dfc78;p=tpg%2Facess2.git

diff --git a/Kernel/arch/x86/errors.c b/Kernel/arch/x86/errors.c
index 2f94972c..3ae4bb28 100644
--- a/Kernel/arch/x86/errors.c
+++ b/Kernel/arch/x86/errors.c
@@ -3,7 +3,7 @@
  * arch/x86/errors.c
  * - CPU Error Handler
  */
-#include <common.h>
+#include <acess.h>
 #include <proc.h>
 
 // === CONSTANTS ===
@@ -11,13 +11,27 @@
 
 // === IMPORTS ===
 extern void	MM_PageFault(Uint Addr, Uint ErrorCode, tRegs *Regs);
-extern void Threads_Dump();
+extern void	VM8086_GPF(tRegs *Regs);
+extern void Threads_Dump(void);
+extern void	Threads_Fault(int Num);
 
 // === PROTOTYPES ===
 void	Error_Backtrace(Uint eip, Uint ebp);
 
+// === GLOBALS ===
+const char *csaERROR_NAMES[] = {
+	"Divide By Zero", "Debug", "NMI Exception", "INT3",
+	"INTO", "Out of Bounds", "Invalid Opcode", "Coprocessor not avaliable",
+	"Double Fault", "Coprocessor Segment Overrun", "Bad TSS", "Segment Not Present",
+	"Stack Fault Exception", "GPF", "#PF", "Reserved",
+	"Floating Point Exception", "Alignment Check Exception", "Machine Check Exception",	"Reserved",
+	"Reserved", "Reserved", "Reserved", "Reserved",
+	"Reserved", "Reserved", "Reserved", "Reserved",
+	"Reserved", "Reserved", "Reserved", "Reserved"
+	};
+
 // === CODE ===
-void __stack_chk_fail()
+void __stack_chk_fail(void)
 {
 	Panic("FATAL ERROR: Stack Check Failed\n");
 	for(;;);
@@ -30,8 +44,15 @@ void __stack_chk_fail()
 void ErrorHandler(tRegs *Regs)
 {
 	Uint	cr;
+	
+	//if( Regs && !(Regs->int_num == 13 && Regs->eflags & 0x20000) )
+	//	__asm__ __volatile__ ("xchg %bx, %bx");
+	//Log_Debug("X86", "Regs = %p", Regs);
+	//Log_Debug("X86", "Error %i at 0x%08x", Regs->int_num, Regs->eip);
+	
 	__asm__ __volatile__ ("cli");
 	
+	// Page Fault
 	if(Regs->int_num == 14)
 	{
 		__asm__ __volatile__ ("mov %%cr2, %0":"=r"(cr));
@@ -39,24 +60,67 @@ void ErrorHandler(tRegs *Regs)
 		return ;
 	}
 	
-	Warning("CPU Error %i, Code: 0x%x", Regs->int_num, Regs->err_code);
+	// VM8086 GPF
+	if(Regs->int_num == 13 && Regs->eflags & 0x20000)
+	{
+		VM8086_GPF(Regs);
+		return ;
+	}
+	
+	// Check if it's a user mode fault
+	if( Regs->eip < KERNEL_BASE || (Regs->cs & 3) == 3 ) {
+		Log_Warning("Arch", "User Fault -  %s, Code: 0x%x",
+			csaERROR_NAMES[Regs->int_num], Regs->err_code);
+		Log_Warning("Arch", "at CS:EIP %04x:%08x",
+			Regs->cs, Regs->eip);
+		switch( Regs->int_num )
+		{
+		// Division by Zero
+		case  0:	Threads_Fault(FAULT_DIV0);	break;
+		// Invalid opcode
+		case  6:	Threads_Fault(FAULT_OPCODE);	break;
+		// GPF
+		case 13:	Threads_Fault(FAULT_ACCESS);	break;
+		// Floating Point Exception
+		case 16:	Threads_Fault(FAULT_FLOAT);	break;
+		
+		default:	Threads_Fault(FAULT_MISC);	break;
+		}
+		return ;
+	}
+	
+	Debug_KernelPanic();
+	Warning("CPU Error %i - %s, Code: 0x%x",
+		Regs->int_num, csaERROR_NAMES[Regs->int_num], Regs->err_code);
 	Warning(" CS:EIP = 0x%04x:%08x", Regs->cs, Regs->eip);
-	Warning(" SS:ESP = 0x%04x:%08x", Regs->ss, Regs->esp);
+	if(Regs->cs == 0x08)
+		Warning(" SS:ESP = 0x0010:%08x", (Uint)Regs+sizeof(tRegs));
+	else
+		Warning(" SS:ESP = 0x%04x:%08x", Regs->ss, Regs->esp);
 	Warning(" EFLAGS = 0x%08x", Regs->eflags);
-	Warning(" EAX %08x EBX %08x", Regs->eax, Regs->ebx);
-	Warning(" ECX %08x EDX %08x", Regs->ecx, Regs->edx);
-	Warning(" ESP %08x EBP %08x", Regs->esp, Regs->ebp);
-	Warning(" ESI %08x EDI %08x", Regs->esi, Regs->edi);
-	Warning(" DS %04x ES %04x", Regs->ds, Regs->es);
-	Warning(" FS %04x GS %04x", Regs->fs, Regs->gs);
+	Warning(" EAX %08x ECX %08x EDX %08x EBX %08x",
+		Regs->eax, Regs->ecx, Regs->edx, Regs->ebx);
+	Warning(" ESP %08x EBP %08x ESI %08x EDI %08x",
+		Regs->esp, Regs->ebp, Regs->esi, Regs->edi);
+	Warning(" DS %04x ES %04x FS %04x GS %04x",
+		Regs->ds, Regs->es, Regs->fs, Regs->gs);
 	
 	// Control Registers
 	__asm__ __volatile__ ("mov %%cr0, %0":"=r"(cr));
-	Warning(" CR0: 0x%08x", cr);
+	Warning(" CR0 0x%08x", cr);
 	__asm__ __volatile__ ("mov %%cr2, %0":"=r"(cr));
-	Warning(" CR2: 0x%08x", cr);
+	Warning(" CR2 0x%08x", cr);
 	__asm__ __volatile__ ("mov %%cr3, %0":"=r"(cr));
-	Warning(" CR3: 0x%08x", cr);
+	Warning(" CR3 0x%08x", cr);
+	
+	switch( Regs->int_num )
+	{
+	case 6:	// #UD
+		Warning(" Offending bytes: %02x %02x %02x %02x",
+			*(Uint8*)Regs->eip+0, *(Uint8*)Regs->eip+1,
+			*(Uint8*)Regs->eip+2, *(Uint8*)Regs->eip+3);
+		break;
+	}
 	
 	// Print Stack Backtrace
 	Error_Backtrace(Regs->eip, Regs->ebp);
@@ -143,3 +207,6 @@ void StartupPrint(char *Str)
 		memset(&buf[80*24], 0, 80*2);
 	}
 }
+
+// === EXPORTS ===
+EXPORT(__stack_chk_fail);