André Hentschel : ntdll: Fix Cpsr value in CONTEXT_ARM64.
Module: wine Branch: master Commit: 99db4c697d0349f31879126adcb9d365383513c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=99db4c697d0349f31879126adc... Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Jun 4 18:51:59 2017 +0200 ntdll: Fix Cpsr value in CONTEXT_ARM64. The CPU can be configured to not allow reading DAIF in EL0t (User Mode), and for debugging purpose NZCV might be more interesting. Reported by Stefan Dösinger Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_arm64.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/signal_arm64.c b/dlls/ntdll/signal_arm64.c index 14c5260..ca169a1 100644 --- a/dlls/ntdll/signal_arm64.c +++ b/dlls/ntdll/signal_arm64.c @@ -185,7 +185,7 @@ __ASM_STDCALL_FUNC( RtlCaptureContext, 8, "mov w1, #0x400000\n\t" /* CONTEXT_ARM64 */ "add w1, w1, #0x3\n\t" /* CONTEXT_FULL */ "str w1, [x0]\n\t" /* context->ContextFlags */ /* 32-bit, look at cpsr */ - "mrs x1, DAIF\n\t" + "mrs x1, NZCV\n\t" "str w1, [x0, #0x4]\n\t" /* context->Cpsr */ "ldp x0, x1, [sp], #32\n\t" "str x0, [x0, #0x8]\n\t" /* context->X0 */
participants (1)
-
Alexandre Julliard