Module: wine Branch: master Commit: 1b5b311cce908e33a5b1b11d5eb659e99c92c2f9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1b5b311cce908e33a5b1b11d5...
Author: André Hentschel nerv@dawncrow.de Date: Fri Dec 21 20:07:48 2018 +0100
ntdll: Use correct PC for instruction decoding on ARM64.
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46194 Signed-off-by: André Hentschel nerv@dawncrow.de Signed-off-by: Alexandre Julliard julliard@winehq.org
---
dlls/ntdll/signal_arm64.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/dlls/ntdll/signal_arm64.c b/dlls/ntdll/signal_arm64.c index c976884..e195889 100644 --- a/dlls/ntdll/signal_arm64.c +++ b/dlls/ntdll/signal_arm64.c @@ -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 */