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
4ef8e946
Commit
4ef8e946
authored
Feb 24, 2021
by
Alexandre Julliard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
winebuild: Set Thumb bit in CPSR register on syscall entry.
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
7905c316
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
1 deletion
+3
-1
exception.c
dlls/ntdll/tests/exception.c
+2
-1
import.c
tools/winebuild/import.c
+1
-0
No files found.
dlls/ntdll/tests/exception.c
View file @
4ef8e946
...
...
@@ -4233,7 +4233,8 @@ static void test_thread_context(void)
COMPARE
(
R9
);
COMPARE
(
R10
);
COMPARE
(
R11
);
COMPARE
(
Cpsr
);
ok
(
(
context
.
Cpsr
&
0xff0f0000
)
==
(
expect
.
Cpsr
&
0xff0f0000
),
"wrong Cpsr %08x/%08x
\n
"
,
context
.
Cpsr
,
expect
.
Cpsr
);
ok
(
context
.
Sp
==
expect
.
Sp
-
8
,
"wrong Sp %08x/%08x
\n
"
,
context
.
Sp
,
expect
.
Sp
-
8
);
/* Pc is somewhere close to the NtGetContextThread implementation */
...
...
tools/winebuild/import.c
View file @
4ef8e946
...
...
@@ -1611,6 +1611,7 @@ static void output_syscall_dispatcher( int count, const char *variant )
output
(
"
\t
mrc p15, 0, r7, c13, c0, 2
\n
"
);
/* NtCurrentTeb() */
output
(
"
\t
add r7, #0x1d8
\n
"
);
/* arm_thread_data()->syscall_frame */
output
(
"
\t
mrs ip, CPSR
\n
"
);
output
(
"
\t
bfi ip, lr, #5, #1
\n
"
);
/* set thumb bit */
output
(
"
\t
str ip, [sp, #4]
\n
"
);
output
(
"
\t
str sp, [r7]
\n
"
);
/* syscall frame */
output
(
"
\t
ldr r5, 6f+4
\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