Changeset 3766

Timestamp:

Mar 15, 2012, 12:19:22 PM (13 years ago)

Author:

bird

Message:

Backported r3765: FCW and FSW are 16-bit, not 32-bit, so use 'unsigned short' types instead of 'int'. Fixes #241.

Location:

branches/libc-0.6/src/emx

Files:

• include (modified) (1 prop)
• include/fenv.h (modified) (6 diffs)
• src/lib/msun (modified) (1 prop)
• src/lib/msun/i387/fenv.c (modified) (4 diffs)

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

@@ -33 +33 @@
 #include <sys/_types.h>
 
-/*                   
+/*
  * To preserve binary compatibility with FreeBSD 5.3, we pack the
  * mxcsr into some reserved fields, rather than changing sizeof(fenv_t).
@@ -132 +132 @@
 fegetexceptflag(fexcept_t *__flagp, int __excepts)
 {
-        int __mxcsr, __status;
+        int __mxcsr;
+        unsigned short __status;
 
         __fnstsw(&__status);
@@ -149 +150 @@
 fetestexcept(int __excepts)
 {
-        int __mxcsr, __status;
+        int __mxcsr;
+        unsigned short __status;
 
         __fnstsw(&__status);
@@ -162 +164 @@
 fegetround(void)
 {
-        int __control;
+        unsigned short __control;
 
         /*
@@ -177 +179 @@
 fesetround(int __round)
 {
-        int __mxcsr, __control;
+        int __mxcsr;
+        unsigned short __control;
 
         if (__round & ~_ROUND_MASK)
@@ -224 +227 @@
 fegetexcept(void)
 {
-        int __control;
+        unsigned short __control;
 
         /*

branches/libc-0.6/src/emx/src/lib/msun/i387/fenv.c

@@ -119 +119 @@
 _STD(fegetenv)(fenv_t *envp)
 {
-        int control, mxcsr;
+        unsigned short control;
+        int mxcsr;
 
         /*
@@ -155 +156 @@
 _STD(feupdateenv)(const fenv_t *envp)
 {
-        int mxcsr, status;
+        int mxcsr;
+        unsigned short status;
 
         __fnstsw(&status);
@@ -170 +172 @@
 __feenableexcept(int mask)
 {
-        int mxcsr, control, omask;
+        unsigned short control;
+        int mxcsr, omask;
 
         mask &= FE_ALL_EXCEPT;
@@ -191 +194 @@
 __fedisableexcept(int mask)
 {
-        int mxcsr, control, omask;
+        unsigned short control;
+        int mxcsr, omask;
 
         mask &= FE_ALL_EXCEPT;