Changeset 38a6e6b for core/c/jcpuid/src

Timestamp:

May 20, 2011 4:26:40 PM (10 years ago)

Author:

zzz <zzz@…>

Branches:

master

Children:

b5dc9b6f

Parents:

627519e

Message:

restore old cpuid assembly for x64

File:

• core/c/jcpuid/src/jcpuid.c (modified) (2 diffs)

core/c/jcpuid/src/jcpuid.c

@@ -4 +4 @@
 
 From: http://sam.zoy.org/blog/2007-04-13-shlib-with-non-pic-code-have-inline-assembly-and-pic-mix-well
+See also: http://homesource.nekomimicon.net/sourceforum/viewtopic.php?f=15&t=303
 
 Perhaps the most accessible documentation on what PIC code is and how an ELF dynamic linker works is
@@ -62 +63 @@
                 asm volatile
                 (
+#if (!defined(__X86_64__)) && (!defined(__x86_64__))
+                        /* 32 bit */
                         "pushl %%ebx      \n\t" /* save %ebx */
+#endif
                         "cpuid            \n\t"
+#if (!defined(__X86_64__)) && (!defined(__x86_64__))
+                        /* 32 bit */
                         "movl %%ebx, %1   \n\t" /* save what cpuid just put in %ebx */
                         "popl %%ebx       \n\t" /* restore the old %ebx */
                         : "=a" (a), "=r" (b), "=c" (c), "=d" (d)
+#else
+                        /* 64 bit */
+                        : "=a" (a), "=b" (b), "=c" (c), "=d" (d)
+#endif
                         :"a"(iFunction)
                         : "cc"