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

compilation fixes

Browse Source
This commit is contained in:
Stanislav Shwartsman 2010-03-13 21:06:56 +00:00
parent 97b4155f31
commit 36b0b3c682
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
bochs/cpu/Makefile.in
View File

@ -280,7 +280,7 @@ cpuid.o: cpuid.@CPP_SUFFIX@ ../bochs.h ../config.h ../osdep.h ../bx_debug/debug.
../gui/gui.h ../instrument/stubs/instrument.h cpu.h crregs.h \
descriptor.h instr.h lazy_flags.h icache.h apic.h ../cpu/i387.h \
../fpu/softfloat.h ../config.h ../fpu/tag_w.h ../fpu/status_w.h \
../fpu/control_w.h ../cpu/xmm.h vmx.h stack.h param_names.h
../fpu/control_w.h ../cpu/xmm.h vmx.h stack.h ../param_names.h
crc32.o: crc32.@CPP_SUFFIX@ ../bochs.h ../config.h ../osdep.h ../bx_debug/debug.h \
../config.h ../osdep.h ../bxversion.h ../gui/siminterface.h \
../memory/memory.h ../pc_system.h ../plugin.h ../extplugin.h \
@ -359,7 +359,7 @@ exception.o: exception.@CPP_SUFFIX@ ../bochs.h ../config.h ../osdep.h \
crregs.h descriptor.h instr.h lazy_flags.h icache.h apic.h \
../cpu/i387.h ../fpu/softfloat.h ../config.h ../fpu/tag_w.h \
../fpu/status_w.h ../fpu/control_w.h ../cpu/xmm.h vmx.h stack.h \
../iodev/iodev.h ../bochs.h ../param_names.h ../iodev/vga.h
../iodev/iodev.h ../bochs.h ../../param_names.h ../iodev/vga.h
fetchdecode.o: fetchdecode.@CPP_SUFFIX@ ../bochs.h ../config.h ../osdep.h \
../bx_debug/debug.h ../config.h ../osdep.h ../bxversion.h \
../gui/siminterface.h ../memory/memory.h ../pc_system.h ../plugin.h \
@ -410,7 +410,7 @@ init.o: init.@CPP_SUFFIX@ ../bochs.h ../config.h ../osdep.h ../bx_debug/debug.h
../gui/gui.h ../instrument/stubs/instrument.h cpu.h crregs.h \
descriptor.h instr.h lazy_flags.h icache.h apic.h ../cpu/i387.h \
../fpu/softfloat.h ../config.h ../fpu/tag_w.h ../fpu/status_w.h \
../fpu/control_w.h ../cpu/xmm.h vmx.h stack.h param_names.h
../fpu/control_w.h ../cpu/xmm.h vmx.h stack.h ../param_names.h
io.o: io.@CPP_SUFFIX@ ../bochs.h ../config.h ../osdep.h ../bx_debug/debug.h \
../config.h ../osdep.h ../bxversion.h ../gui/siminterface.h \
../memory/memory.h ../pc_system.h ../plugin.h ../extplugin.h \
@ -530,7 +530,7 @@ proc_ctrl.o: proc_ctrl.@CPP_SUFFIX@ ../bochs.h ../config.h ../osdep.h \
../extplugin.h ../gui/gui.h ../instrument/stubs/instrument.h cpu.h \
crregs.h descriptor.h instr.h lazy_flags.h icache.h apic.h \
../cpu/i387.h ../fpu/softfloat.h ../config.h ../fpu/tag_w.h \
../fpu/status_w.h ../fpu/control_w.h ../cpu/xmm.h vmx.h stack.h param_names.h
../fpu/status_w.h ../fpu/control_w.h ../cpu/xmm.h vmx.h stack.h ../param_names.h
protect_ctrl.o: protect_ctrl.@CPP_SUFFIX@ ../bochs.h ../config.h ../osdep.h \
../bx_debug/debug.h ../config.h ../osdep.h ../bxversion.h \
../gui/siminterface.h ../memory/memory.h ../pc_system.h ../plugin.h \

4
bochs/cpu/cpu.h
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////
// $Id: cpu.h,v 1.648 2010-03-12 20:30:12 sshwarts Exp $
// $Id: cpu.h,v 1.649 2010-03-13 21:06:56 sshwarts Exp $
/////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2001-2009 The Bochs Project
@ -3390,8 +3390,8 @@ public: // for now...
BX_SMF void init_VMCS(void);
BX_SMF void register_vmx_state(bx_param_c *parent);
BX_SMF Bit64s VMX_TSC_Offset(void);
#if BX_SUPPORT_X86_64
BX_SMF Bit32u VMX_Read_TPR_Shadow(void);
#if BX_SUPPORT_X86_64
BX_SMF void VMX_Write_TPR_Shadow(Bit8u tpr_shadow);
#endif
// vmexit reasons

6
bochs/cpu/vmexit.cc
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////
// $Id: vmexit.cc,v 1.15 2010-03-12 20:30:12 sshwarts Exp $
// $Id: vmexit.cc,v 1.16 2010-03-13 21:06:56 sshwarts Exp $
/////////////////////////////////////////////////////////////////////////
//
// Copyright (c) 2009 Stanislav Shwartsman
@ -673,8 +673,6 @@ 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)
{
bx_phy_address pAddr = BX_CPU_THIS_PTR vmcs.virtual_apic_page_addr + 0x80;
@ -686,6 +684,8 @@ Bit32u BX_CPU_C::VMX_Read_TPR_Shadow(void)
return (tpr_shadow >> 4) & 0xF;
}
#if BX_SUPPORT_X86_64
void BX_CPU_C::VMX_Write_TPR_Shadow(Bit8u tpr_shadow)
{
VMCS_CACHE *vm = &BX_CPU_THIS_PTR vmcs;