From: John Hodge <tpg@ucc.asn.au>
Date: Tue, 24 Apr 2012 07:06:23 +0000 (+0800)
Subject: Merge branch 'master' of git.mutabah.net:acess2
X-Git-Tag: rel0.15~711^2
X-Git-Url: https://git.ucc.asn.au/?a=commitdiff_plain;h=4538ee944b71b52f183809978cccfe60143d70c5;p=tpg%2Facess2.git

Merge branch 'master' of git.mutabah.net:acess2
---

4538ee944b71b52f183809978cccfe60143d70c5
diff --cc KernelLand/Kernel/arch/x86/vm8086.c
index d93bdf18,f4e98c4c..44c60dff
--- a/KernelLand/Kernel/arch/x86/vm8086.c
+++ b/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;