Changeset 93515 in vbox for trunk/src/VBox/VMM/VMMR0
- Timestamp:
- Jan 31, 2022 10:17:19 PM (3 years ago)
- Location:
- trunk/src/VBox/VMM/VMMR0
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/VBox/VMM/VMMR0/CPUMR0.cpp
r93115 r93515 249 249 uint32_t cExt = 0; 250 250 ASMCpuId(0x80000000, &cExt, &u32Dummy, &u32Dummy, &u32Dummy); 251 if ( ASMIsValidExtRange(cExt))251 if (RTX86IsValidExtRange(cExt)) 252 252 { 253 253 uint32_t fExtFeaturesEDX = ASMCpuId_EDX(0x80000001); … … 279 279 pVM->cpum.s.HostFeatures.fArchMdsNo = 0; 280 280 uint32_t const cStdRange = ASMCpuId_EAX(0); 281 if ( ASMIsValidStdRange(cStdRange)281 if ( RTX86IsValidStdRange(cStdRange) 282 282 && cStdRange >= 7) 283 283 { … … 728 728 uint32_t uMaxLeaf, u32EBX, u32ECX, u32EDX; 729 729 ASMCpuId(0, &uMaxLeaf, &u32EBX, &u32ECX, &u32EDX); 730 if ( ( ASMIsIntelCpuEx(u32EBX, u32ECX, u32EDX)731 || ASMIsAmdCpuEx(u32EBX, u32ECX, u32EDX)732 || ASMIsViaCentaurCpuEx(u32EBX, u32ECX, u32EDX)733 || ASMIsShanghaiCpuEx(u32EBX, u32ECX, u32EDX)734 || ASMIsHygonCpuEx(u32EBX, u32ECX, u32EDX))735 && ASMIsValidStdRange(uMaxLeaf))730 if ( ( RTX86IsIntelCpu(u32EBX, u32ECX, u32EDX) 731 || RTX86IsAmdCpu(u32EBX, u32ECX, u32EDX) 732 || RTX86IsViaCentaurCpu(u32EBX, u32ECX, u32EDX) 733 || RTX86IsShanghaiCpu(u32EBX, u32ECX, u32EDX) 734 || RTX86IsHygonCpu(u32EBX, u32ECX, u32EDX)) 735 && RTX86IsValidStdRange(uMaxLeaf)) 736 736 { 737 737 uint32_t uDummy; … … 750 750 ASMCpuId(0x80000000, &uMaxExtLeaf, &u32EBX, &u32ECX, &u32EDX); 751 751 if ( uMaxExtLeaf >= UINT32_C(0x80000008) 752 && ASMIsValidExtRange(uMaxExtLeaf))752 && RTX86IsValidExtRange(uMaxExtLeaf)) 753 753 { 754 754 uint32_t u32PhysBits; -
trunk/src/VBox/VMM/VMMR0/HMR0.cpp
r93115 r93515 1253 1253 uint32_t fWorldSwitcher = 0; 1254 1254 uint32_t cLastStdLeaf = ASMCpuId_EAX(0); 1255 if (cLastStdLeaf >= 0x00000007 && ASMIsValidStdRange(cLastStdLeaf))1255 if (cLastStdLeaf >= 0x00000007 && RTX86IsValidStdRange(cLastStdLeaf)) 1256 1256 { 1257 1257 uint32_t uEdx = 0;
Note:
See TracChangeset
for help on using the changeset viewer.