X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Kernel%2Farch%2Fx86%2Ferrors.c;h=c66e49d193c268f3a2a26d0862ba336864c60a26;hb=c5de7b08d4a82908a5acf6454fd7836bdab68715;hp=1e0278b6ab9f691211e0bf959c40828beffa7e30;hpb=2d83a99f3202f0e4688b58405f67604a24420861;p=tpg%2Facess2.git

diff --git a/Kernel/arch/x86/errors.c b/Kernel/arch/x86/errors.c
index 1e0278b6..c66e49d1 100644
--- a/Kernel/arch/x86/errors.c
+++ b/Kernel/arch/x86/errors.c
@@ -12,20 +12,24 @@
 // === 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);
+extern void	Proc_EnableSSE(void);
+extern void	Proc_RestoreSSE(Uint32 Data);
 
 // === 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",
@@ -60,13 +64,44 @@ void ErrorHandler(tRegs *Regs)
 	
 	__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 ;
 	}
+
+	// #NM - Coprocessor unavaliable
+	if(Regs->int_num == 7)
+	{
+		tThread	*thread = Proc_GetCurThread();
+		if(!thread->SavedState.bSSEModified)
+		{
+			Proc_EnableSSE();
+			if(!thread->SavedState.SSE)
+				thread->SavedState.SSE = malloc(sizeof(tSSEState) + 0xF);
+			else
+				Proc_RestoreSSE( ((Uint)thread->SavedState.SSE + 0xF) & ~0xF );
+			thread->SavedState.bSSEModified = 1;
+			__asm__ __volatile__ ("sti");
+			return ;
+		}
+		// oops, SSE enabled but a #NM, bad news
+	}
 	
 	// VM8086 GPF
 	if(Regs->int_num == 13 && Regs->eflags & 0x20000)
@@ -81,6 +116,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
@@ -145,6 +181,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