Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-winehq
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-winehq
Commits
5a68254c
Commit
5a68254c
authored
Jul 15, 2020
by
Alexandre Julliard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ntdll: Handle faults inside the signal handler also on ARM.
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
f30ba2cf
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
16 deletions
+4
-16
signal_arm.c
dlls/ntdll/unix/signal_arm.c
+4
-16
No files found.
dlls/ntdll/unix/signal_arm.c
View file @
5a68254c
...
@@ -567,23 +567,8 @@ extern void WINAPI call_user_exception_dispatcher( EXCEPTION_RECORD *rec, CONTEX
...
@@ -567,23 +567,8 @@ extern void WINAPI call_user_exception_dispatcher( EXCEPTION_RECORD *rec, CONTEX
*/
*/
static
void
WINAPI
raise_segv_exception
(
EXCEPTION_RECORD
*
rec
,
CONTEXT
*
context
)
static
void
WINAPI
raise_segv_exception
(
EXCEPTION_RECORD
*
rec
,
CONTEXT
*
context
)
{
{
NTSTATUS
status
;
NTSTATUS
status
=
NtRaiseException
(
rec
,
context
,
TRUE
);
switch
(
rec
->
ExceptionCode
)
{
case
EXCEPTION_ACCESS_VIOLATION
:
if
(
rec
->
NumberParameters
==
2
)
{
if
(
!
(
rec
->
ExceptionCode
=
virtual_handle_fault
(
(
void
*
)
rec
->
ExceptionInformation
[
1
],
rec
->
ExceptionInformation
[
0
],
FALSE
)))
goto
done
;
}
break
;
}
status
=
NtRaiseException
(
rec
,
context
,
TRUE
);
if
(
status
)
RtlRaiseStatus
(
status
);
if
(
status
)
RtlRaiseStatus
(
status
);
done
:
set_cpu_context
(
context
);
}
}
...
@@ -624,6 +609,9 @@ static void segv_handler( int signal, siginfo_t *info, void *ucontext )
...
@@ -624,6 +609,9 @@ static void segv_handler( int signal, siginfo_t *info, void *ucontext )
rec
->
NumberParameters
=
2
;
rec
->
NumberParameters
=
2
;
rec
->
ExceptionInformation
[
0
]
=
(
get_error_code
(
context
)
&
0x800
)
!=
0
;
rec
->
ExceptionInformation
[
0
]
=
(
get_error_code
(
context
)
&
0x800
)
!=
0
;
rec
->
ExceptionInformation
[
1
]
=
(
ULONG_PTR
)
info
->
si_addr
;
rec
->
ExceptionInformation
[
1
]
=
(
ULONG_PTR
)
info
->
si_addr
;
if
(
!
(
rec
->
ExceptionCode
=
virtual_handle_fault
(
(
void
*
)
rec
->
ExceptionInformation
[
1
],
rec
->
ExceptionInformation
[
0
],
FALSE
)))
return
;
break
;
break
;
case
TRAP_ARM_ALIGNFLT
:
/* Alignment check exception */
case
TRAP_ARM_ALIGNFLT
:
/* Alignment check exception */
rec
->
ExceptionCode
=
EXCEPTION_DATATYPE_MISALIGNMENT
;
rec
->
ExceptionCode
=
EXCEPTION_DATATYPE_MISALIGNMENT
;
...
...
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