Commit d0413d83 authored by Jacek Caban's avatar Jacek Caban Committed by Alexandre Julliard

ntdll: Don't use inline assembly in do_cpuid.

Avoids problems on old GCC. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51862Signed-off-by: 's avatarJacek Caban <jacek@codeweavers.com> Signed-off-by: 's avatarAlexandre Julliard <julliard@winehq.org>
parent 594036d6
...@@ -249,10 +249,36 @@ BOOL xstate_compaction_enabled = FALSE; ...@@ -249,10 +249,36 @@ BOOL xstate_compaction_enabled = FALSE;
#define INEI 0x49656e69 /* "ineI" */ #define INEI 0x49656e69 /* "ineI" */
#define NTEL 0x6c65746e /* "ntel" */ #define NTEL 0x6c65746e /* "ntel" */
static inline void do_cpuid(unsigned int ax, unsigned int cx, unsigned int *p) extern void do_cpuid( unsigned int ax, unsigned int cx, unsigned int *p ) DECLSPEC_HIDDEN;
{ #ifdef __i386__
__asm__ ("cpuid" : "=a"(p[0]), "=b" (p[1]), "=c"(p[2]), "=d"(p[3]) : "a"(ax), "c"(cx)); __ASM_GLOBAL_FUNC( do_cpuid,
} "pushl %esi\n\t"
"pushl %ebx\n\t"
"movl 12(%esp),%eax\n\t"
"movl 16(%esp),%ecx\n\t"
"movl 20(%esp),%esi\n\t"
"cpuid\n\t"
"movl %eax,(%esi)\n\t"
"movl %ebx,4(%esi)\n\t"
"movl %ecx,8(%esi)\n\t"
"movl %edx,12(%esi)\n\t"
"popl %ebx\n\t"
"popl %esi\n\t"
"ret" )
#else
__ASM_GLOBAL_FUNC( do_cpuid,
"pushq %rbx\n\t"
"movl %edi,%eax\n\t"
"movl %esi,%ecx\n\t"
"movq %rdx,%r8\n\t"
"cpuid\n\t"
"movl %eax,(%r8)\n\t"
"movl %ebx,4(%r8)\n\t"
"movl %ecx,8(%r8)\n\t"
"movl %edx,12(%r8)\n\t"
"popq %rbx\n\t"
"ret" )
#endif
#ifdef __i386__ #ifdef __i386__
extern int have_cpuid(void) DECLSPEC_HIDDEN; extern int have_cpuid(void) DECLSPEC_HIDDEN;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment