Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-cw
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-cw
Commits
e245df2a
Commit
e245df2a
authored
Jul 06, 2019
by
Alexandre Julliard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
wineboot: Fix do_cpuid() calling convention.
Wine-Bug:
https://bugs.winehq.org/show_bug.cgi?id=47464
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
8c34add3
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
8 additions
and
4 deletions
+8
-4
wineboot.c
programs/wineboot/wineboot.c
+8
-4
No files found.
programs/wineboot/wineboot.c
View file @
e245df2a
...
...
@@ -185,13 +185,13 @@ static DWORD set_reg_value( HKEY hkey, const WCHAR *name, const WCHAR *value )
return
RegSetValueExW
(
hkey
,
name
,
0
,
REG_SZ
,
(
const
BYTE
*
)
value
,
(
lstrlenW
(
value
)
+
1
)
*
sizeof
(
WCHAR
)
);
}
extern
void
do_cpuid
(
unsigned
int
ax
,
unsigned
int
*
p
);
#if defined(_MSC_VER)
void
do_cpuid
(
unsigned
int
ax
,
unsigned
int
*
p
)
static
void
do_cpuid
(
unsigned
int
ax
,
unsigned
int
*
p
)
{
__cpuid
(
p
,
ax
);
}
#elif defined(__i386__)
extern
void
__cdecl
do_cpuid
(
unsigned
int
ax
,
unsigned
int
*
p
);
__ASM_GLOBAL_FUNC
(
do_cpuid
,
"pushl %esi
\n\t
"
"pushl %ebx
\n\t
"
...
...
@@ -206,18 +206,22 @@ __ASM_GLOBAL_FUNC( do_cpuid,
"popl %esi
\n\t
"
"ret"
)
#elif defined(__x86_64__)
extern
void
__cdecl
do_cpuid
(
unsigned
int
ax
,
unsigned
int
*
p
);
__ASM_GLOBAL_FUNC
(
do_cpuid
,
"pushq %rsi
\n\t
"
"pushq %rbx
\n\t
"
"movl %edi,%eax
\n\t
"
"movq %rcx,%rax
\n\t
"
"movq %rdx,%rsi
\n\t
"
"cpuid
\n\t
"
"movl %eax,(%rsi)
\n\t
"
"movl %ebx,4(%rsi)
\n\t
"
"movl %ecx,8(%rsi)
\n\t
"
"movl %edx,12(%rsi)
\n\t
"
"popq %rbx
\n\t
"
"popq %rsi
\n\t
"
"ret"
)
#else
void
do_cpuid
(
unsigned
int
ax
,
unsigned
int
*
p
)
static
void
do_cpuid
(
unsigned
int
ax
,
unsigned
int
*
p
)
{
FIXME
(
"
\n
"
);
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment