ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

dbghelp: Avoid using inline assembly in do_x86cpuid(). 

Signed-off-by: Zebediah Figura <z.figura12@gmail.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Zebediah Figura 2018-11-27 19:29:44 -06:00 committed by Alexandre Julliard
parent fc2b2b1bd4
commit b7f3e6ba31
1 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
dlls/dbghelp/minidump.c
View File

@ -18,6 +18,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
#include "config.h"
#include <time.h> #include <time.h>
#define NONAMELESSUNION #define NONAMELESSUNION
@ -542,20 +543,26 @@ static unsigned dump_modules(struct dump_context* dc, BOOL dump_elf)
return sz; return sz;
} }
/* Calls cpuid with an eax of 'ax' and returns the 16 bytes in *p #ifdef __i386__
* We are compiled with -fPIC, so we can't clobber ebx. extern void do_x86cpuid(unsigned int ax, unsigned int *p);
*/ __ASM_GLOBAL_FUNC( do_x86cpuid,
static inline void do_x86cpuid(unsigned int ax, unsigned int *p) "pushl %esi\n\t"
"pushl %ebx\n\t"
"movl 12(%esp),%eax\n\t"
"movl 16(%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
static void do_x86cpuid(unsigned int ax, unsigned int *p)
{ {
#if defined(__GNUC__) && defined(__i386__)
__asm__("pushl %%ebx\n\t"
"cpuid\n\t"
"movl %%ebx, %%esi\n\t"
"popl %%ebx"
: "=a" (p[0]), "=S" (p[1]), "=c" (p[2]), "=d" (p[3])
: "0" (ax));
#endif
} }
#endif
/* From xf86info havecpuid.c 1.11 */ /* From xf86info havecpuid.c 1.11 */
static inline int have_x86cpuid(void) static inline int have_x86cpuid(void)