Changeset 3906 for branches/libc-0.6/src/emx/include

Timestamp:

Oct 24, 2014, 1:50:44 AM (11 years ago)

Author:

bird

Message:

0.6,trunk: DosLoadModuleEx and DosFreeModuleEx should make an effort to preserve the FPU control word in addition to FS. Added a couple of common macros for doing both in one go. Fixed DosRead and DosWrite wrappers on trunk, they weren't restoring the registers.

File:

• branches/libc-0.6/src/emx/include/os2emx.h (modified) (3 diffs)

branches/libc-0.6/src/emx/include/os2emx.h

@@ -13347 +13347 @@
 
 
-/* --------------------- FS Save/Load/Restore macros ---------------------- */
-
-#if defined(INCL_FSMACROS)
+/* --------------------- Register preservation macros ---------------------- */
+
+#if defined(INCL_FSMACROS) || defined(INCL_PRESERVE_REGISTER_MACROS)
 
 #ifndef FS_DISABLED
@@ -13364 +13364 @@
 #endif
 
-#endif /* INCL_FSMACROS */
-
-#if defined(INCL_FPCWMACROS)
-
-#ifndef FSCW_DISABLED
+#endif /* INCL_FSMACROS || INCL_PRESERVE_REGISTER_MACROS */
+
+#if defined(INCL_FPCWMACROS) || defined(INCL_PRESERVE_REGISTER_MACROS)
+
+#ifndef FPCW_DISABLED
 #define FSCW_VAR()        volatile unsigned __fpcw__;
 #define FSCW_SAVE()       __asm__ __volatile__ ("fnstcw %0;" : : "m" (__fpcw__) )
@@ -13378 +13378 @@
 #endif
 
-#endif /* INCL_FPCWMACROS */
+#endif /* INCL_FPCWMACROS || INCL_PRESERVE_REGISTER_MACROS */
+
+#if defined(INCL_PRESERVE_REGISTER_MACROS) || (defined(INCL_FSMACROS) && defined(INCL_FPCWMACROS))
+# define PRESERVE_REGS_SAVE_LOAD_SAFE()       FS_VAR(); FSCW_VAR(); PRESERVE_REGS_SAVE_LOAD_SAFE_AGAIN()
+# define PRESERVE_REGS_SAVE_LOAD_SAFE_AGAIN() do { FS_SAVE_LOAD(); FSCW_SAVE(); } while (0)
+# define PRESERVE_REGS_RESTORE()              do { FSCW_RESTORE(); FS_RESTORE(); } while (0)
+#endif
+