X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Kernel%2Farch%2Fx86_64%2Ferrors.c;h=d1856db17758bc94b48d36837f981f2c4ac7db36;hb=340bda1dddf444ccf46fbc9e7a37bf6c3f0aeb6a;hp=711846c81ecb8ce2cca237b5cc97bf49acea4520;hpb=273ede03312a1b5c537d250403ff11065106e186;p=tpg%2Facess2.git

diff --git a/Kernel/arch/x86_64/errors.c b/Kernel/arch/x86_64/errors.c
index 711846c8..d1856db1 100644
--- a/Kernel/arch/x86_64/errors.c
+++ b/Kernel/arch/x86_64/errors.c
@@ -9,7 +9,7 @@
 #define MAX_BACKTRACE	6
 
 // === IMPORTS ===
-void	MM_PageFault(tVAddr Addr, Uint ErrorCode, tRegs *Regs);
+ int	MM_PageFault(tVAddr Addr, Uint ErrorCode, tRegs *Regs);
 void	Error_Backtrace(Uint IP, Uint BP);
 
 // === PROTOTYPES ===
@@ -34,11 +34,14 @@ void Error_Handler(tRegs *Regs)
 	
 	if( Regs->IntNum == 14 ) {
 		__asm__ __volatile__ ("mov %%cr2, %0":"=r"(cr));
-		MM_PageFault(cr, Regs->ErrorCode, Regs);
-		return ;
+		if( MM_PageFault(cr, Regs->ErrorCode, Regs) == 0 )
+			return ;
+	}
+	else {
+		Debug_KernelPanic();
+
+		Error_Backtrace(Regs->RIP, Regs->RBP);
 	}
-	
-	Debug_KernelPanic();
 	
 	Log("CPU Error %x, Code: 0x%x", Regs->IntNum, Regs->ErrorCode);
 //	Log(" - %s", csaERROR_NAMES[Regs->IntNum]);
@@ -98,8 +101,7 @@ void Error_Backtrace(Uint IP, Uint BP)
 	//	return;
 	//}
 	
-	if( IP > MM_USER_MAX
-	 && IP < MM_KERNEL_CODE
+	if( IP > USER_MAX && IP < MM_KERNEL_CODE
 	 && (MM_MODULE_MIN > IP || IP > MM_MODULE_MAX)
 		)
 	{
@@ -119,7 +121,7 @@ void Error_Backtrace(Uint IP, Uint BP)
 	}
 	
 	
-	while( MM_GetPhysAddr(BP) && i < MAX_BACKTRACE )
+	while( MM_GetPhysAddr(BP) && MM_GetPhysAddr(BP+8+7) && i < MAX_BACKTRACE )
 	{
 		//str = Debug_GetSymbol(*(Uint*)(ebp+4), &delta);
 		//if(str == NULL)