Changeset 71675 in vbox

Timestamp:

Apr 5, 2018 11:54:17 AM (7 years ago)

Author:

vboxsync

Message:

tstRTInlineAsm.cpp: Test ASMCpuId too.

File:

• trunk/src/VBox/Runtime/testcase/tstRTInlineAsm.cpp (modified) (6 diffs)

trunk/src/VBox/Runtime/testcase/tstRTInlineAsm.cpp

@@ -227 +227 @@
         if (iStd > cFunctions)
             continue;
-        if (   iStd != 0x04 /* Deterministic Cache Parameters Leaf */
-            && iStd != 0x07 /* Structured Extended Feature Flags */
-            && iStd != 0x0b /* Extended Topology Enumeration Leafs */
-            && iStd != 0x0d /* Extended State Enumeration Leafs */
-            && iStd != 0x0f /* Platform qualifity of service monitoring (PQM)  */
-            && iStd != 0x10 /* Platform qualifity of service enforcement (PQE) */
-            && iStd != 0x14 /* Trace Enumeration Leafs */)
-        {
-            u32 = ASMCpuId_EAX(iStd);
-            CHECKVAL(u32, s.uEAX, "%x");
-
-            uint32_t u32EbxMask = UINT32_MAX;
-            if (iStd == 1)
-                u32EbxMask = UINT32_C(0x00ffffff); /* Omit the local apic ID in case we're rescheduled. */
-            u32 = ASMCpuId_EBX(iStd);
-            CHECKVAL(u32 & u32EbxMask, s.uEBX & u32EbxMask, "%x");
-
-            u32 = ASMCpuId_ECX(iStd);
-            CHECKVAL(u32, s.uECX, "%x");
-            u32 = ASMCpuId_EDX(iStd);
-            CHECKVAL(u32, s.uEDX, "%x");
-
-            uECX2 = s.uECX - 1;
-            uEDX2 = s.uEDX - 1;
-            ASMCpuId_ECX_EDX(iStd, &uECX2, &uEDX2);
-            CHECKVAL(uECX2, s.uECX, "%x");
-            CHECKVAL(uEDX2, s.uEDX, "%x");
-        }
-
-        if (iStd == 0x04)
+        if (iStd == 0x04)       /* Deterministic Cache Parameters Leaf */
             for (uint32_t uECX = 1; s.uEAX & 0x1f; uECX++)
             {
@@ -263 +234 @@
                 RTTESTI_CHECK_BREAK(uECX < 128);
             }
-        else if (iStd == 0x07)
+        else if (iStd == 0x07) /* Structured Extended Feature Flags */
         {
             uint32_t uMax = s.uEAX;
@@ -273 +244 @@
             }
         }
-        else if (iStd == 0x0b)
+        else if (iStd == 0x0b) /* Extended Topology Enumeration Leafs */
             for (uint32_t uECX = 1; (s.uEAX & 0x1f) && (s.uEBX & 0xffff); uECX++)
             {
@@ -280 +251 @@
                 RTTESTI_CHECK_BREAK(uECX < 128);
             }
-        else if (iStd == 0x0d)
+        else if (iStd == 0x0d) /* Extended State Enumeration Leafs */
             for (uint32_t uECX = 1; s.uEAX != 0 || s.uEBX != 0 || s.uECX != 0 || s.uEDX != 0; uECX++)
             {
@@ -287 +258 @@
                 RTTESTI_CHECK_BREAK(uECX < 128);
             }
+        else if (   iStd == 0x0f /* Platform qualifity of service monitoring (PQM)  */
+                 || iStd == 0x10 /* Platform qualifity of service enforcement (PQE) */
+                 || iStd == 0x14 /* Trace Enumeration Leafs */)
+        {
+            /** @todo  */
+        }
+        else
+        {
+            u32 = ASMCpuId_EAX(iStd);
+            CHECKVAL(u32, s.uEAX, "%x");
+
+            uint32_t u32EbxMask = UINT32_MAX;
+            if (iStd == 1)
+                u32EbxMask = UINT32_C(0x00ffffff); /* Omit the local apic ID in case we're rescheduled. */
+            u32 = ASMCpuId_EBX(iStd);
+            CHECKVAL(u32 & u32EbxMask, s.uEBX & u32EbxMask, "%x");
+
+            u32 = ASMCpuId_ECX(iStd);
+            CHECKVAL(u32, s.uECX, "%x");
+            u32 = ASMCpuId_EDX(iStd);
+            CHECKVAL(u32, s.uEDX, "%x");
+
+            uECX2 = s.uECX - 1;
+            uEDX2 = s.uEDX - 1;
+            ASMCpuId_ECX_EDX(iStd, &uECX2, &uEDX2);
+            CHECKVAL(uECX2, s.uECX, "%x");
+            CHECKVAL(uEDX2, s.uEDX, "%x");
+
+            uEAX2 = s.uEAX - 1;
+            uEBX2 = s.uEBX - 1;
+            uECX2 = s.uECX - 1;
+            uEDX2 = s.uEDX - 1;
+            ASMCpuId(iStd, &uEAX2, &uEBX2, &uECX2, &uEDX2);
+            CHECKVAL(uEAX2, s.uEAX, "%x");
+            CHECKVAL(uEBX2 & u32EbxMask, s.uEBX & u32EbxMask, "%x");
+            CHECKVAL(uECX2, s.uECX, "%x");
+            CHECKVAL(uEDX2, s.uEDX, "%x");
+        }
     }
 
@@ -413 +422 @@
         uEDX2 = s.uEDX - 1;
         ASMCpuId_ECX_EDX(iExt, &uECX2, &uEDX2);
+        CHECKVAL(uECX2, s.uECX, "%x");
+        CHECKVAL(uEDX2, s.uEDX, "%x");
+
+        uEAX2 = s.uEAX - 1;
+        uEBX2 = s.uEBX - 1;
+        uECX2 = s.uECX - 1;
+        uEDX2 = s.uEDX - 1;
+        ASMCpuId(iExt, &uEAX2, &uEBX2, &uECX2, &uEDX2);
+        CHECKVAL(uEAX2, s.uEAX, "%x");
+        CHECKVAL(uEBX2, s.uEBX, "%x");
         CHECKVAL(uECX2, s.uECX, "%x");
         CHECKVAL(uEDX2, s.uEDX, "%x");