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

diff --git a/Kernel/arch/x86/errors.c b/Kernel/arch/x86/errors.c
index cfc70753..dcedcd5c 100644
--- a/Kernel/arch/x86/errors.c
+++ b/Kernel/arch/x86/errors.c
@@ -11,10 +11,16 @@
 
 // === 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);
+extern int	GetCPUNum(void);
 
 // === PROTOTYPES ===
+void	__stack_chk_fail(void);
+void	ErrorHandler(tRegs *Regs);
 void	Error_Backtrace(Uint eip, Uint ebp);
+void	StartupPrint(char *Str);
 
 // === GLOBALS ===
 const char *csaERROR_NAMES[] = {
@@ -29,7 +35,10 @@ const char *csaERROR_NAMES[] = {
 	};
 
 // === CODE ===
-void __stack_chk_fail()
+/**
+ * \brief Keeps GCC happy
+ */
+void __stack_chk_fail(void)
 {
 	Panic("FATAL ERROR: Stack Check Failed\n");
 	for(;;);
@@ -38,23 +47,84 @@ void __stack_chk_fail()
 /**
  * \fn void ErrorHandler(tRegs *Regs)
  * \brief General Error Handler
+ * \param Regs	Register state at error
  */
 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");
 	
+	// Debug exception (used for single-stepping)
+	if(Regs->int_num == 1)
+	{
+		static Uint32	lastEIP = 0;
+		tThread	*thread = Proc_GetCurThread();
+		if( Regs->eip == lastEIP )
+			return;
+		Log("%p(%i %s) IP=%08x", thread, thread->TID, thread->ThreadName, Regs->eip);
+		lastEIP = Regs->eip;
+		return ;
+	}
+	
+	// Page Fault
 	if(Regs->int_num == 14)
 	{
+		__asm__ __volatile__ ("sti");	// Should be OK, TODO: Test
 		__asm__ __volatile__ ("mov %%cr2, %0":"=r"(cr));
 		MM_PageFault( cr, Regs->err_code, Regs );
 		return ;
 	}
 	
-	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);
+	// 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();
+	
+	LogF("CPU %i Error %i - %s, Code: 0x%x - At %08x",
+		GetCPUNum(),
+		Regs->int_num, csaERROR_NAMES[Regs->int_num], Regs->err_code,
+		Regs->eip);
+	
+	//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);
+	__ASM__ ("xchg %bx, %bx");
+	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 +143,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);
@@ -91,6 +161,8 @@ void ErrorHandler(tRegs *Regs)
 /**
  * \fn void Error_Backtrace(Uint eip, Uint ebp)
  * \brief Unrolls the stack to trace execution
+ * \param eip	Current Instruction Pointer
+ * \param ebp	Current Base Pointer (Stack Frame)
  */
 void Error_Backtrace(Uint eip, Uint ebp)
 {
@@ -143,6 +215,8 @@ void Error_Backtrace(Uint eip, Uint ebp)
 
 /**
  * \fn void StartupPrint(char *Str)
+ * \brief Str	String to print
+ * \note WHY IS THIS HERE?!?!
  */
 void StartupPrint(char *Str)
 {
@@ -155,7 +229,9 @@ void StartupPrint(char *Str)
 		Str ++;
 	}
 	
-	while(i < 80)	buf[line*80 + i++] = 0x0720;
+	// Clear the rest of the line
+	while(i < 80)
+		buf[line*80 + i++] = 0x0720;
 	
 	line ++;
 	if(line == 25)