X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Kernel%2Farch%2Fx86%2Ferrors.c;h=15fe22b0002edc3336476b945382b1c73aba52f5;hb=b68b764267d33a45539b4c910db13fbdae48f193;hp=22ad1a39afda8d45fc16a80196c79f7e3609bd89;hpb=3764c294f21229bdf700f436fa4884f5e76e0d3a;p=tpg%2Facess2.git

diff --git a/Kernel/arch/x86/errors.c b/Kernel/arch/x86/errors.c
index 22ad1a39..15fe22b0 100644
--- a/Kernel/arch/x86/errors.c
+++ b/Kernel/arch/x86/errors.c
@@ -12,20 +12,22 @@
 // === IMPORTS ===
 extern void	MM_PageFault(Uint Addr, Uint ErrorCode, tRegs *Regs);
 extern void	VM8086_GPF(tRegs *Regs);
-extern void Threads_Dump(void);
+extern void	Threads_Dump(void);
 extern void	Threads_Fault(int Num);
 extern int	GetCPUNum(void);
+extern void	MM_DumpTables(tVAddr, tVAddr);
 
 // === PROTOTYPES ===
 void	__stack_chk_fail(void);
 void	ErrorHandler(tRegs *Regs);
+void	Proc_PrintBacktrace(void);
 void	Error_Backtrace(Uint eip, Uint ebp);
 void	StartupPrint(char *Str);
 
 // === GLOBALS ===
 const char *csaERROR_NAMES[] = {
 	"Divide By Zero", "Debug", "NMI Exception", "INT3",
-	"INTO", "Out of Bounds", "Invalid Opcode", "Coprocessor not avaliable",
+	"INTO Instr - Overflow", "BOUND Instr - 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",
@@ -75,6 +77,7 @@ void ErrorHandler(tRegs *Regs)
 	// 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 ;
@@ -93,6 +96,7 @@ void ErrorHandler(tRegs *Regs)
 			csaERROR_NAMES[Regs->int_num], Regs->err_code);
 		Log_Warning("Arch", "at CS:EIP %04x:%08x",
 			Regs->cs, Regs->eip);
+		MM_DumpTables(0, KERNEL_BASE);
 		switch( Regs->int_num )
 		{
 		// Division by Zero
@@ -157,6 +161,14 @@ void ErrorHandler(tRegs *Regs)
 	
 	for(;;)	__asm__ __volatile__ ("hlt");
 }
+
+void Proc_PrintBacktrace(void)
+{
+	Uint32	ebp;
+	__asm__ __volatile__ ("mov %%ebp, %0" : "=r" (ebp));
+	Error_Backtrace( *(Uint32*)(ebp+4), *(Uint32*)ebp );
+}
+
 /**
  * \fn void Error_Backtrace(Uint eip, Uint ebp)
  * \brief Unrolls the stack to trace execution