Skip to content

W
wine-winehq
Commit 1b5b311c authored by André Hentschel's avatar André Hentschel Committed by Alexandre Julliard
Browse files
Options

ntdll: Use correct PC for instruction decoding on ARM64.

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46194Signed-off-by: 's avatarAndré Hentschel <nerv@dawncrow.de> Signed-off-by: 's avatarAlexandre Julliard <julliard@winehq.org>
parent d4987802
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 3 deletions
dlls/ntdll/signal_arm64.c
View file @ 1b5b311c
......@@ -611,9 +611,9 @@ static NTSTATUS raise_exception( EXCEPTION_RECORD *rec, CONTEXT *context, BOOL f
return STATUS_SUCCESS;
}
static inline DWORD is_write_fault( ucontext_t *context )
static inline DWORD is_write_fault( DWORD *pc )
{
DWORD inst = *(DWORD *)PC_sig(context);
DWORD inst = *pc;
if ((inst & 0xbfff0000) == 0x0c000000 /* C3.3.1 */ ||
(inst & 0xbfe00000) == 0x0c800000 /* C3.3.2 */ ||
(inst & 0xbfdf0000) == 0x0d000000 /* C3.3.3 */ ||
......@@ -637,6 +637,7 @@ static void segv_handler( int signal, siginfo_t *info, void *ucontext )
{
EXCEPTION_RECORD *rec;
ucontext_t *context = ucontext;
DWORD *orig_pc = PC_sig(context);
/* check for page fault inside the thread stack */
if (signal == SIGSEGV &&
......@@ -664,7 +665,7 @@ static void segv_handler( int signal, siginfo_t *info, void *ucontext )
case SIGSEGV: /* Segmentation fault */
rec->ExceptionCode = EXCEPTION_ACCESS_VIOLATION;
rec->NumberParameters = 2;
rec->ExceptionInformation[0] = is_write_fault(context);
rec->ExceptionInformation[0] = is_write_fault(orig_pc);
rec->ExceptionInformation[1] = (ULONG_PTR)info->si_addr;
break;
case SIGBUS: /* Alignment check exception */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment