=?UTF-8?Q?Andr=C3=A9=20Hentschel=20?=: ntdll: Reuse signal to trap translation for FreeBSD on ARM.
Alexandre Julliard
julliard at winehq.org
Mon Apr 22 16:30:39 CDT 2019
Module: wine
Branch: master
Commit: ed968c23d68d417bdb2de7de3fbab160d15bacb3
URL: https://source.winehq.org/git/wine.git/?a=commit;h=ed968c23d68d417bdb2de7de3fbab160d15bacb3
Author: André Hentschel <nerv at dawncrow.de>
Date: Fri Apr 19 19:03:32 2019 +0200
ntdll: Reuse signal to trap translation for FreeBSD on ARM.
Signed-off-by: André Hentschel <nerv at dawncrow.de>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/ntdll/signal_arm.c | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/dlls/ntdll/signal_arm.c b/dlls/ntdll/signal_arm.c
index 5db3c51..e01c8ce 100644
--- a/dlls/ntdll/signal_arm.c
+++ b/dlls/ntdll/signal_arm.c
@@ -148,7 +148,8 @@ static inline enum arm_trap_code get_trap_code( int signal, const ucontext_t *si
enum arm_trap_code trap = TRAP_sig(sigcontext);
if (trap)
return trap;
- /* trap is 0 on arm64 kernel */
+#endif
+
switch (signal)
{
case SIGILL:
@@ -158,11 +159,8 @@ static inline enum arm_trap_code get_trap_code( int signal, const ucontext_t *si
case SIGBUS:
return TRAP_ARM_ALIGNFLT;
default:
- return trap;
+ return TRAP_ARM_UNKNOWN;
}
-#else
- return TRAP_ARM_UNKNOWN; /* unknown trap code */
-#endif
}
/***********************************************************************
More information about the wine-cvs
mailing list