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

cleanups of vmcs mapping related stuff

Browse Source
This commit is contained in:
Stanislav Shwartsman 2015-07-07 21:06:56 +00:00
parent e9f9f824be
commit 9315742f3d
3 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
bochs/cpu/cpuid.cc
View File

@ -33,6 +33,12 @@ bx_cpuid_t::bx_cpuid_t(BX_CPU_C *_cpu): cpu(_cpu)
}
#if BX_SUPPORT_VMX
bx_cpuid_t::bx_cpuid_t(BX_CPU_C *_cpu, Bit32u vmcs_revision):
cpu(_cpu), vmcs_map(vmcs_revision)
{
init();
}
bx_cpuid_t::bx_cpuid_t(BX_CPU_C *_cpu, Bit32u vmcs_revision, const char *filename):
cpu(_cpu), vmcs_map(vmcs_revision, filename)
{

1
bochs/cpu/cpuid.h
View File

@ -127,6 +127,7 @@ class bx_cpuid_t {
public:
bx_cpuid_t(BX_CPU_C *_cpu);
#if BX_SUPPORT_VMX
bx_cpuid_t(BX_CPU_C *_cpu, Bit32u vmcs_revision);
bx_cpuid_t(BX_CPU_C *_cpu, Bit32u vmcs_revision, const char *filename);
#endif
virtual ~bx_cpuid_t() {}

8
bochs/cpu/vmcs.cc
View File

@ -38,8 +38,11 @@ VMCS_Mapping::VMCS_Mapping(Bit32u revision): revision_id(revision)
VMCS_Mapping::VMCS_Mapping(Bit32u revision, const char *filename): revision_id(revision)
{
clear();
// read mapping from file
BX_PANIC(("Reading VMCS mapping from file not implemented yet"));
init_generic_mapping(); // for now
}
BX_CPP_INLINE Bit32u vmcs_encoding(Bit32u type, Bit32u field)
@ -50,7 +53,6 @@ BX_CPP_INLINE Bit32u vmcs_encoding(Bit32u type, Bit32u field)
void VMCS_Mapping::init_generic_mapping()
{
#if 1
// try to build generic VMCS map
// 16 types, 48 encodings (0x30), 4 bytes each field => 3072 bytes
// reserve VMCS_DATA_OFFSET bytes in the beginning for special (hidden) VMCS fields
@ -68,10 +70,6 @@ void VMCS_Mapping::init_generic_mapping()
BX_DEBUG(("VMCS field 0x%08x located at 0x%08x", encoding, vmcs_map[type][field]));
}
}
#else
// define your own VMCS format
#include "vmcs.h"
#endif
}
void VMCS_Mapping::clear()