Changeset 93515 in vbox for trunk/src/VBox/ValidationKit/testboxscript
- Timestamp:
- Jan 31, 2022 10:17:19 PM (3 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/VBox/ValidationKit/testboxscript/TestBoxHelper.cpp
r93302 r93515 467 467 /* VT-x */ 468 468 ASMCpuId(0x00000000, &uEax, &uEbx, &uEcx, &uEdx); 469 if ( ASMIsValidStdRange(uEax))469 if (RTX86IsValidStdRange(uEax)) 470 470 { 471 471 ASMCpuId(0x00000001, &uEax, &uEbx, &uEcx, &uEdx); … … 476 476 /* AMD-V */ 477 477 ASMCpuId(0x80000000, &uEax, &uEbx, &uEcx, &uEdx); 478 if ( ASMIsValidExtRange(uEax))478 if (RTX86IsValidExtRange(uEax)) 479 479 { 480 480 ASMCpuId(0x80000001, &uEax, &uEbx, &uEcx, &uEdx); … … 509 509 uint32_t uEax, uEbx, uEcx, uEdx; 510 510 ASMCpuId(0x80000000, &uEax, &uEbx, &uEcx, &uEdx); 511 if ( ASMIsValidExtRange(uEax) && uEax >= 0x8000000a)511 if (RTX86IsValidExtRange(uEax) && uEax >= 0x8000000a) 512 512 { 513 513 ASMCpuId(0x8000000a, &uEax, &uEbx, &uEcx, &uEdx); … … 617 617 uint32_t uEax, uEbx, uEcx, uEdx; 618 618 ASMCpuId(0x00000000, &uEax, &uEbx, &uEcx, &uEdx); 619 if ( ASMIsValidStdRange(uEax))619 if (RTX86IsValidStdRange(uEax)) 620 620 { 621 621 ASMCpuId(0x00000001, &uEax, &uEbx, &uEcx, &uEdx); … … 625 625 won't necessarily do so. */ 626 626 ASMCpuId(0x80000000, &uEax, &uEbx, &uEcx, &uEdx); 627 if ( ASMIsValidExtRange(uEax))627 if (RTX86IsValidExtRange(uEax)) 628 628 { 629 629 ASMCpuId(0x80000001, &uEax, &uEbx, &uEcx, &uEdx); … … 652 652 uint32_t uEax, uEbx, uEcx, uEdx; 653 653 ASMCpuId(0, &uEax, &uEbx, &uEcx, &uEdx); 654 if ( ASMIsValidStdRange(uEax) && uEax >= 1)654 if (RTX86IsValidStdRange(uEax) && uEax >= 1) 655 655 { 656 656 uint32_t uEax1 = ASMCpuId_EAX(1); 657 uint32_t uVersion = ( ASMGetCpuFamily(uEax1) << 24)658 | ( ASMGetCpuModel(uEax1, ASMIsIntelCpuEx(uEbx, uEcx, uEdx)) << 8)659 | ASMGetCpuStepping(uEax1);657 uint32_t uVersion = (RTX86GetCpuFamily(uEax1) << 24) 658 | (RTX86GetCpuModel(uEax1, RTX86IsIntelCpu(uEbx, uEcx, uEdx)) << 8) 659 | RTX86GetCpuStepping(uEax1); 660 660 int cch = RTPrintf("%#x\n", uVersion); 661 661 return cch > 0 ? RTEXITCODE_SUCCESS : RTEXITCODE_FAILURE;
Note:
See TracChangeset
for help on using the changeset viewer.