X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Kernel%2Farch%2Fx86%2Ferrors.c;h=31c385fc7d77a17bc822c0c735e7e86ed8a3863e;hb=54746c855c6e2fe42fde9f93b0ce3f41aeefc2e5;hp=0c2da16e8fada30dab670431e1e29830ac4fb9e3;hpb=9d3800f60f2212432e550a4e003ae65b498a4d36;p=tpg%2Facess2.git

diff --git a/Kernel/arch/x86/errors.c b/Kernel/arch/x86/errors.c
index 0c2da16e..31c385fc 100644
--- a/Kernel/arch/x86/errors.c
+++ b/Kernel/arch/x86/errors.c
@@ -3,19 +3,39 @@
  * arch/x86/errors.c
  * - CPU Error Handler
  */
-#include <common.h>
+#include <acess.h>
+#include <proc.h>
 
 // === CONSTANTS ===
 #define	MAX_BACKTRACE	8	//!< Maximum distance to trace the stack backwards
 
 // === IMPORTS ===
 extern void	MM_PageFault(Uint Addr, Uint ErrorCode, tRegs *Regs);
+extern void	VM8086_GPF(tRegs *Regs);
 extern void Threads_Dump();
 
 // === 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()
+{
+	Panic("FATAL ERROR: Stack Check Failed\n");
+	for(;;);
+}
+
 /**
  * \fn void ErrorHandler(tRegs *Regs)
  * \brief General Error Handler
@@ -23,8 +43,15 @@ void	Error_Backtrace(Uint eip, Uint ebp);
 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));
@@ -32,24 +59,44 @@ 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 ;
+	}
+	
+	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", 0x10, (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);
@@ -111,3 +158,31 @@ void Error_Backtrace(Uint eip, Uint ebp)
 	}
 	LogF("\n");
 }
+
+/**
+ * \fn void StartupPrint(char *Str)
+ */
+void StartupPrint(char *Str)
+{
+	Uint16	*buf = (void*)0xC00B8000;
+	 int	i = 0;
+	static int	line = 0;
+	while(*Str)
+	{
+		buf[line*80 + i++] = *Str | 0x0700;
+		Str ++;
+	}
+	
+	while(i < 80)	buf[line*80 + i++] = 0x0720;
+	
+	line ++;
+	if(line == 25)
+	{
+		line --;
+		memcpy(buf, &buf[80], 80*24*2);
+		memset(&buf[80*24], 0, 80*2);
+	}
+}
+
+// === EXPORTS ===
+EXPORT(__stack_chk_fail);