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

ifdef

Browse Source
This commit is contained in:
Stanislav Shwartsman 2010-03-12 20:30:12 +00:00
parent a69d3b002c
commit 6dd9c7d5f5
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bochs/cpu/cpu.h
View File

@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////
// $Id: cpu.h,v 1.647 2010-03-07 09:16:24 sshwarts Exp $ // $Id: cpu.h,v 1.648 2010-03-12 20:30:12 sshwarts Exp $
///////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////
// //
// Copyright (C) 2001-2009 The Bochs Project // Copyright (C) 2001-2009 The Bochs Project
@ -3390,8 +3390,10 @@ public: // for now...
BX_SMF void init_VMCS(void); BX_SMF void init_VMCS(void);
BX_SMF void register_vmx_state(bx_param_c *parent); BX_SMF void register_vmx_state(bx_param_c *parent);
BX_SMF Bit64s VMX_TSC_Offset(void); BX_SMF Bit64s VMX_TSC_Offset(void);
#if BX_SUPPORT_X86_64
BX_SMF Bit32u VMX_Read_TPR_Shadow(void); BX_SMF Bit32u VMX_Read_TPR_Shadow(void);
BX_SMF void VMX_Write_TPR_Shadow(Bit8u tpr_shadow); BX_SMF void VMX_Write_TPR_Shadow(Bit8u tpr_shadow);
#endif
// vmexit reasons // vmexit reasons
BX_SMF void VMexit_Instruction(bxInstruction_c *i, Bit32u reason) BX_CPP_AttrRegparmN(2); BX_SMF void VMexit_Instruction(bxInstruction_c *i, Bit32u reason) BX_CPP_AttrRegparmN(2);
BX_SMF void VMexit_Event(bxInstruction_c *i, unsigned type, unsigned vector, BX_SMF void VMexit_Event(bxInstruction_c *i, unsigned type, unsigned vector,

6
bochs/cpu/vmexit.cc
View File

@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////
// $Id: vmexit.cc,v 1.14 2010-03-03 15:12:44 sshwarts Exp $ // $Id: vmexit.cc,v 1.15 2010-03-12 20:30:12 sshwarts Exp $
///////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////
// //
// Copyright (c) 2009 Stanislav Shwartsman // Copyright (c) 2009 Stanislav Shwartsman
@ -673,6 +673,8 @@ void BX_CPP_AttrRegparmN(2) BX_CPU_C::VMexit_DR_Access(bxInstruction_c *i, unsig
} }
} }
#if BX_SUPPORT_X86_64
Bit32u BX_CPU_C::VMX_Read_TPR_Shadow(void) Bit32u BX_CPU_C::VMX_Read_TPR_Shadow(void)
{ {
bx_phy_address pAddr = BX_CPU_THIS_PTR vmcs.virtual_apic_page_addr + 0x80; bx_phy_address pAddr = BX_CPU_THIS_PTR vmcs.virtual_apic_page_addr + 0x80;
@ -700,4 +702,6 @@ void BX_CPU_C::VMX_Write_TPR_Shadow(Bit8u tpr_shadow)
} }
} }
#endif
#endif // BX_SUPPORT_VMX #endif // BX_SUPPORT_VMX