Changeset 1275 for cpp/common/nonstd_math.h

Timestamp:

09/09/23 15:16:31 (20 months ago)

Author:

Maciej Komosinski

Message:

More unification of floating point exception handling across platforms

File:

• cpp/common/nonstd_math.h (modified) (3 diffs)

cpp/common/nonstd_math.h ¶

@@ -9 +9 @@
 #ifdef _MSC_VER
  #define _USE_MATH_DEFINES //after this is defined, the next #include <math.h> or <cmath> will define M_PI etc.
- #include <math.h> //w vc2008 dzia³a³o tu <cmath>, ale w vc2010 juz nie bo "coœ" (jakiœ inny .h stl'a?) includuje wczeœniej <cmath> bez _USE_MATH_DEFINES, a <cmath> includuje <math.h> (ale tylko raz bo ma "include guards" jak kazdy .h)
+ #include <math.h> //w vc2008 dzia�a�o tu <cmath>, ale w vc2010 juz nie bo "co�" (jaki� inny .h stl'a?) includuje wcze�niej <cmath> bez _USE_MATH_DEFINES, a <cmath> includuje <math.h> (ale tylko raz bo ma "include guards" jak kazdy .h)
  #include <float.h>
  //#define isnan(x) _isnan(x) //since 2014 we use std::isnan()
@@ -69 +69 @@
 
 #if defined SHP
- //#define __assert_func(a,b,c,d) 0 //Currently, we are sorry to inform you that assert() is not yet supported. We have considered your request for internal discussion. Na szczêœcie jest w³asna (byle by by³a, bo i tak zak³adamy ze assert ktore przeciez dziala tylko w trybie debug nie jest potrzebne na bada) implementacja w "bada-assert.cpp"
+ //#define __assert_func(a,b,c,d) 0 //Currently, we are sorry to inform you that assert() is not yet supported. We have considered your request for internal discussion. Na szcz�cie jest w�asna (byle by by�a, bo i tak zak�adamy ze assert ktore przeciez dziala tylko w trybie debug nie jest potrzebne na bada) implementacja w "bada-assert.cpp"
  #define isnan(x) false //isnan() sie nie linkuje
  #define finite(x) true //j.w.
@@ -79 +79 @@
 #endif
 
+#if defined LINUX || defined TIZEN || defined __ANDROID__
+#include <fenv.h>
+#endif
+
+namespace fpExcept
+{
 //handling floating point exceptions
-void fpExceptInit(); //call once, before ...Enable/Disable
-void fpExceptEnable();
-void fpExceptDisable();
+#if defined LINUX || defined TIZEN || defined __ANDROID__
+        //fenv.h values
+        static constexpr unsigned int FPEX_DIV0 = FE_DIVBYZERO;
+        static constexpr unsigned int FPEX_INVALID = FE_INVALID;
+        static constexpr unsigned int FPEX_OVERFLOW = FE_OVERFLOW;
+#elif defined IPHONE
+        // (not implemented but these constants are still needed)
+        static constexpr unsigned int FPEX_DIV0 = 0;
+        static constexpr unsigned int FPEX_INVALID = 0;
+        static constexpr unsigned int FPEX_OVERFLOW = 0;
+#else
+        //_control87() values
+        static constexpr unsigned int FPEX_DIV0 = EM_ZERODIVIDE;
+        static constexpr unsigned int FPEX_INVALID = EM_INVALID;
+        static constexpr unsigned int FPEX_OVERFLOW = EM_OVERFLOW;
+#endif
+        extern int wanted_exceptions;
+        
+        void init(); //call once, before ...Enable/Disable
+        void enable();
+        void disable();
+};
 
 // std::lerp can be used since C++20 (and has some guaranteed properties probably better than this basic formula) but apparently it is not a template