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

PANIC on options which require P6 when CPU_LEVEL is set to 5 instead of ignoring them

Browse Source
This commit is contained in:
Stanislav Shwartsman 2013-04-17 20:24:12 +00:00
parent 3fbdf7ff03
commit 139ec7d538
1 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
bochs/cpu/generic_cpuid.cc
View File

@ -1020,27 +1020,27 @@ void bx_generic_cpuid_t::init_cpu_extensions_bitmask(void)
features_bitmask |= BX_CPU_PGE;
features_bitmask |= BX_CPU_MTRR;
features_bitmask |= BX_CPU_PAT;
}
static bx_bool misaligned_sse_enabled = SIM->get_param_bool(BXPN_CPUID_MISALIGNED_SSE)->get();
if (misaligned_sse_enabled) {
features_bitmask |= BX_CPU_MISALIGNED_SSE;
if (cpu_level < 6)
BX_PANIC(("PANIC: Misaligned SSE emulation requires P6 CPU level support !"));
}
static bx_bool misaligned_sse_enabled = SIM->get_param_bool(BXPN_CPUID_MISALIGNED_SSE)->get();
if (misaligned_sse_enabled) {
features_bitmask |= BX_CPU_MISALIGNED_SSE;
if (cpu_level < 6)
BX_PANIC(("PANIC: Misaligned SSE emulation requires P6 CPU level support !"));
}
static bx_bool smep_enabled = SIM->get_param_bool(BXPN_CPUID_SMEP)->get();
if (smep_enabled) {
features_bitmask |= BX_CPU_SMEP;
if (cpu_level < 6)
BX_PANIC(("PANIC: SMEP emulation requires P6 CPU level support !"));
}
static bx_bool smep_enabled = SIM->get_param_bool(BXPN_CPUID_SMEP)->get();
if (smep_enabled) {
features_bitmask |= BX_CPU_SMEP;
if (cpu_level < 6)
BX_PANIC(("PANIC: SMEP emulation requires P6 CPU level support !"));
}
static bx_bool smap_enabled = SIM->get_param_bool(BXPN_CPUID_SMAP)->get();
if (smap_enabled) {
features_bitmask |= BX_ISA_SMAP;
if (cpu_level < 6)
BX_PANIC(("PANIC: SMAP emulation requires P6 CPU level support !"));
}
static bx_bool smap_enabled = SIM->get_param_bool(BXPN_CPUID_SMAP)->get();
if (smap_enabled) {
features_bitmask |= BX_ISA_SMAP;
if (cpu_level < 6)
BX_PANIC(("PANIC: SMAP emulation requires P6 CPU level support !"));
}
#if BX_SUPPORT_X86_64