Fix get_except and include FE_DENORM in FE_ALL_EXCEPT.

Author: lntue

libc/include/llvm-libc-macros/fenv-macros.h

@@ -14,9 +14,10 @@
 #define FE_INVALID 0x4
 #define FE_OVERFLOW 0x8
 #define FE_UNDERFLOW 0x10
-#define __FE_DENORM 0x20
+#define FE_DENORM 0x20
 #define FE_ALL_EXCEPT                                                          \
-  (FE_DIVBYZERO | FE_INEXACT | FE_INVALID | FE_OVERFLOW | FE_UNDERFLOW)
+  (FE_DIVBYZERO | FE_INEXACT | FE_INVALID | FE_OVERFLOW | FE_UNDERFLOW |       \
+   FE_DENORM)
 
 #define FE_DOWNWARD 0x400
 #define FE_TONEAREST 0

libc/src/__support/FPUtil/x86_64/fenv_mxcsr_utils.h

@@ -71,7 +71,7 @@ LIBC_INLINE static uint16_t test_except(uint16_t excepts) {
 }
 
 LIBC_INLINE static uint16_t get_except() {
-  uint32_t mxcsr = get_mxcsr();
+  uint32_t mxcsr = ~get_mxcsr();
   return static_cast<uint16_t>((mxcsr >> ExceptionFlags::MXCSR_EXCEPTION_MASK_BIT_POSITION) & ExceptionFlags::ALL_F);
 }
 

libc/src/__support/FPUtil/x86_64/fenv_x86_common.h

@@ -49,6 +49,8 @@ LIBC_INLINE static constexpr bool fenv_exceptions_match_x86() {
   return (FE_INVALID == ExceptionFlags::INVALID_F) &&
 #ifdef __FE_DENORM
          (__FE_DENORM == ExceptionFlags::DENORMAL_F) &&
+#elif defined(FE_DENORM)
+         (FE_DENORM == ExceptionFlags::DENORMAL_F) &&
 #endif // __FE_DENORM
          (FE_DIVBYZERO == ExceptionFlags::DIV_BY_ZERO_F) &&
          (FE_OVERFLOW == ExceptionFlags::OVERFLOW_F) &&
@@ -87,6 +89,8 @@ LIBC_INLINE static uint16_t get_status_value_from_except(int excepts) {
     return ((excepts & FE_INVALID) ? ExceptionFlags::INVALID_F : 0) |
 #ifdef __FE_DENORM
            ((excepts & __FE_DENORM) ? ExceptionFlags::DENORMAL_F : 0) |
+#elif defined(FE_DENORM)
+           ((excepts & FE_DENORM) ? ExceptionFlags::DENORMAL_F : 0) |
 #endif // __FE_DENORM
            ((excepts & FE_DIVBYZERO) ? ExceptionFlags::DIV_BY_ZERO_F : 0) |
            ((excepts & FE_OVERFLOW) ? ExceptionFlags::OVERFLOW_F : 0) |
@@ -102,6 +106,8 @@ LIBC_INLINE static int get_macro_from_exception_status(uint16_t status) {
     return ((status & ExceptionFlags::INVALID_F) ? FE_INVALID : 0) |
 #ifdef __FE_DENORM
            ((status & ExceptionFlags::DENORMAL_F) ? __FE_DENORM : 0) |
+#elif defined(FE_DENORM)
+           ((status & ExceptionFlags::DENORMAL_F) ? FE_DENORM : 0) |
 #endif // __FE_DENORM
            ((status & ExceptionFlags::DIV_BY_ZERO_F) ? FE_DIVBYZERO : 0) |
            ((status & ExceptionFlags::OVERFLOW_F) ? FE_OVERFLOW : 0) |

libc/src/__support/FPUtil/x86_64/fenv_x87_utils.h

@@ -113,8 +113,8 @@ LIBC_INLINE static uint16_t test_except(uint16_t excepts) {
 }
 
 LIBC_INLINE static uint16_t get_except() {
-  uint16_t x87_status = get_x87_control_word();
-  return static_cast<uint16_t>(x87_status & ExceptionFlags::ALL_F);
+  uint16_t x87_control = get_x87_control_word();
+  return static_cast<uint16_t>((~x87_control) & ExceptionFlags::ALL_F);
 }
 
 LIBC_INLINE static void set_except(uint16_t excepts) {