Changeset 3900

Timestamp:

Oct 22, 2014, 10:26:07 PM (11 years ago)

Author:

bird

Message:

trunk+0.6: Load default FPU.CW value in crt0 to avoid getting bitten by DLLs messing it up during static DLL initialization.

Files:

• branches/libc-0.6/src/emx/src/lib/startup/386/crt0.s (modified) (2 diffs)
• trunk/libc/src/libc/startup/os2/x86/crt0.asm (modified) (2 diffs)
• trunk/libc/src/libc/startup/os2/x86/crt0.s (modified) (3 diffs)

branches/libc-0.6/src/emx/src/lib/startup/386/crt0.s

@@ -53 +53 @@
 __text:
 
+    /*
+     * Fix the FPU control word since it may have been perverted by
+     * statically imported DLLs.
+     */
+    fldcw   __crt0_fpucw
+
 #if !defined(NOFORK) && !defined(NOUNIX)
     /* Registering the fork module. If we're forking this call will not return. */
@@ -88 +94 @@
 1:  jmp     1b      /* Just in case exit() returns :-) */
 
+/** Initial FPU CW value. */
+    .align  2, 0xcc
+__crt0_fpucw:
+    .long   0x37f
 
     .data

trunk/libc/src/libc/startup/os2/x86/crt0.asm

@@ -61 +61 @@
         sub     esp, 10h
 
+        ;
+        ; Fix the FPU control word since it may have been perverted by
+        ; statically imported DLLs.
+        ;
+        fldcw   .crt0_fpucw
 
 %ifndef NOFORK
@@ -124 +129 @@
         call    NAME_FUNC(exit)
         jmp     .do_exit
+
+        align   4, db 0cch
+.crt0_fpucw:
+        dd      0x37f
 
 

trunk/libc/src/libc/startup/os2/x86/crt0.s

@@ -4 +4 @@
  * OS/2 crt0.
  *
- * Copyright (c) 2006 knut st. osmundsen <bird@innotek.de>
+ * Copyright (c) 2006-2014 knut st. osmundsen <bird@innotek.de>
  *
  *
@@ -64 +64 @@
     subl    $0x10, %esp
 
+    /*
+     * Fix the FPU control word since it may have been perverted by
+     * statically imported DLLs.
+     */
+    fldcw   __crt0_fpucw
 
 #if !defined(NOFORK) && !defined(NOUNIX)
@@ -125 +130 @@
     jmp     do_exit
 
+
+/**
+ * Initial FPU CW value.
+ */
+    .align  2, 0xcc
+__crt0_fpucw:
+    .long   0x37f