Page MenuHomeFreeBSD
Files F109652104

D15633.diff
No OneTemporary
Actions

D15633.diff
View Options

Index: head/lib/msun/amd64/fenv.c
===================================================================
--- head/lib/msun/amd64/fenv.c
+++ head/lib/msun/amd64/fenv.c
@@ -60,12 +60,12 @@
__fnstenv(&env.__x87);
env.__x87.__status &= ~excepts;
env.__x87.__status |= *flagp & excepts;
- __fldenv(env.__x87);
+ __fldenv(&env.__x87);
__stmxcsr(&env.__mxcsr);
env.__mxcsr &= ~excepts;
env.__mxcsr |= *flagp & excepts;
- __ldmxcsr(env.__mxcsr);
+ __ldmxcsr(&env.__mxcsr);
return (0);
}
@@ -94,7 +94,7 @@
* fnstenv masks all exceptions, so we need to restore the
* control word to avoid this side effect.
*/
- __fldcw(envp->__x87.__control);
+ __fldcw(&envp->__x87.__control);
return (0);
}
@@ -109,7 +109,7 @@
envp->__mxcsr = mxcsr;
mxcsr &= ~FE_ALL_EXCEPT;
mxcsr |= FE_ALL_EXCEPT << _SSE_EMASK_SHIFT;
- __ldmxcsr(mxcsr);
+ __ldmxcsr(&mxcsr);
return (0);
}
@@ -139,9 +139,9 @@
__stmxcsr(&mxcsr);
omask = ~(control | mxcsr >> _SSE_EMASK_SHIFT) & FE_ALL_EXCEPT;
control &= ~mask;
- __fldcw(control);
+ __fldcw(&control);
mxcsr &= ~(mask << _SSE_EMASK_SHIFT);
- __ldmxcsr(mxcsr);
+ __ldmxcsr(&mxcsr);
return (omask);
}
@@ -156,9 +156,9 @@
__stmxcsr(&mxcsr);
omask = ~(control | mxcsr >> _SSE_EMASK_SHIFT) & FE_ALL_EXCEPT;
control |= mask;
- __fldcw(control);
+ __fldcw(&control);
mxcsr |= mask << _SSE_EMASK_SHIFT;
- __ldmxcsr(mxcsr);
+ __ldmxcsr(&mxcsr);
return (omask);
}
Index: head/lib/msun/i387/fenv.c
===================================================================
--- head/lib/msun/i387/fenv.c
+++ head/lib/msun/i387/fenv.c
@@ -103,13 +103,13 @@
__fnstenv(&env);
env.__status &= ~excepts;
env.__status |= *flagp & excepts;
- __fldenv(env);
+ __fldenv(&env);
if (__HAS_SSE()) {
__stmxcsr(&mxcsr);
mxcsr &= ~excepts;
mxcsr |= *flagp & excepts;
- __ldmxcsr(mxcsr);
+ __ldmxcsr(&mxcsr);
}
return (0);
@@ -139,7 +139,7 @@
* fnstenv masks all exceptions, so we need to restore
* the old control word to avoid this side effect.
*/
- __fldcw(envp->__control);
+ __fldcw(&envp->__control);
if (__HAS_SSE()) {
__stmxcsr(&mxcsr);
__set_mxcsr(*envp, mxcsr);
@@ -159,7 +159,7 @@
__set_mxcsr(*envp, mxcsr);
mxcsr &= ~FE_ALL_EXCEPT;
mxcsr |= FE_ALL_EXCEPT << _SSE_EMASK_SHIFT;
- __ldmxcsr(mxcsr);
+ __ldmxcsr(&mxcsr);
}
return (0);
}
@@ -196,10 +196,10 @@
mxcsr = 0;
omask = ~(control | mxcsr >> _SSE_EMASK_SHIFT) & FE_ALL_EXCEPT;
control &= ~mask;
- __fldcw(control);
+ __fldcw(&control);
if (__HAS_SSE()) {
mxcsr &= ~(mask << _SSE_EMASK_SHIFT);
- __ldmxcsr(mxcsr);
+ __ldmxcsr(&mxcsr);
}
return (omask);
}
@@ -218,10 +218,10 @@
mxcsr = 0;
omask = ~(control | mxcsr >> _SSE_EMASK_SHIFT) & FE_ALL_EXCEPT;
control |= mask;
- __fldcw(control);
+ __fldcw(&control);
if (__HAS_SSE()) {
mxcsr |= mask << _SSE_EMASK_SHIFT;
- __ldmxcsr(mxcsr);
+ __ldmxcsr(&mxcsr);
}
return (omask);
}
Index: head/lib/msun/tests/Makefile
===================================================================
--- head/lib/msun/tests/Makefile
+++ head/lib/msun/tests/Makefile
@@ -84,10 +84,6 @@
LIBADD+= m
-.if ${MACHINE_CPUARCH} == "i386"
-# XXX: __fldcw macro mismatch between fenv.h and ieeefp.h .
-CWARNFLAGS.clang+= -Wno-error=macro-redefined
-.endif
WARNS?= 1
# Copied from lib/msun/Makefile
Index: head/lib/msun/x86/fenv.h
===================================================================
--- head/lib/msun/x86/fenv.h
+++ head/lib/msun/x86/fenv.h
@@ -33,6 +33,7 @@
#include <sys/cdefs.h>
#include <sys/_types.h>
+#include <ieeefp.h>
#ifndef __fenv_static
#define __fenv_static static
@@ -97,18 +98,10 @@
extern const fenv_t __fe_dfl_env;
#define FE_DFL_ENV (&__fe_dfl_env)
-#define __fldcw(__cw) __asm __volatile("fldcw %0" : : "m" (__cw))
-#define __fldenv(__env) __asm __volatile("fldenv %0" : : "m" (__env))
#define __fldenvx(__env) __asm __volatile("fldenv %0" : : "m" (__env) \
: "st", "st(1)", "st(2)", "st(3)", "st(4)", \
"st(5)", "st(6)", "st(7)")
-#define __fnclex() __asm __volatile("fnclex")
-#define __fnstenv(__env) __asm __volatile("fnstenv %0" : "=m" (*(__env)))
-#define __fnstcw(__cw) __asm __volatile("fnstcw %0" : "=m" (*(__cw)))
-#define __fnstsw(__sw) __asm __volatile("fnstsw %0" : "=am" (*(__sw)))
#define __fwait() __asm __volatile("fwait")
-#define __ldmxcsr(__csr) __asm __volatile("ldmxcsr %0" : : "m" (__csr))
-#define __stmxcsr(__csr) __asm __volatile("stmxcsr %0" : "=m" (*(__csr)))
int fegetenv(fenv_t *__envp);
int feholdexcept(fenv_t *__envp);
@@ -183,12 +176,12 @@
} else {
__fnstenv(&__env);
__env.__status &= ~__excepts;
- __fldenv(__env);
+ __fldenv(&__env);
}
if (__HAS_SSE()) {
__stmxcsr(&__mxcsr);
__mxcsr &= ~__excepts;
- __ldmxcsr(__mxcsr);
+ __ldmxcsr(&__mxcsr);
}
return (0);
}
@@ -234,13 +227,13 @@
__fnstcw(&__control);
__control &= ~_ROUND_MASK;
__control |= __round;
- __fldcw(__control);
+ __fldcw(&__control);
if (__HAS_SSE()) {
__stmxcsr(&__mxcsr);
__mxcsr &= ~(_ROUND_MASK << _SSE_ROUND_SHIFT);
__mxcsr |= __round << _SSE_ROUND_SHIFT;
- __ldmxcsr(__mxcsr);
+ __ldmxcsr(&__mxcsr);
}
return (0);
@@ -264,7 +257,7 @@
*/
__fldenvx(__env);
if (__HAS_SSE())
- __ldmxcsr(__mxcsr);
+ __ldmxcsr(&__mxcsr);
return (0);
}
@@ -280,11 +273,11 @@
} else {
__fnstenv(&__env.__x87);
__env.__x87.__status &= ~__excepts;
- __fldenv(__env.__x87);
+ __fldenv(&__env.__x87);
}
__stmxcsr(&__env.__mxcsr);
__env.__mxcsr &= ~__excepts;
- __ldmxcsr(__env.__mxcsr);
+ __ldmxcsr(&__env.__mxcsr);
return (0);
}
@@ -323,12 +316,12 @@
__fnstcw(&__control);
__control &= ~_ROUND_MASK;
__control |= __round;
- __fldcw(__control);
+ __fldcw(&__control);
__stmxcsr(&__mxcsr);
__mxcsr &= ~(_ROUND_MASK << _SSE_ROUND_SHIFT);
__mxcsr |= __round << _SSE_ROUND_SHIFT;
- __ldmxcsr(__mxcsr);
+ __ldmxcsr(&__mxcsr);
return (0);
}
@@ -346,7 +339,7 @@
* inlined, so we need to be more careful.
*/
__fldenvx(__envp->__x87);
- __ldmxcsr(__envp->__mxcsr);
+ __ldmxcsr(&__envp->__mxcsr);
return (0);
}
Index: head/sys/amd64/include/ieeefp.h
===================================================================
--- head/sys/amd64/include/ieeefp.h
+++ head/sys/amd64/include/ieeefp.h
@@ -130,6 +130,7 @@
#define __fldcw(addr) __asm __volatile("fldcw %0" : : "m" (*(addr)))
#define __fldenv(addr) __asm __volatile("fldenv %0" : : "m" (*(addr)))
+#define __fnclex() __asm __volatile("fnclex")
#define __fnstcw(addr) __asm __volatile("fnstcw %0" : "=m" (*(addr)))
#define __fnstenv(addr) __asm __volatile("fnstenv %0" : "=m" (*(addr)))
#define __fnstsw(addr) __asm __volatile("fnstsw %0" : "=m" (*(addr)))
Index: head/sys/i386/include/ieeefp.h
===================================================================
--- head/sys/i386/include/ieeefp.h
+++ head/sys/i386/include/ieeefp.h
@@ -116,6 +116,8 @@
#define __fnstcw(addr) __asm __volatile("fnstcw %0" : "=m" (*(addr)))
#define __fnstenv(addr) __asm __volatile("fnstenv %0" : "=m" (*(addr)))
#define __fnstsw(addr) __asm __volatile("fnstsw %0" : "=m" (*(addr)))
+#define __ldmxcsr(addr) __asm __volatile("ldmxcsr %0" : : "m" (*(addr)))
+#define __stmxcsr(addr) __asm __volatile("stmxcsr %0" : "=m" (*(addr)))
/*
* Load the control word. Be careful not to trap if there is a currently

File Metadata

Mime Type
text/plain
Expires
Sat, Feb 8, 11:45 PM (6 h, 41 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
16536788
Default Alt Text
D15633.diff (7 KB)

Event Timeline