X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Kernel%2Farch%2Fx86_64%2Ferrors.c;h=9f1d290a0e878763c8ac568af563b5f4598e8956;hb=18b264927674c480481466c40368554fb72f560f;hp=361ccb0ebd65efa6edc5e608b6222826265ceb4b;hpb=13a3a306289f4eedd32220b3c335564f3a0a3772;p=tpg%2Facess2.git

diff --git a/Kernel/arch/x86_64/errors.c b/Kernel/arch/x86_64/errors.c
index 361ccb0e..9f1d290a 100644
--- a/Kernel/arch/x86_64/errors.c
+++ b/Kernel/arch/x86_64/errors.c
@@ -5,6 +5,9 @@
 #include <acess.h>
 #include <proc.h>
 
+// === IMPORTS ===
+void	MM_PageFault(tVAddr Addr, Uint ErrorCode, tRegs *Regs);
+
 // === PROTOTYPES ===
 void	Error_Handler(tRegs *Regs);
 
@@ -25,6 +28,12 @@ void Error_Handler(tRegs *Regs)
 {
 	Uint	cr;
 	
+	if( Regs->IntNum == 14 ) {
+		__asm__ __volatile__ ("mov %%cr2, %0":"=r"(cr));
+		MM_PageFault(cr, Regs->ErrorCode, Regs);
+		return ;
+	}
+	
 	Debug_KernelPanic();
 	
 	Log("CPU Error %x, Code: 0x%x", Regs->IntNum, Regs->ErrorCode);
@@ -58,8 +67,9 @@ void Error_Handler(tRegs *Regs)
 	{
 	case 6:	// #UD
 		Warning(" Offending bytes: %02x %02x %02x %02x",
-			*(Uint8*)Regs->RIP+0, *(Uint8*)Regs->RIP+1,
-			*(Uint8*)Regs->RIP+2, *(Uint8*)Regs->RIP+3);
+			*(Uint8*)(Regs->RIP+0), *(Uint8*)(Regs->RIP+1),
+			*(Uint8*)(Regs->RIP+2), *(Uint8*)(Regs->RIP+3)
+			);
 		break;
 	}