Mercurial > octave

--- a/libinterp/octave-value/ov-java.cc	Tue Jun 14 10:24:39 2016 -0400
+++ b/libinterp/octave-value/ov-java.cc	Tue Jun 14 10:47:10 2016 -0400
@@ -27,11 +27,7 @@
 #include "defun.h"
 #include "error.h"
 #include "errwarn.h"
-#include "fpucw.h"
-
-#if defined (HAVE_FPU_CONTROL_H)
-#  include <fpu_control.h>
-#endif
+#include "fpucw-wrapper.h"

 #if defined (HAVE_WINDOWS_H)
 #  include <windows.h>
@@ -508,23 +504,6 @@
   return retval;
 }

-#if ! defined (_FPU_DEFAULT)
-#  if defined __i386__ || defined __x86_64__
-#    define _FPU_DEFAULT 0x037f
-#  else
-#    define _FPU_DEFAULT 0
-#  endif
-#endif
-
-static void
-restore_fpu_state (void)
-{
-  fpucw_t cw = GET_FPUCW ();
-
-  if (cw != _FPU_DEFAULT)
-    SET_FPUCW (_FPU_DEFAULT);
-}
-
 static void
 initialize_jvm (void)
 {
@@ -726,7 +705,7 @@
       if (jvm_lib)
         jvm_lib.close ();

-      restore_fpu_state ();
+      octave_set_default_fpucw ();
     }
 }

@@ -951,7 +930,7 @@
       idx++;
     }

-  restore_fpu_state ();
+  octave_set_default_fpucw ();

   return dv;
 }
@@ -1005,7 +984,7 @@
   else
     retval = check_exception (jni_env);

-  restore_fpu_state ();
+  octave_set_default_fpucw ();

   return retval;
 }
@@ -1035,7 +1014,7 @@
   else
     retval = check_exception (jni_env);

-  restore_fpu_state ();
+  octave_set_default_fpucw ();

   return retval;
 }
@@ -1076,7 +1055,7 @@
           name_list.push_back (jstring_to_string (jni_env, fieldName));
         }

-      restore_fpu_state ();
+      octave_set_default_fpucw ();
     }

   string_vector v (name_list);
@@ -1132,7 +1111,7 @@
       else
         error ("unable to convert Java object to string");

-      restore_fpu_state ();
+      octave_set_default_fpucw ();
     }

   return retval;
@@ -1401,7 +1380,7 @@
   if (retval.is_undefined ())
     retval = octave_value (new octave_java (jobj, jcls));

-  restore_fpu_state ();
+  octave_set_default_fpucw ();

   return retval;
 }
@@ -1685,7 +1664,7 @@
       jmethodID mID = current_env->GetStaticMethodID (cls, "checkPendingAction", "()V");
       current_env->CallStaticVoidMethod (cls, mID);

-      restore_fpu_state ();
+      octave_set_default_fpucw ();
     }

   return 0;
@@ -1712,7 +1691,7 @@
           error (msg.c_str ());
         }

-      restore_fpu_state ();
+      octave_set_default_fpucw ();
     }
 }

@@ -2159,7 +2138,7 @@
             retval = check_exception (jni_env);
         }

-      restore_fpu_state ();
+      octave_set_default_fpucw ();
     }

   return retval;
@@ -2228,7 +2207,7 @@
             retval = check_exception (jni_env);
         }

-      restore_fpu_state ();
+      octave_set_default_fpucw ();
     }

   return retval;
@@ -2300,7 +2279,7 @@
             check_exception (jni_env);
         }

-      restore_fpu_state ();
+      octave_set_default_fpucw ();
     }

   return retval;
@@ -2362,7 +2341,7 @@
       else
         retval = check_exception (jni_env);

-      restore_fpu_state ();
+      octave_set_default_fpucw ();
     }

   return retval;
@@ -2423,7 +2402,7 @@
       else
         retval = check_exception (jni_env);

-      restore_fpu_state ();
+      octave_set_default_fpucw ();
     }

   return retval;
@@ -2487,7 +2466,7 @@
           check_exception (jni_env);
         }

-      restore_fpu_state ();
+      octave_set_default_fpucw ();
     }

   return retval;
@@ -2552,7 +2531,7 @@
           check_exception (jni_env);
         }

-      restore_fpu_state ();
+      octave_set_default_fpucw ();
     }

   return retval;
--- a/liboctave/util/oct-inttypes.cc	Tue Jun 14 10:24:39 2016 -0400
+++ b/liboctave/util/oct-inttypes.cc	Tue Jun 14 10:47:10 2016 -0400
@@ -25,8 +25,6 @@
 #  include "config.h"
 #endif

-#include <fpucw.h>
-
 #include "lo-error.h"

 #include "oct-inttypes.h"
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/liboctave/wrappers/fpucw-wrapper.c	Tue Jun 14 10:47:10 2016 -0400
@@ -0,0 +1,55 @@
+/*
+
+Copyright (C) 2016 John W. Eaton
+
+This file is part of Octave.
+
+Octave is free software; you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation; either version 3 of the License, or (at your
+option) any later version.
+
+Octave is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with Octave; see the file COPYING.  If not, see
+<http://www.gnu.org/licenses/>.
+
+*/
+
+// The fpucw macros are provided by gnulib.  We don't include gnulib
+// headers directly in Octave's C++ source files to avoid problems that
+// may be caused by the way that gnulib overrides standard library
+// functions.
+
+#if defined (HAVE_CONFIG_H)
+#  include "config.h"
+#endif
+
+#if defined (HAVE_FPU_CONTROL_H)
+#  include <fpu_control.h>
+#endif
+
+#include "fpucw.h"
+
+#include "fpucw-wrapper.h"
+
+#if ! defined (_FPU_DEFAULT)
+#  if defined __i386__ || defined __x86_64__
+#    define _FPU_DEFAULT 0x037f
+#  else
+#    define _FPU_DEFAULT 0
+#  endif
+#endif
+
+void
+octave_set_default_fpucw (void)
+{
+  fpucw_t cw = GET_FPUCW ();
+
+  if (cw != _FPU_DEFAULT)
+    SET_FPUCW (_FPU_DEFAULT);
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/liboctave/wrappers/fpucw-wrapper.h	Tue Jun 14 10:47:10 2016 -0400
@@ -0,0 +1,39 @@
+/*
+
+Copyright (C) 2016 John W. Eaton
+
+This file is part of Octave.
+
+Octave is free software; you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation; either version 3 of the License, or (at your
+option) any later version.
+
+Octave is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with Octave; see the file COPYING.  If not, see
+<http://www.gnu.org/licenses/>.
+
+*/
+
+#if ! defined (octave_fpucw_wrapper_h)
+#define octave_fpucw_wrapper_h 1
+
+#if defined __cplusplus
+extern "C" {
+#endif
+
+/* For now, all we need to be able to do is set the control word to
+   the default value.  */
+
+extern void octave_set_default_fpucw (void);
+
+#if defined __cplusplus
+}
+#endif
+
+#endif
--- a/liboctave/wrappers/module.mk	Tue Jun 14 10:24:39 2016 -0400
+++ b/liboctave/wrappers/module.mk	Tue Jun 14 10:47:10 2016 -0400
@@ -1,6 +1,7 @@
 NOINSTALL_WRAPPERS_INC = \
   liboctave/wrappers/base64-wrappers.h \
   liboctave/wrappers/canonicalize-file-name-wrapper.h \
+  liboctave/wrappers/fpucw-wrapper.h \
   liboctave/wrappers/gen-tempname-wrapper.h \
   liboctave/wrappers/hash-wrappers.h \
   liboctave/wrappers/mkostemp-wrapper.h \
@@ -16,6 +17,7 @@
 WRAPPERS_SRC = \
   liboctave/wrappers/base64-wrappers.c \
   liboctave/wrappers/canonicalize-file-name-wrapper.c \
+  liboctave/wrappers/fpucw-wrapper.c \
   liboctave/wrappers/gen-tempname-wrapper.c \
   liboctave/wrappers/hash-wrappers.c \
   liboctave/wrappers/mkostemp-wrapper.c \