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
b8ec1068
Commit
b8ec1068
authored
Jul 11, 2022
by
Brendan Shanks
Committed by
Alexandre Julliard
Jul 11, 2022
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ntdll: Add ".globl" for asm labels referenced from C.
Fixes syscall faults on 32-bit macOS. Spotted by Stefan Dösinger.
parent
8f3e19a5
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
11 additions
and
5 deletions
+11
-5
signal_arm.c
dlls/ntdll/unix/signal_arm.c
+2
-1
signal_arm64.c
dlls/ntdll/unix/signal_arm64.c
+2
-1
signal_i386.c
dlls/ntdll/unix/signal_i386.c
+4
-2
signal_x86_64.c
dlls/ntdll/unix/signal_x86_64.c
+3
-1
No files found.
dlls/ntdll/unix/signal_arm.c
View file @
b8ec1068
...
...
@@ -1261,7 +1261,8 @@ __ASM_GLOBAL_FUNC( __wine_syscall_dispatcher,
"5:
\t
movw r0, #0x000d
\n\t
"
/* STATUS_INVALID_PARAMETER */
"movt r0, #0xc000
\n\t
"
"add sp, sp, #0x10
\n\t
"
"b 4b
\n
"
"b 4b
\n\t
"
".globl "
__ASM_NAME
(
"__wine_syscall_dispatcher_return"
)
"
\n
"
__ASM_NAME
(
"__wine_syscall_dispatcher_return"
)
":
\n\t
"
"mov r8, r0
\n\t
"
"mov r0, r1
\n\t
"
...
...
dlls/ntdll/unix/signal_arm64.c
View file @
b8ec1068
...
...
@@ -1382,7 +1382,8 @@ __ASM_GLOBAL_FUNC( __wine_syscall_dispatcher,
"ret x16
\n
"
"4:
\t
mov x0, #0xc0000000
\n\t
"
/* STATUS_INVALID_PARAMETER */
"movk x0, #0x000d
\n\t
"
"b 3b
\n
"
"b 3b
\n\t
"
".globl "
__ASM_NAME
(
"__wine_syscall_dispatcher_return"
)
"
\n
"
__ASM_NAME
(
"__wine_syscall_dispatcher_return"
)
":
\n\t
"
"mov sp, x0
\n\t
"
"mov x0, x1
\n\t
"
...
...
dlls/ntdll/unix/signal_i386.c
View file @
b8ec1068
...
...
@@ -2498,7 +2498,8 @@ __ASM_GLOBAL_FUNC( __wine_syscall_dispatcher,
"movw $0,0x02(%ecx)
\n\t
"
/* frame->restore_flags */
"popl 0x08(%ecx)
\n\t
"
/* frame->eip */
"pushfl
\n\t
"
"popl 0x04(%ecx)
\n
"
/* frame->eflags */
"popl 0x04(%ecx)
\n\t
"
/* frame->eflags */
".globl "
__ASM_NAME
(
"__wine_syscall_dispatcher_prolog_end"
)
"
\n
"
__ASM_NAME
(
"__wine_syscall_dispatcher_prolog_end"
)
":
\n\t
"
"movl %esp,0x0c(%ecx)
\n\t
"
/* frame->esp */
"movw %cs,0x10(%ecx)
\n\t
"
...
...
@@ -2611,7 +2612,8 @@ __ASM_GLOBAL_FUNC( __wine_syscall_dispatcher,
"popl %ds
\n\t
"
"iret
\n
"
"6:
\t
movl $0xc000000d,%eax
\n\t
"
/* STATUS_INVALID_PARAMETER */
"jmp 5b
\n
"
"jmp 5b
\n\t
"
".globl "
__ASM_NAME
(
"__wine_syscall_dispatcher_return"
)
"
\n
"
__ASM_NAME
(
"__wine_syscall_dispatcher_return"
)
":
\n\t
"
"movl 8(%esp),%eax
\n\t
"
"movl 4(%esp),%esp
\n\t
"
...
...
dlls/ntdll/unix/signal_x86_64.c
View file @
b8ec1068
...
...
@@ -3295,6 +3295,7 @@ __ASM_GLOBAL_FUNC( __wine_syscall_dispatcher,
"pushfq
\n\t
"
"popq 0x80(%rcx)
\n\t
"
"movl $0,0x94(%rcx)
\n\t
"
/* frame->restore_flags */
".globl "
__ASM_NAME
(
"__wine_syscall_dispatcher_prolog_end"
)
"
\n
"
__ASM_NAME
(
"__wine_syscall_dispatcher_prolog_end"
)
":
\n\t
"
"movq %rax,0x00(%rcx)
\n\t
"
"movq %rbx,0x08(%rcx)
\n\t
"
...
...
@@ -3424,7 +3425,8 @@ __ASM_GLOBAL_FUNC( __wine_syscall_dispatcher,
"movq 0x10(%rcx),%rcx
\n
"
"iretq
\n
"
"5:
\t
movl $0xc000000d,%edx
\n\t
"
/* STATUS_INVALID_PARAMETER */
"movq %rsp,%rcx
\n
"
"movq %rsp,%rcx
\n\t
"
".globl "
__ASM_NAME
(
"__wine_syscall_dispatcher_return"
)
"
\n
"
__ASM_NAME
(
"__wine_syscall_dispatcher_return"
)
":
\n\t
"
"movl 0xb0(%rcx),%r14d
\n\t
"
/* frame->syscall_flags */
"movq %rdx,%rax
\n\t
"
...
...
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