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
08fc5320
Commit
08fc5320
authored
Aug 16, 2019
by
Zebediah Figura
Committed by
Alexandre Julliard
Aug 19, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ntdll: Handle UWOP_EPILOG directives in x86_64 unwind info.
Signed-off-by:
Zebediah Figura
<
z.figura12@gmail.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
7ea3a147
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
18 additions
and
0 deletions
+18
-0
signal_x86_64.c
dlls/ntdll/signal_x86_64.c
+18
-0
No files found.
dlls/ntdll/signal_x86_64.c
View file @
08fc5320
...
...
@@ -396,6 +396,7 @@ struct UNWIND_INFO
#define UWOP_SET_FPREG 3
#define UWOP_SAVE_NONVOL 4
#define UWOP_SAVE_NONVOL_FAR 5
#define UWOP_EPILOG 6
#define UWOP_SAVE_XMM128 8
#define UWOP_SAVE_XMM128_FAR 9
#define UWOP_PUSH_MACHFRAME 10
...
...
@@ -484,6 +485,19 @@ static void dump_unwind_info( ULONG64 base, RUNTIME_FUNCTION *function )
case
UWOP_PUSH_MACHFRAME
:
TRACE
(
"PUSH_MACHFRAME %u
\n
"
,
info
->
opcodes
[
i
].
info
);
break
;
case
UWOP_EPILOG
:
if
(
info
->
version
==
2
)
{
unsigned
int
offset
;
if
(
info
->
opcodes
[
i
].
info
)
offset
=
info
->
opcodes
[
i
].
offset
;
else
offset
=
(
info
->
opcodes
[
i
+
1
].
info
<<
8
)
+
info
->
opcodes
[
i
+
1
].
offset
;
TRACE
(
"epilog %p-%p
\n
"
,
(
char
*
)
base
+
function
->
EndAddress
-
offset
,
(
char
*
)
base
+
function
->
EndAddress
-
offset
+
info
->
opcodes
[
i
].
offset
);
i
+=
1
;
break
;
}
default:
FIXME
(
"unknown code %u
\n
"
,
info
->
opcodes
[
i
].
code
);
break
;
...
...
@@ -3669,6 +3683,7 @@ static int get_opcode_size( struct opcode op )
return
2
+
(
op
.
info
!=
0
);
case
UWOP_SAVE_NONVOL
:
case
UWOP_SAVE_XMM128
:
case
UWOP_EPILOG
:
return
2
;
case
UWOP_SAVE_NONVOL_FAR
:
case
UWOP_SAVE_XMM128_FAR
:
...
...
@@ -3904,6 +3919,9 @@ PVOID WINAPI RtlVirtualUnwind( ULONG type, ULONG64 base, ULONG64 pc,
case
UWOP_PUSH_MACHFRAME
:
FIXME
(
"PUSH_MACHFRAME %u
\n
"
,
info
->
opcodes
[
i
].
info
);
break
;
case
UWOP_EPILOG
:
if
(
info
->
version
==
2
)
break
;
/* nothing to do */
default
:
FIXME
(
"unknown code %u
\n
"
,
info
->
opcodes
[
i
].
code
);
break
;
...
...
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