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

diff --git a/Kernel/arch/x86/errors.c b/Kernel/arch/x86/errors.c
index d1d9cb72..dcedcd5c 100644
--- a/Kernel/arch/x86/errors.c
+++ b/Kernel/arch/x86/errors.c
@@ -14,9 +14,13 @@ extern void	MM_PageFault(Uint Addr, Uint ErrorCode, tRegs *Regs);
 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[] = {
@@ -31,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(;;);
@@ -40,6 +47,7 @@ void __stack_chk_fail()
 /**
  * \fn void ErrorHandler(tRegs *Regs)
  * \brief General Error Handler
+ * \param Regs	Register state at error
  */
 void ErrorHandler(tRegs *Regs)
 {
@@ -52,9 +60,22 @@ 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 ;
@@ -90,9 +111,16 @@ void ErrorHandler(tRegs *Regs)
 	}
 	
 	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);
+	
+	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
@@ -133,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)
 {
@@ -185,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)
 {
@@ -197,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)