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
6f9cc9a0
Commit
6f9cc9a0
authored
Jul 07, 2022
by
Piotr Caban
Committed by
Alexandre Julliard
Jul 11, 2022
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ntdll: Fix x64 single step exception detection on macOS.
On macOS si_code is always set to TRAP_BRKPT.
parent
9fbdf2b4
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
13 deletions
+3
-13
signal_x86_64.c
dlls/ntdll/unix/signal_x86_64.c
+3
-13
No files found.
dlls/ntdll/unix/signal_x86_64.c
View file @
6f9cc9a0
...
...
@@ -2693,22 +2693,12 @@ static void trap_handler( int signal, siginfo_t *siginfo, void *sigcontext )
rec
.
ExceptionAddress
=
(
void
*
)
RIP_sig
(
ucontext
);
save_context
(
&
context
,
sigcontext
);
switch
(
siginfo
->
si_code
)
switch
(
TRAP_sig
(
ucontext
)
)
{
case
TRAP_TRACE
:
/* Single-step exception */
case
4
/* TRAP_HWBKPT */
:
/* Hardware breakpoint exception */
case
TRAP_x86_TRCTRAP
:
rec
.
ExceptionCode
=
EXCEPTION_SINGLE_STEP
;
break
;
case
TRAP_BRKPT
:
/* Breakpoint exception */
#ifdef SI_KERNEL
case
SI_KERNEL
:
#endif
/* Check if this is actually icebp instruction */
if
(((
unsigned
char
*
)
RIP_sig
(
ucontext
))[
-
1
]
==
0xF1
)
{
rec
.
ExceptionCode
=
EXCEPTION_SINGLE_STEP
;
break
;
}
case
TRAP_x86_BPTFLT
:
rec
.
ExceptionAddress
=
(
char
*
)
rec
.
ExceptionAddress
-
1
;
/* back up over the int3 instruction */
/* fall through */
default:
...
...
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