cleanup of warning messages from cpuid code

This commit is contained in:
Stanislav Shwartsman 2017-03-26 20:12:14 +00:00
parent 2b79061127
commit e5c64b3b56
25 changed files with 13 additions and 53 deletions

View File

@ -43,8 +43,6 @@ amd_k6_2_chomper_t::amd_k6_2_chomper_t(BX_CPU_C *cpu): bx_cpuid_t(cpu)
#if BX_PHY_ADDRESS_LONG
enable_cpu_extension(BX_ISA_PSE36);
#endif
warning_messages();
}
void amd_k6_2_chomper_t::get_cpuid_leaf(Bit32u function, Bit32u subfunction, cpuid_function_t *leaf) const

View File

@ -56,8 +56,6 @@ athlon64_clawhammer_t::athlon64_clawhammer_t(BX_CPU_C *cpu): bx_cpuid_t(cpu)
enable_cpu_extension(BX_ISA_LONG_MODE);
enable_cpu_extension(BX_ISA_LM_LAHF_SAHF);
enable_cpu_extension(BX_ISA_NX);
warning_messages();
}
void athlon64_clawhammer_t::get_cpuid_leaf(Bit32u function, Bit32u subfunction, cpuid_function_t *leaf) const

View File

@ -58,8 +58,6 @@ athlon64_venice_t::athlon64_venice_t(BX_CPU_C *cpu): bx_cpuid_t(cpu)
enable_cpu_extension(BX_ISA_LM_LAHF_SAHF);
enable_cpu_extension(BX_ISA_NX);
enable_cpu_extension(BX_ISA_FFXSR);
warning_messages();
}
void athlon64_venice_t::get_cpuid_leaf(Bit32u function, Bit32u subfunction, cpuid_function_t *leaf) const

View File

@ -80,8 +80,6 @@ phenom_8650_toliman_t::phenom_8650_toliman_t(BX_CPU_C *cpu): bx_cpuid_t(cpu)
#endif
enable_cpu_extension(BX_ISA_ALT_MOV_CR8);
enable_cpu_extension(BX_ISA_XAPIC_EXT);
warning_messages();
}
void phenom_8650_toliman_t::get_cpuid_leaf(Bit32u function, Bit32u subfunction, cpuid_function_t *leaf) const

View File

@ -106,8 +106,6 @@ ryzen_t::ryzen_t(BX_CPU_C *cpu): bx_cpuid_t(cpu)
#if BX_SUPPORT_MONITOR_MWAIT
enable_cpu_extension(BX_ISA_MONITORX_MWAITX);
#endif
warning_messages();
}
void ryzen_t::get_cpuid_leaf(Bit32u function, Bit32u subfunction, cpuid_function_t *leaf) const

View File

@ -93,8 +93,6 @@ trinity_apu_t::trinity_apu_t(BX_CPU_C *cpu): bx_cpuid_t(cpu)
enable_cpu_extension(BX_ISA_MISALIGNED_SSE);
enable_cpu_extension(BX_ISA_ALT_MOV_CR8);
enable_cpu_extension(BX_ISA_XAPIC_EXT);
warning_messages();
}
void trinity_apu_t::get_cpuid_leaf(Bit32u function, Bit32u subfunction, cpuid_function_t *leaf) const

View File

@ -68,8 +68,6 @@ turion64_tyler_t::turion64_tyler_t(BX_CPU_C *cpu): bx_cpuid_t(cpu)
#endif
enable_cpu_extension(BX_ISA_ALT_MOV_CR8);
enable_cpu_extension(BX_ISA_XAPIC_EXT);
warning_messages();
}
void turion64_tyler_t::get_cpuid_leaf(Bit32u function, Bit32u subfunction, cpuid_function_t *leaf) const

View File

@ -89,8 +89,6 @@ zambezi_t::zambezi_t(BX_CPU_C *cpu): bx_cpuid_t(cpu)
enable_cpu_extension(BX_ISA_MISALIGNED_SSE);
enable_cpu_extension(BX_ISA_ALT_MOV_CR8);
enable_cpu_extension(BX_ISA_XAPIC_EXT);
warning_messages();
}
void zambezi_t::get_cpuid_leaf(Bit32u function, Bit32u subfunction, cpuid_function_t *leaf) const

View File

@ -61,8 +61,6 @@ atom_n270_t::atom_n270_t(BX_CPU_C *cpu): bx_cpuid_t(cpu)
enable_cpu_extension(BX_ISA_PAT);
enable_cpu_extension(BX_ISA_XAPIC);
enable_cpu_extension(BX_ISA_MOVBE);
warning_messages();
}
void atom_n270_t::get_cpuid_leaf(Bit32u function, Bit32u subfunction, cpuid_function_t *leaf) const

View File

@ -98,8 +98,6 @@ broadwell_ult_t::broadwell_ult_t(BX_CPU_C *cpu): bx_cpuid_t(cpu)
enable_cpu_extension(BX_ISA_RDSEED);
enable_cpu_extension(BX_ISA_ADX);
enable_cpu_extension(BX_ISA_SMAP);
warning_messages();
}
void broadwell_ult_t::get_cpuid_leaf(Bit32u function, Bit32u subfunction, cpuid_function_t *leaf) const

View File

@ -70,8 +70,6 @@ core2_penryn_t9600_t::core2_penryn_t9600_t(BX_CPU_C *cpu): bx_cpuid_t(cpu)
enable_cpu_extension(BX_ISA_NX);
enable_cpu_extension(BX_ISA_CMPXCHG16B);
enable_cpu_extension(BX_ISA_XSAVE);
warning_messages();
}
void core2_penryn_t9600_t::get_cpuid_leaf(Bit32u function, Bit32u subfunction, cpuid_function_t *leaf) const

View File

@ -63,8 +63,6 @@ core_duo_t2400_yonah_t::core_duo_t2400_yonah_t(BX_CPU_C *cpu): bx_cpuid_t(cpu)
enable_cpu_extension(BX_ISA_PAT);
enable_cpu_extension(BX_ISA_XAPIC);
enable_cpu_extension(BX_ISA_NX);
warning_messages();
}
void core_duo_t2400_yonah_t::get_cpuid_leaf(Bit32u function, Bit32u subfunction, cpuid_function_t *leaf) const

View File

@ -76,8 +76,6 @@ corei5_arrandale_m520_t::corei5_arrandale_m520_t(BX_CPU_C *cpu): bx_cpuid_t(cpu)
enable_cpu_extension(BX_ISA_CMPXCHG16B);
enable_cpu_extension(BX_ISA_RDTSCP);
enable_cpu_extension(BX_ISA_AES_PCLMULQDQ);
warning_messages();
}
void corei5_arrandale_m520_t::get_cpuid_leaf(Bit32u function, Bit32u subfunction, cpuid_function_t *leaf) const

View File

@ -75,8 +75,6 @@ corei5_lynnfield_750_t::corei5_lynnfield_750_t(BX_CPU_C *cpu): bx_cpuid_t(cpu)
enable_cpu_extension(BX_ISA_NX);
enable_cpu_extension(BX_ISA_CMPXCHG16B);
enable_cpu_extension(BX_ISA_RDTSCP);
warning_messages();
}
void corei5_lynnfield_750_t::get_cpuid_leaf(Bit32u function, Bit32u subfunction, cpuid_function_t *leaf) const

View File

@ -96,8 +96,6 @@ corei7_haswell_4770_t::corei7_haswell_4770_t(BX_CPU_C *cpu): bx_cpuid_t(cpu)
enable_cpu_extension(BX_ISA_RDRAND);
enable_cpu_extension(BX_ISA_TSC_DEADLINE);
enable_cpu_extension(BX_ISA_FCS_FDS_DEPRECATION);
warning_messages();
}
void corei7_haswell_4770_t::get_cpuid_leaf(Bit32u function, Bit32u subfunction, cpuid_function_t *leaf) const

View File

@ -86,8 +86,6 @@ corei7_ivy_bridge_3770k_t::corei7_ivy_bridge_3770k_t(BX_CPU_C *cpu): bx_cpuid_t(
enable_cpu_extension(BX_ISA_FSGSBASE);
enable_cpu_extension(BX_ISA_SMEP);
enable_cpu_extension(BX_ISA_RDRAND);
warning_messages();
}
void corei7_ivy_bridge_3770k_t::get_cpuid_leaf(Bit32u function, Bit32u subfunction, cpuid_function_t *leaf) const

View File

@ -84,8 +84,6 @@ corei7_sandy_bridge_2600k_t::corei7_sandy_bridge_2600k_t(BX_CPU_C *cpu): bx_cpui
#if BX_SUPPORT_AVX
enable_cpu_extension(BX_ISA_AVX);
#endif
warning_messages();
}
void corei7_sandy_bridge_2600k_t::get_cpuid_leaf(Bit32u function, Bit32u subfunction, cpuid_function_t *leaf) const

View File

@ -46,8 +46,6 @@ p2_klamath_t::p2_klamath_t(BX_CPU_C *cpu): bx_cpuid_t(cpu)
enable_cpu_extension(BX_ISA_PSE36);
#endif
enable_cpu_extension(BX_ISA_MTRR);
warning_messages();
}
void p2_klamath_t::get_cpuid_leaf(Bit32u function, Bit32u subfunction, cpuid_function_t *leaf) const

View File

@ -48,8 +48,6 @@ p3_katmai_t::p3_katmai_t(BX_CPU_C *cpu): bx_cpuid_t(cpu)
#endif
enable_cpu_extension(BX_ISA_MTRR);
enable_cpu_extension(BX_ISA_PAT);
warning_messages();
}
void p3_katmai_t::get_cpuid_leaf(Bit32u function, Bit32u subfunction, cpuid_function_t *leaf) const

View File

@ -62,8 +62,6 @@ p4_prescott_celeron_336_t::p4_prescott_celeron_336_t(BX_CPU_C *cpu): bx_cpuid_t(
enable_cpu_extension(BX_ISA_LONG_MODE);
enable_cpu_extension(BX_ISA_NX);
enable_cpu_extension(BX_ISA_CMPXCHG16B);
warning_messages();
}
void p4_prescott_celeron_336_t::get_cpuid_leaf(Bit32u function, Bit32u subfunction, cpuid_function_t *leaf) const

View File

@ -51,8 +51,6 @@ p4_willamette_t::p4_willamette_t(BX_CPU_C *cpu): bx_cpuid_t(cpu)
enable_cpu_extension(BX_ISA_MTRR);
enable_cpu_extension(BX_ISA_PAT);
enable_cpu_extension(BX_ISA_XAPIC);
warning_messages();
}
void p4_willamette_t::get_cpuid_leaf(Bit32u function, Bit32u subfunction, cpuid_function_t *leaf) const

View File

@ -40,8 +40,6 @@ pentium_t::pentium_t(BX_CPU_C *cpu): bx_cpuid_t(cpu)
enable_cpu_extension(BX_ISA_PSE36);
#endif
enable_cpu_extension(BX_ISA_PSE);
warning_messages();
}
void pentium_t::get_cpuid_leaf(Bit32u function, Bit32u subfunction, cpuid_function_t *leaf) const

View File

@ -41,8 +41,6 @@ pentium_mmx_t::pentium_mmx_t(BX_CPU_C *cpu): bx_cpuid_t(cpu)
enable_cpu_extension(BX_ISA_PSE36);
#endif
enable_cpu_extension(BX_ISA_PSE);
warning_messages();
}
void pentium_mmx_t::get_cpuid_leaf(Bit32u function, Bit32u subfunction, cpuid_function_t *leaf) const

View File

@ -416,14 +416,19 @@ void bx_cpuid_t::dump_cpuid(unsigned max_std_leaf, unsigned max_ext_leaf) const
}
}
void bx_cpuid_t::warning_messages() const
void bx_cpuid_t::warning_messages(unsigned extension) const
{
if (is_cpu_extension_supported(BX_ISA_3DNOW))
switch(extension) {
case BX_ISA_3DNOW:
BX_INFO(("WARNING: 3DNow! is not implemented yet !"));
if (is_cpu_extension_supported(BX_ISA_RDRAND))
break;
case BX_ISA_RDRAND:
BX_INFO(("WARNING: RDRAND would not produce true random numbers !"));
if (is_cpu_extension_supported(BX_ISA_RDSEED))
break;
case BX_ISA_RDSEED:
BX_INFO(("WARNING: RDSEED would not produce true random numbers !"));
break;
default:
break;
}
}

View File

@ -89,6 +89,7 @@ protected:
BX_CPP_INLINE void enable_cpu_extension(unsigned extension) {
assert(extension < BX_ISA_EXTENSION_LAST);
ia_extensions_bitmask[extension / 32] |= (1 << (extension % 32));
warning_messages(extension);
}
BX_CPP_INLINE void disable_cpu_extension(unsigned extension) {
@ -129,7 +130,7 @@ protected:
void dump_cpuid_leaf(unsigned function, unsigned subfunction = 0) const;
void dump_cpuid(unsigned max_std_leaf, unsigned max_ext_leaf) const;
void warning_messages() const;
void warning_messages(unsigned extension) const;
#if BX_SUPPORT_VMX
VMCS_Mapping vmcs_map;