Changeset 1275 for cpp/common/nonstd_math.cpp

Timestamp:

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

Author:

Maciej Komosinski

Message:

More unification of floating point exception handling across platforms

File:

• cpp/common/nonstd_math.cpp (modified) (6 diffs)

cpp/common/nonstd_math.cpp

@@ -88 +88 @@
 }
 
-
-
+namespace fpExcept
+{ //shared for all platform, using crossplatform constants, can be defined in build_config (but also conditionally changed from the code)
+int wanted_exceptions =
+#ifdef WANTED_FP_EXCEPTIONS
+        WANTED_FP_EXCEPTIONS;
+#else
+        FPEX_DIV0; //default when 'WANTED_FP_EXCEPTIONS' is not defined (add more?)
+#endif
+}
 
 // Idea: enable selected floating point exceptions when the app starts and disable them temporarily when dividing values in ExtValue, so that we can directly handle problematic cases there.
@@ -96 +103 @@
 #ifdef IPHONE
 //TODO! -> ? http://stackoverflow.com/questions/12762418/how-to-enable-sigfpe-signal-on-division-by-zero-in-ios-app
-void fpExceptInit()
-{}
-
-void fpExceptEnable()
-{}
-
-void fpExceptDisable()
-{}
+namespace fpExcept
+{ 
+        void init() {}
+        void enable() {}
+        void disable() {}
+}
 #endif
 
 #ifdef MACOS
-//TODO...?
-
-void fpExceptInit()
-{}
-
-void fpExceptEnable()
-{}
-
-void fpExceptDisable()
-{}
+//TODO...? (even less reasons to omit this in macos :-P)
+namespace fpExcept
+{ 
+        void init() {}
+        void enable() {}
+        void disable() {}
+}
 #endif
 
 
 #if defined LINUX || defined TIZEN || defined __ANDROID__
-
 #include <fenv.h>
 
-static constexpr int WANTED_FP_EXCEPTIONS = FE_DIVBYZERO | FE_INVALID | FE_OVERFLOW;
-
-void fpExceptInit()
-{}
-
-void fpExceptEnable()
-{
-        feclearexcept(WANTED_FP_EXCEPTIONS);
-        feenableexcept(WANTED_FP_EXCEPTIONS);
-}
-
-void fpExceptDisable()
-{
-        fedisableexcept(WANTED_FP_EXCEPTIONS);
-}
-
+namespace fpExcept
+{ 
+        void init() {}
+        void enable()
+        {
+                feclearexcept(wanted_exceptions);
+                feenableexcept(wanted_exceptions);
+        }
+        void disable()
+        {
+                fedisableexcept(wanted_exceptions);
+        }
+};
 #endif
 
@@ -146 +144 @@
 #if defined(__BORLANDC__) || defined(_MSC_VER)
 
+namespace fpExcept
+{ 
 // in Borland, there was once a problem like this:
 // http://qc.embarcadero.com/wc/qcmain.aspx?d=5128
@@ -177 +177 @@
 unsigned int fp_control_word_muted;
 
-
-void fpExceptInit()
+void init()
 {
         _controlfp_s(&fp_control_word_std, 0, 0); //in Visual C++, the default value is exactly the masks listed below, and we have to turn them off to enable exceptions
         // Make the new fp env same as the old one, except for the changes we're going to make
-        fp_control_word_muted = fp_control_word_std & ~(EM_INVALID | /*EM_DENORMAL |*/ EM_ZERODIVIDE | EM_OVERFLOW /* | EM_UNDERFLOW | EM_INEXACT */); //commented out exceptions that occur during proper operation
-}
-
-void fpExceptEnable()
+        fp_control_word_muted = fp_control_word_std & ~wanted_exceptions;
+}
+
+void enable()
 {
         //_fpreset(); //not needed since we just _clearfp()... mentioned in https://stackoverflow.com/questions/4282217/visual-c-weird-behavior-after-enabling-floating-point-exceptions-compiler-b
@@ -193 +192 @@
 }
 
-void fpExceptDisable()
+void disable()
 {
         //_fpreset(); //not needed since we just _clearfp()... mentioned in https://stackoverflow.com/questions/4282217/visual-c-weird-behavior-after-enabling-floating-point-exceptions-compiler-b
@@ -200 +199 @@
         _controlfp_s(&was, fp_control_word_std, _MCW_EM);
 }
-#endif
+        
+};
+
+#endif