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

small cleanups

Browse Source
This commit is contained in:
Stanislav Shwartsman 2011-03-14 06:25:54 +00:00
parent 43650c4459
commit acd320699d
5 changed files with 14 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
bochs/cpu/cpu.h
View File

@ -634,13 +634,6 @@ typedef struct
#define BX_CPU_AVX_FMA 0x04000000 /* AVX FMA instruction */
#define BX_CPU_X86_64 0x08000000 /* x86-64 instruction */
struct cpuid_function_t {
Bit32u eax;
Bit32u ebx;
Bit32u ecx;
Bit32u edx;
};
#include "model_specific.h"
#include "crregs.h"
#include "descriptor.h"

13
bochs/cpu/cpuid.cc
View File

@ -24,7 +24,6 @@
#define NEED_CPU_REG_SHORTCUTS 1
#include "bochs.h"
#include "cpu.h"
#include "model_specific.h"
#define LOG_THIS BX_CPU_THIS_PTR
#include "param_names.h"
@ -635,7 +634,7 @@ void BX_CPU_C::set_cpuid_defaults(void)
// [29:29] Long Mode
// [30:30] AMD 3DNow! Extensions
// [31:31] AMD 3DNow! Instructions
unsigned features = BX_CPU_VENDOR_INTEL ? 0 : get_std_cpuid_features();
unsigned features = BX_CPU_VENDOR_INTEL ? 0 : get_std_cpuid_features();
features &= 0x0183F3FF;
#if BX_SUPPORT_3DNOW
// only AMD is interesting in AMD MMX extensions
@ -733,7 +732,7 @@ void BX_CPU_C::set_cpuid_defaults(void)
BX_INFO(("CPUID[0x80000006]: %08x %08x %08x %08x", cpuid->eax, cpuid->ebx, cpuid->ecx, cpuid->edx));
// ------------------------------------------------------
// CPUID function 0x00000007
// CPUID function 0x80000007
cpuid = &(BX_CPU_THIS_PTR cpuid_ext_function[7]);
cpuid->eax = 0;
@ -921,12 +920,6 @@ void BX_CPU_C::init_isa_features_bitmask(void)
xsave_enabled = SIM->get_param_bool(BXPN_CPUID_XSAVE)->get();
xapic_enabled = SIM->get_param_bool(BXPN_CPUID_XAPIC)->get();
sse_enabled = SIM->get_param_enum(BXPN_CPUID_SSE)->get();
#if BX_SUPPORT_X86_64
bx_bool fsgsbase_enabled = SIM->get_param_bool(BXPN_CPUID_FSGSBASE)->get();
#endif
#if BX_SUPPORT_MONITOR_MWAIT
bx_bool mwait_enabled = SIM->get_param_bool(BXPN_CPUID_MWAIT)->get();
#endif
#endif // BX_CPU_LEVEL >= 6
// sanity checks
@ -1022,6 +1015,7 @@ void BX_CPU_C::init_isa_features_bitmask(void)
features_bitmask |= BX_CPU_P6;
#if BX_SUPPORT_MONITOR_MWAIT
static bx_bool mwait_enabled = SIM->get_param_bool(BXPN_CPUID_MWAIT)->get();
if (mwait_enabled)
features_bitmask |= BX_CPU_MONITOR_MWAIT;
#endif
@ -1073,6 +1067,7 @@ void BX_CPU_C::init_isa_features_bitmask(void)
#if BX_SUPPORT_X86_64
features_bitmask |= BX_CPU_X86_64;
static bx_bool fsgsbase_enabled = SIM->get_param_bool(BXPN_CPUID_FSGSBASE)->get();
if (fsgsbase_enabled)
features_bitmask |= BX_CPU_FSGSBASE;
#endif

7
bochs/cpu/model_specific.h
View File

@ -24,6 +24,13 @@
#ifndef BX_CPU_MODEL_SPECIFIC
#define BX_CPU_MODEL_SPECIFIC
struct cpuid_function_t {
Bit32u eax;
Bit32u ebx;
Bit32u ecx;
Bit32u edx;
};
// CPUID defines - STD features CPUID[0x00000001].EDX
// ----------------------------

4
bochs/cpu/msr.cc
View File

@ -704,8 +704,8 @@ bx_bool BX_CPU_C::relocate_apic(Bit64u val_64)
if ((val32_lo & 0x800) == 0) {
// APIC global enable bit cleared, clear APIC on chip CPUID feature flag
BX_CPU_THIS_PTR cpuid_std_function[0x1].edx &= ~(1<<9);
BX_CPU_THIS_PTR cpuid_ext_function[0x1].edx &= ~(1<<9);
BX_CPU_THIS_PTR cpuid_std_function[0x1].edx &= ~BX_CPUID_STD_APIC;
BX_CPU_THIS_PTR cpuid_ext_function[0x1].edx &= ~BX_CPUID_STD_APIC;
}
}
else {

2
bochs/cpu/vmx.h
View File

@ -1020,7 +1020,7 @@ enum VMX_INVEPT_INVVPID_type {
// [25] - INVEPT single-context invalidation supported
// [26] - INVEPT all-context invalidation supported
#define VMX_MSR_VMX_EPT_VPID_CAP_LO (0x06114141 | (bx_cpuid_support_1g_paging() << 17))
#define VMX_MSR_VMX_EPT_VPID_CAP_LO (0x06114141 | (!!(bx_cpuid_support_1g_paging()) << 17))
// [32] - INVVPID instruction supported
// [40] - individual-address INVVPID is supported