VM8086 Support, Starting on VESA Driver

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

diff --git a/Kernel/arch/x86/errors.c b/Kernel/arch/x86/errors.c
index cfc7075..b53807a 100644 (file)
--- a/Kernel/arch/x86/errors.c
+++ b/Kernel/arch/x86/errors.c
@@ -11,6 +11,7 @@
 
 // === IMPORTS ===
 extern void    MM_PageFault(Uint Addr, Uint ErrorCode, tRegs *Regs);
+extern void    VM8086_GPF(tRegs *Regs);
 extern void Threads_Dump();
 
 // === PROTOTYPES ===
@@ -44,6 +45,9 @@ void ErrorHandler(tRegs *Regs)
        Uint    cr;
        __asm__ __volatile__ ("cli");
        
+       //Log_Debug("X86", "Error %i at 0x%08x", Regs->int_num, Regs->eip);
+       
+       // Page Fault
        if(Regs->int_num == 14)
        {
                __asm__ __volatile__ ("mov %%cr2, %0":"=r"(cr));
@@ -51,6 +55,13 @@ void ErrorHandler(tRegs *Regs)
                return ;
        }
        
+       // VM8086 GPF
+       if(Regs->int_num == 13 && Regs->eflags & 0x20000)
+       {
+               VM8086_GPF(Regs);
+               return ;
+       }
+       
        Warning("CPU Error %i - %s, Code: 0x%x",
                Regs->int_num, csaERROR_NAMES[Regs->int_num], Regs->err_code);
        Warning(" CS:EIP = 0x%04x:%08x", Regs->cs, Regs->eip);