Changeset 639 in vbox for trunk/include

Timestamp:

Feb 5, 2007 2:25:02 PM (18 years ago)

Author:

vboxsync

Message:

Be careful with 32-bit types and registers. (it seems like it was working fine here with 4.1.1 but obviously not for everyone.)

File:

• trunk/include/iprt/asm.h (modified) (9 diffs)

trunk/include/iprt/asm.h

@@ -522 +522 @@
 {
 # if RT_INLINE_ASM_GNU_STYLE
+#  ifdef __AMD64__
+    RTCCUINTREG uRAX, uRBX, uRCX, uRDX;
+    __asm__ ("cpuid\n\t"
+             : "=a" (uRAX),
+               "=b" (uRBX),
+               "=c" (uRCX),
+               "=d" (uRDX)
+             : "0" (uOperator));
+    *(uint32_t *)pvEAX = (uint32_t)uRAX;
+    *(uint32_t *)pvEBX = (uint32_t)uRBX;
+    *(uint32_t *)pvECX = (uint32_t)uRCX;
+    *(uint32_t *)pvEDX = (uint32_t)uRDX;
+#  else
     __asm__ ("xchgl %%ebx, %1\n\t"
              "cpuid\n\t"
@@ -530 +543 @@
                "=d" (*(uint32_t *)pvEDX)
              : "0" (uOperator));
+#  endif
 
 # elif RT_INLINE_ASM_USES_INTRIN
@@ -594 +608 @@
 DECLINLINE(uint32_t) ASMCpuId_EDX(uint32_t uOperator)
 {
-    uint32_t    u32EDX;
-# if RT_INLINE_ASM_GNU_STYLE
-#  if (defined(PIC) || defined(__DARWIN__)) && defined(__i386__) /* darwin: 4.0.1 compiler option / bug? */
+    RTCCUINTREG xDX;
+# if RT_INLINE_ASM_GNU_STYLE
+#  ifdef __AMD64__
+    RTCCUINTREG uSpill;
+    __asm__ ("cpuid"
+             : "=a" (uSpill),
+               "=d" (xDX)
+             : "0" (uOperator)
+             : "rbx", "rcx");
+#  elif (defined(PIC) || defined(__DARWIN__)) && defined(__i386__) /* darwin: PIC by default. */
     __asm__ ("push  %%ebx\n\t"
              "cpuid\n\t"
              "pop   %%ebx\n\t"
              : "=a" (uOperator),
-               "=d" (u32EDX)
+               "=d" (xDX)
              : "0" (uOperator)
              : "ecx");
@@ -607 +628 @@
     __asm__ ("cpuid"
              : "=a" (uOperator),
-               "=d" (u32EDX)
+               "=d" (xDX)
              : "0" (uOperator)
              : "ebx", "ecx");
@@ -623 +644 @@
         mov     eax, [uOperator]
         cpuid
-        mov     [u32EDX], edx
+        mov     [xDX], edx
         pop     ebx
     }
 # endif
-    return u32EDX;
+    return (uint32_t)xDX;
 }
 #endif
@@ -643 +664 @@
 DECLINLINE(uint32_t) ASMCpuId_ECX(uint32_t uOperator)
 {
-    uint32_t    u32ECX;
-# if RT_INLINE_ASM_GNU_STYLE
-#  if (defined(PIC) || defined(__DARWIN__)) && defined(__i386__) /* darwin: 4.0.1 compiler option / bug? */
+    RTCCUINTREG xCX;
+# if RT_INLINE_ASM_GNU_STYLE
+#  ifdef __AMD64__
+    RTCCUINTREG uSpill;
+    __asm__ ("cpuid"
+             : "=a" (uSpill),
+               "=c" (xCX)
+             : "0" (uOperator)
+             : "rbx", "rdx");
+#  elif (defined(PIC) || defined(__DARWIN__)) && defined(__i386__) /* darwin: 4.0.1 compiler option / bug? */
     __asm__ ("push  %%ebx\n\t"
              "cpuid\n\t"
              "pop   %%ebx\n\t"
              : "=a" (uOperator),
-               "=c" (u32ECX)
+               "=c" (xCX)
              : "0" (uOperator)
              : "edx");
@@ -656 +684 @@
     __asm__ ("cpuid"
              : "=a" (uOperator),
-               "=c" (u32ECX)
+               "=c" (xCX)
              : "0" (uOperator)
              : "ebx", "edx");
@@ -665 +693 @@
     int aInfo[4];
     __cpuid(aInfo, uOperator);
-    u32ECX = aInfo[2];
+    xCX = aInfo[2];
 
 # else
@@ -673 +701 @@
         mov     eax, [uOperator]
         cpuid
-        mov     [u32ECX], ecx
+        mov     [xCX], ecx
         pop     ebx
     }
 # endif
-    return u32ECX;
+    return (uint32_t)xCX;
 }
 #endif