Changeset 44260 in vbox for trunk/src

Timestamp:

Jan 9, 2013 1:29:07 PM (12 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

83131

Message:

Fixed ASMCpuId_Idx_ECX on windows (didn't consider ECX input).

Location:

trunk/src/VBox/Runtime

Files:

• Makefile.kmk (modified) (2 diffs)
• common/asm/ASMCpuId_Idx_ECX.asm (added)
• testcase/tstRTInlineAsm.cpp (modified) (3 diffs)

trunk/src/VBox/Runtime/Makefile.kmk

@@ -182 +182 @@
         common/asm/ASMAtomicCmpXchgU8.asm \
         common/asm/ASMMultU64ByU32DivByU32.asm \
+        common/asm/ASMCpuId_Idx_ECX.asm \
         common/asm/ASMNopPause.asm
 
@@ -189 +190 @@
 RuntimeWin32ASM_SOURCES = \
         common/asm/ASMAtomicCmpXchgU8.asm \
-        common/asm/ASMMultU64ByU32DivByU32.asm
+        common/asm/ASMMultU64ByU32DivByU32.asm \
+        common/asm/ASMCpuId_Idx_ECX.asm
 
 #

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

@@ -210 +210 @@
                       iStd, s.uEAX, s.uEBX, s.uECX, s.uEDX, iStd <= cFunctions ? "" : "*");
 
-        if (iStd == 0x04 || iStd == 0x0b || iStd == 0x0d || iStd > cFunctions)
-            continue; /* Leaf 04 and leaf 0d output depend on the initial value of ECX
-                       * The same seems to apply to invalid standard functions */
-
-        u32 = ASMCpuId_EAX(iStd);
-        CHECKVAL(u32, s.uEAX, "%x");
-        u32 = ASMCpuId_EBX(iStd);
-        CHECKVAL(u32, s.uEBX, "%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");
+        /* Leaf 04 and leaf 0d output depend on the initial value of ECX
+         * The same seems to apply to invalid standard functions */
+        if (iStd > cFunctions)
+            continue;
+        if (iStd != 0x04 && iStd != 0x0b && iStd != 0x0d)
+        {
+            u32 = ASMCpuId_EAX(iStd);
+            CHECKVAL(u32, s.uEAX, "%x");
+            u32 = ASMCpuId_EBX(iStd);
+            CHECKVAL(u32, s.uEBX, "%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)
+            for (uint32_t uECX = 1; s.uEAX & 0x1f; uECX++)
+            {
+                ASMCpuId_Idx_ECX(iStd, uECX, &s.uEAX, &s.uEBX, &s.uECX, &s.uEDX);
+                RTTestIPrintf(RTTESTLVL_ALWAYS, "    [%02x]  %08x %08x %08x %08x\n", uECX, s.uEAX, s.uEBX, s.uECX, s.uEDX);
+                RTTESTI_CHECK_BREAK(uECX < 128);
+            }
+        else if (iStd == 0x0b)
+            for (uint32_t uECX = 1; (s.uEAX & 0x1f) && (s.uEBX & 0xffff); uECX++)
+            {
+                ASMCpuId_Idx_ECX(iStd, uECX, &s.uEAX, &s.uEBX, &s.uECX, &s.uEDX);
+                RTTestIPrintf(RTTESTLVL_ALWAYS, "    [%02x]  %08x %08x %08x %08x\n", uECX, s.uEAX, s.uEBX, s.uECX, s.uEDX);
+                RTTESTI_CHECK_BREAK(uECX < 128);
+            }
+        else if (iStd == 0x0d)
+            for (uint32_t uECX = 1; s.uEAX != 0 || s.uEBX != 0 || s.uECX != 0 || s.uEDX != 0; uECX++)
+            {
+                ASMCpuId_Idx_ECX(iStd, uECX, &s.uEAX, &s.uEBX, &s.uECX, &s.uEDX);
+                RTTestIPrintf(RTTESTLVL_ALWAYS, "    [%02x]  %08x %08x %08x %08x\n", uECX, s.uEAX, s.uEBX, s.uECX, s.uEDX);
+                RTTESTI_CHECK_BREAK(uECX < 128);
+            }
     }
 
@@ -1520 +1545 @@
     tstASMCpuId();
 #endif
+#if 1
     tstASMAtomicXchgU8();
     tstASMAtomicXchgU16();
@@ -1550 +1576 @@
 
     tstASMBench();
+#endif
 
     /*