Changeset 3906 for trunk/libc/src/kNIX/os2/fhOS2File.c

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:

• trunk/libc/src/kNIX/os2/fhOS2File.c (modified) (6 diffs)

trunk/libc/src/kNIX/os2/fhOS2File.c

@@ -84 +84 @@
 {
     LIBCLOG_ENTER("pFH=%p:{.fh=%d} pvBuf=%p cbToRead=%zu pcbRead=%p\n", pFH, pFH->fh, pvBuf, cbToRead, pcbRead);
-    FS_VAR_SAVE_LOAD();
-    FSCW_VAR();
-    FSCW_SAVE();
 
     /*
@@ -92 +89 @@
      * Allocate a buffer in the low heap.
      */
+    PRESERVE_REGS_SAVE_LOAD_SAFE();
     int     rc;
     ULONG   cbActuallyRead = 0;
@@ -110 +108 @@
     else
         rc = DosRead(pFH->hNative, pvBuf, cbToRead, &cbActuallyRead);
-
+    PRESERVE_REGS_RESTORE();
 
     /* deal with the return code. */
@@ -136 +134 @@
 {
     LIBCLOG_ENTER("pFH=%p:{.fh=%d} pvBuf=%p cbToWrite=%zu pcbWritten=%p\n", pFH, pFH->fh, pvBuf, cbToWrite, (void *)pcbWritten);
-    FS_VAR_SAVE_LOAD();
-    FSCW_VAR();
-    FSCW_SAVE();
 
     /*
@@ -144 +139 @@
      * Allocate a buffer in the low heap.
      */
+    PRESERVE_REGS_SAVE_LOAD_SAFE();
     int     rc;
     ULONG   cbActuallyWritten = 0;
@@ -161 +157 @@
     else
         rc = DosWrite(pFH->hNative, pvBuf, cbToWrite, &cbActuallyWritten);
+    PRESERVE_REGS_RESTORE();
 
     /* deal with the return code. */