Fix boolean logic

Author: Andrew-Beggs-ECMWF

src/fiat/drhook/drhook.c

@@ -259,7 +259,7 @@ static unsigned int fpcr_to_fenv(unsigned long long fpcr_flags) {
   }
   unsigned long long all_fpcr_flags = __fpcr_trap_inexact | __fpcr_trap_underflow |
     __fpcr_trap_overflow | __fpcr_trap_divbyzero | __fpcr_trap_invalid | __fpcr_flush_to_zero;
-  if (fenv_flag == all_fpcr_flags ) {
+  if (fpcr_flags == all_fpcr_flags ) {
     return FE_ALL_EXCEPT;
   }
   return fenv_flag;
@@ -2621,7 +2621,7 @@ process_options()
     // Not all platforms, e.g. Nvidia's Grace, support trapping FPEs,
     // so we have to check if trapping is enabled
     int prev_enabled_exceptions = fegetexcept();
-    int drhook_trapfpe_hw_support = feenableexcept(FE_INVALID & FE_DIVBYZERO & FE_OVERFLOW) != -1;
+    int drhook_trapfpe_hw_support = feenableexcept(FE_INVALID | FE_DIVBYZERO | FE_OVERFLOW) != -1;
     // Even if we failed above, we should still try to restore the flags
 #if defined(__APPLE__) && defined(__arm64__)
     // This seems to be enabled by default, but causes DrHook to raise a SIGILL in the OPTPRINTs below

tests/drhook/drhook_core/drhook_no_hw_fpe/drhook_check_hw_fpe_support.c

@@ -66,7 +66,7 @@ static unsigned int fpcr_to_fenv(unsigned long long fpcr_flags) {
   }
   unsigned long long all_fpcr_flags = __fpcr_trap_inexact & __fpcr_trap_underflow &
     __fpcr_trap_overflow & __fpcr_trap_divbyzero & __fpcr_trap_invalid & __fpcr_flush_to_zero;
-  if (fenv_flag == all_fpcr_flags ) {
+  if (fpcr_flags == all_fpcr_flags ) {
     return FE_ALL_EXCEPT;
   }
   return fenv_flag;
@@ -95,5 +95,5 @@ int feenableexcept(int mask) {
 #endif
 
 int main() {
-  return feenableexcept(FE_INVALID & FE_DIVBYZERO & FE_OVERFLOW) == -1;
+  return feenableexcept(FE_INVALID | FE_DIVBYZERO | FE_OVERFLOW) == -1;
 }