Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-05 21:53:06 +00:00
Code Issues Projects Releases Packages Wiki Activity

[WINESYNC] dbghelp: Avoid using inline assembly in do_x86cpuid().

Browse source 
Signed-off-by: Zebediah Figura <z.figura12@gmail.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>

wine commit id b7f3e6ba317bec299e43156efcdb5469f39a8a3c by Zebediah Figura <z.figura12@gmail.com>
This commit is contained in:
winesync 2020-09-11 15:55:24 +02:00 • committed by Jérôme Gardou
parent 5f9c500b2c
commit 719c13083f
2 changed files with 27 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

38
dll/win32/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,33 @@ 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. #ifndef __REACTOS__
*/ extern void do_x86cpuid(unsigned int ax, unsigned int *p);
static inline void do_x86cpuid(unsigned int ax, unsigned int *p) __ASM_GLOBAL_FUNC( do_x86cpuid,
{ "pushl %esi\n\t"
#if defined(__GNUC__) && defined(__i386__) "pushl %ebx\n\t"
__asm__("pushl %%ebx\n\t" "movl 12(%esp),%eax\n\t"
"movl 16(%esp),%esi\n\t"
"cpuid\n\t" "cpuid\n\t"
"movl %%ebx, %%esi\n\t" "movl %eax,(%esi)\n\t"
"popl %%ebx" "movl %ebx,4(%esi)\n\t"
: "=a" (p[0]), "=S" (p[1]), "=c" (p[2]), "=d" (p[3]) "movl %ecx,8(%esi)\n\t"
: "0" (ax)); "movl %edx,12(%esi)\n\t"
#endif "popl %ebx\n\t"
"popl %esi\n\t"
"ret" )
#else
static void do_x86cpuid(unsigned int ax, unsigned int *p)
{
__cpuid((int*)p, ax);
} }
#endif
#else
static void do_x86cpuid(unsigned int ax, unsigned int *p)
{
}
#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)

2
sdk/tools/winesync/dbghelp.cfg
View file

@ -4,4 +4,4 @@ files:
include/dbghelp.h: sdk/include/psdk/dbghelp.h include/dbghelp.h: sdk/include/psdk/dbghelp.h
include/wine/mscvpdb.h: sdk/include/reactos/wine/mscvpdb.h include/wine/mscvpdb.h: sdk/include/reactos/wine/mscvpdb.h
tags: tags:
wine: 74f425e70dfbc43da1eaf9048f45bed52ef1d66c wine: b7f3e6ba317bec299e43156efcdb5469f39a8a3c