X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Kernel%2Farch%2Fx86%2Ferrors.c;h=d1d9cb7280d5cd842ba22971cf9fe3ab72532f43;hb=5beb98670f040b2d4e697e4d8690cd46d2d30cf3;hp=cfc707532f74a7b8f2862fe22489d5f23e78f106;hpb=a0f4dde15a97a206bf88109fecde52576b373109;p=tpg%2Facess2.git

diff --git a/Kernel/arch/x86/errors.c b/Kernel/arch/x86/errors.c
index cfc70753..d1d9cb72 100644
--- a/Kernel/arch/x86/errors.c
+++ b/Kernel/arch/x86/errors.c
@@ -11,7 +11,9 @@
 
 // === 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);
@@ -42,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));
@@ -51,10 +60,43 @@ void ErrorHandler(tRegs *Regs)
 		return ;
 	}
 	
+	// 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 ECX %08x EDX %08x EBX %08x",
 		Regs->eax, Regs->ecx, Regs->edx, Regs->ebx);
@@ -73,7 +115,7 @@ void ErrorHandler(tRegs *Regs)
 	
 	switch( Regs->int_num )
 	{
-	case 6:
+	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);