From 0265aa0a15637957b732f45a37fba638e1ccd3c5 Mon Sep 17 00:00:00 2001 From: Oleksandr Tymoshenko Date: Sun, 1 Nov 2015 21:59:56 +0000 Subject: [PATCH] Treat synchronous VFP exception just like aynchronous: as an FP exception, not as illegal instruction --- sys/arm/arm/vfp.c | 4 ++-- sys/arm/include/vfp.h | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/sys/arm/arm/vfp.c b/sys/arm/arm/vfp.c index c149aafa78d2..80a7bd09782e 100644 --- a/sys/arm/arm/vfp.c +++ b/sys/arm/arm/vfp.c @@ -179,12 +179,12 @@ vfp_bounce(u_int addr, u_int insn, struct trapframe *frame, int code) fpexc = fmrx(fpexc); if (fpexc & VFPEXC_EN) { /* Clear any exceptions */ - fmxr(fpexc, fpexc & ~(VFPEXC_EX | VFPEXC_FP2V)); + fmxr(fpexc, fpexc & ~(VFPEXC_EX | VFPEXC_DEX | VFPEXC_FP2V)); /* kill the process - we do not handle emulation */ critical_exit(); - if (fpexc & VFPEXC_EX) { + if (fpexc & (VFPEXC_EX | VFPEXC_DEX)) { /* We have an exception, signal a SIGFPE */ ksiginfo_init_trap(&ksi); ksi.ksi_signo = SIGFPE; diff --git a/sys/arm/include/vfp.h b/sys/arm/include/vfp.h index 62345cec6107..2b91043a17d0 100644 --- a/sys/arm/include/vfp.h +++ b/sys/arm/include/vfp.h @@ -92,6 +92,7 @@ /* VFPEXC */ #define VFPEXC_EX (0x80000000) /* exception v1 v2 */ #define VFPEXC_EN (0x40000000) /* vfp enable */ +#define VFPEXC_DEX (0x20000000) /* Synchronous exception */ #define VFPEXC_FP2V (0x10000000) /* FPINST2 valid */ #define VFPEXC_INV (0x00000080) /* Input exception */ #define VFPEXC_UFC (0x00000008) /* Underflow exception */