X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Kernel%2Farch%2Fx86_64%2Ferrors.c;h=0d5ede6fa5667f55729f69ec8e52ab95933467a3;hb=2ebf89999759fc9d1ece6f98dfd439170995bb28;hp=6fe9298bed5d05cf5ee0ed19269fff1b366e7e6d;hpb=94ccf379b209c4729cb8790a633538f9e4df6a50;p=tpg%2Facess2.git

diff --git a/Kernel/arch/x86_64/errors.c b/Kernel/arch/x86_64/errors.c
index 6fe9298b..0d5ede6f 100644
--- a/Kernel/arch/x86_64/errors.c
+++ b/Kernel/arch/x86_64/errors.c
@@ -4,9 +4,13 @@
  */
 #include <acess.h>
 #include <proc.h>
+#include <mm_virt.h>
+
+#define MAX_BACKTRACE	6
 
 // === IMPORTS ===
 void	MM_PageFault(tVAddr Addr, Uint ErrorCode, tRegs *Regs);
+void	Error_Backtrace(Uint IP, Uint BP);
 
 // === PROTOTYPES ===
 void	Error_Handler(tRegs *Regs);
@@ -37,7 +41,7 @@ void Error_Handler(tRegs *Regs)
 	Debug_KernelPanic();
 	
 	Log("CPU Error %x, Code: 0x%x", Regs->IntNum, Regs->ErrorCode);
-	Log(" - %s", csaERROR_NAMES[Regs->IntNum]);
+//	Log(" - %s", csaERROR_NAMES[Regs->IntNum]);
 	Log(" CS:RIP = 0x%04x:%016llx", Regs->CS, Regs->RIP);
 	Log(" SS:RSP = 0x%04x:%016llx", Regs->SS, Regs->RSP);
 	Log(" RFLAGS = 0x%016llx", Regs->RFlags);
@@ -77,3 +81,52 @@ void Error_Handler(tRegs *Regs)
 	for(;;)
 		__asm__ __volatile__ ("hlt");
 }
+
+/**
+ * \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 IP, Uint BP)
+{
+	 int	i = 0;
+	
+	//if(eip < 0xC0000000 && eip > 0x1000)
+	//{
+	//	LogF("Backtrace: User - 0x%x\n", eip);
+	//	return;
+	//}
+	
+	if( IP > MM_USER_MAX && IP < MM_KERNEL_CODE
+	 && (MM_MODULE_MIN > IP || IP > MM_MODULE_MAX)
+		)
+	{
+		LogF("Backtrace: Data Area - %p\n", IP);
+		return;
+	}
+	
+	//str = Debug_GetSymbol(eip, &delta);
+	//if(str == NULL)
+		LogF("Backtrace: %p", IP);
+	//else
+	//	LogF("Backtrace: %s+0x%x", str, delta);
+	if( !MM_GetPhysAddr(BP) )
+	{
+		LogF("\nBacktrace: Invalid BP, stopping\n");
+		return;
+	}
+	
+	
+	while( MM_GetPhysAddr(BP) && MM_GetPhysAddr(BP+8+7) && i < MAX_BACKTRACE )
+	{
+		//str = Debug_GetSymbol(*(Uint*)(ebp+4), &delta);
+		//if(str == NULL)
+			LogF(" >> 0x%llx", ((Uint*)BP)[1]);
+		//else
+		//	LogF(" >> %s+0x%x", str, delta);
+		BP = ((Uint*)BP)[0];
+		i++;
+	}
+	LogF("\n");
+}