Merge branch 'master' of git.mutabah.net:acess2
authorJohn Hodge <[email protected]>
Tue, 24 Apr 2012 07:06:23 +0000 (15:06 +0800)
committerJohn Hodge <[email protected]>
Tue, 24 Apr 2012 07:06:23 +0000 (15:06 +0800)
1  2 
KernelLand/Kernel/arch/x86/vm8086.c

@@@ -321,18 -357,9 +357,18 @@@ void VM8086_GPF(tRegs *Regs
                }
                break;
        
 +      case 0x0F:
 +              opcode = *(Uint8*)( (Regs->cs*16) + (Regs->eip&0xFFFF));
 +              Log_Error("VM8086", "Error - Unknown opcode 0F %02x caused a GPF at %04x:%04x",
 +                      opcode, Regs->cs, Regs->eip);
 +              // Force an end to the call
 +              Regs->cs = VM8086_MAGIC_CS;
 +              Regs->eip = VM8086_MAGIC_IP;
 +              break;
 +
        default:
                Log_Error("VM8086", "Error - Unknown opcode %02x caused a GPF at %04x:%04x",
-                       opcode, Regs->cs, Regs->eip);
+                       opcode, Regs->cs, Regs->eip-1);
                // Force an end to the call
                Regs->cs = VM8086_MAGIC_CS;
                Regs->eip = VM8086_MAGIC_IP;

UCC git Repository :: git.ucc.asn.au