mirrors/Bochs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

assert check

Browse Source
This commit is contained in:
Stanislav Shwartsman 2010-03-15 22:58:41 +00:00
parent d0e118a1d0
commit b8dfe6d9b1
2 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
bochs/cpu/smm.cc
View File

@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////
// $Id: smm.cc,v 1.63 2010-03-14 15:51:26 sshwarts Exp $ // $Id: smm.cc,v 1.64 2010-03-15 22:58:41 sshwarts Exp $
///////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////
// //
// Copyright (c) 2006-2009 Stanislav Shwartsman // Copyright (c) 2006-2009 Stanislav Shwartsman
@ -73,9 +73,15 @@ void BX_CPP_AttrRegparmN(1) BX_CPU_C::RSM(bxInstruction_c *i)
} }
#if BX_SUPPORT_VMX #if BX_SUPPORT_VMX
if (BX_CPU_THIS_PTR in_vmx_guest) { if (BX_CPU_THIS_PTR in_vmx) {
BX_ERROR(("VMEXIT: RSM in VMX non-root operation")); if (BX_CPU_THIS_PTR in_vmx_guest) {
VMexit(i, VMX_VMEXIT_RSM, 0); BX_ERROR(("VMEXIT: RSM in VMX non-root operation"));
VMexit(i, VMX_VMEXIT_RSM, 0);
}
else {
BX_ERROR(("RSM in VMX root operation !"));
exception(BX_UD_EXCEPTION, 0);
}
} }
#endif #endif

7
bochs/cpu/vmx.cc
View File

@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////
// $Id: vmx.cc,v 1.38 2010-03-15 16:34:03 sshwarts Exp $ // $Id: vmx.cc,v 1.39 2010-03-15 22:58:41 sshwarts Exp $
///////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////
// //
// Copyright (c) 2009 Stanislav Shwartsman // Copyright (c) 2009 Stanislav Shwartsman
@ -1758,6 +1758,10 @@ void BX_CPU_C::VMexit(bxInstruction_c *i, Bit32u reason, Bit64u qualification)
{ {
VMCS_CACHE *vm = &BX_CPU_THIS_PTR vmcs; VMCS_CACHE *vm = &BX_CPU_THIS_PTR vmcs;
if (!BX_CPU_THIS_PTR in_vmx || !BX_CPU_THIS_PTR in_vmx_guest) {
BX_PANIC(("PANIC: VMEXIT not in VMX guest mode !"));
}
// VMEXITs are FAULT-like: restore RIP/RSP to value before VMEXIT occurred // VMEXITs are FAULT-like: restore RIP/RSP to value before VMEXIT occurred
RIP = BX_CPU_THIS_PTR prev_rip; RIP = BX_CPU_THIS_PTR prev_rip;
if (BX_CPU_THIS_PTR speculative_rsp) if (BX_CPU_THIS_PTR speculative_rsp)
@ -2162,7 +2166,6 @@ void BX_CPP_AttrRegparmN(1) BX_CPU_C::VMLAUNCH(bxInstruction_c *i)
/////////////////////////////////////////////////////// ///////////////////////////////////////////////////////
VMenterInjectEvents(); VMenterInjectEvents();
#else #else
BX_INFO(("VMLAUNCH/VMRESUME: required VMX support, use --enable-vmx option")); BX_INFO(("VMLAUNCH/VMRESUME: required VMX support, use --enable-vmx option"));
exception(BX_UD_EXCEPTION, 0); exception(BX_UD_EXCEPTION, 0);