X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Kernel%2Farch%2Fx86%2Fkpanic.c;h=ccb107370d469d2240faafd67a28994de5d6cc66;hb=30e2436921e53b149d65403430048e39a44cad4b;hp=865b0d3baf2dcaa1736e40cfd7d6f9a9e2afc945;hpb=e617614d9e5ca900649d584524eacef768b1f1b9;p=tpg%2Facess2.git

diff --git a/Kernel/arch/x86/kpanic.c b/Kernel/arch/x86/kpanic.c
index 865b0d3b..ccb10737 100644
--- a/Kernel/arch/x86/kpanic.c
+++ b/Kernel/arch/x86/kpanic.c
@@ -6,11 +6,16 @@
 
 #include <acess.h>
 
+
+
 #define	FB	((Uint16 *)(KERNEL_BASE|0xB8000))
 #define BGC	0x4F00	// White on Red
 //#define BGC	0xC000	// Black on Bright Red
 //#define BGC	0x1F00	// White on Blue (BSOD!)
 
+extern Uint32	GetEIP(void);
+extern void	Error_Backtrace(Uint32 eip, Uint32 ebp);
+
  int	giKP_Pos = 0;
 
 const struct {
@@ -52,13 +57,23 @@ const struct {
 };
 #define	NUM_REGVALUES	(sizeof(caRegValues)/sizeof(caRegValues[0]))
 
+// === PROTOTYPES ===
+void	KernelPanic_SetMode(void);
+void	KernelPanic_PutChar(char Ch);
+
+// === CODE ===
 /**
  * \brief Sets the screen mode for a kernel panic
  */
-void KernelPanic_SetMode()
+void KernelPanic_SetMode(void)
 {
 	 int	i;
 	
+	// This function is called by Panic(), but MM_PageFault and the
+	// CPU exception handers also call it, so let's not clear the screen
+	// twice
+	if( giKP_Pos )	return ;
+	
 	// Restore VGA 0xB8000 text mode
 	#if 1
 	for( i = 0; i < NUM_REGVALUES; i++ )
@@ -80,6 +95,13 @@ void KernelPanic_SetMode()
 	{
 		FB[i] = BGC;
 	}
+	
+	{
+		Uint32	eip = GetEIP();
+		Uint32	ebp;
+		__asm__ __volatile__ ("mov %%ebp, %0" : "=r" (ebp));
+		Error_Backtrace(eip, ebp);
+	}
 }
 
 void KernelPanic_PutChar(char Ch)