Various Changes

[tpg/acess2.git] / Kernel / arch / x86 / errors.c

diff --git a/Kernel/arch/x86/errors.c b/Kernel/arch/x86/errors.c
index 2c3582c..b9ff17d 100644 (file)
--- a/Kernel/arch/x86/errors.c
+++ b/Kernel/arch/x86/errors.c
@@ -4,11 +4,18 @@
  * - CPU Error Handler
  */
 #include <common.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 Threads_Dump();
 
+// === PROTOTYPES ===
+void   Error_Backtrace(Uint eip, Uint ebp);
+
 // === CODE ===
 /**
  * \fn void ErrorHandler(tRegs *Regs)
@@ -45,8 +52,63 @@ void ErrorHandler(tRegs *Regs)
        __asm__ __volatile__ ("mov %%cr3, %0":"=r"(cr));
        Warning(" CR3: 0x%08x", cr);
        
+       // Print Stack Backtrace
+       Error_Backtrace(Regs->eip, Regs->ebp);
+       
        // Dump running threads
        Threads_Dump();
        
        for(;;) __asm__ __volatile__ ("hlt");
 }
+/**
+ * \fn void Error_Backtrace(Uint eip, Uint ebp)
+ * \brief Unrolls the stack to trace execution
+ */
+void Error_Backtrace(Uint eip, Uint ebp)
+{
+        int    i = 0;
+       Uint    delta = 0;
+       char    *str = NULL;
+       
+       //if(eip < 0xC0000000 && eip > 0x1000)
+       //{
+       //      LogF("Backtrace: User - 0x%x\n", eip);
+       //      return;
+       //}
+       
+       if(eip > 0xE0000000)
+       {
+               LogF("Backtrace: Data Area - 0x%x\n", eip);
+               return;
+       }
+       
+       if(eip > 0xC8000000)
+       {
+               LogF("Backtrace: Kernel Module - 0x%x\n", eip);
+               return;
+       }
+       
+       //str = Debug_GetSymbol(eip, &delta);
+       if(str == NULL)
+               LogF("Backtrace: 0x%x", eip);
+       else
+               LogF("Backtrace: %s+0x%x", str, delta);
+       if(!MM_GetPhysAddr(ebp))
+       {
+               LogF("\nBacktrace: Invalid EBP, stopping\n");
+               return;
+       }
+       
+       
+       while( MM_GetPhysAddr(ebp) && i < MAX_BACKTRACE )
+       {
+               //str = Debug_GetSymbol(*(Uint*)(ebp+4), &delta);
+               if(str == NULL)
+                       LogF(" >> 0x%x", *(Uint*)(ebp+4));
+               else
+                       LogF(" >> %s+0x%x", str, delta);
+               ebp = *(Uint*)ebp;
+               i++;
+       }
+       LogF("\n");
+}