From 5a8d63ada5efd0220feed39368ebb4e169cea377 Mon Sep 17 00:00:00 2001 From: Peter Avalos Date: Fri, 4 Feb 2011 20:52:56 -1000 Subject: [PATCH] : Use single-underscore instead of double. This prevents conflicts for when someone decides to #include and . --- sys/cpu/i386/include/ieeefp.h | 48 +++++++++---------- sys/cpu/x86_64/include/ieeefp.h | 82 ++++++++++++++++----------------- 2 files changed, 65 insertions(+), 65 deletions(-) diff --git a/sys/cpu/i386/include/ieeefp.h b/sys/cpu/i386/include/ieeefp.h index db73414015..b3840501cf 100644 --- a/sys/cpu/i386/include/ieeefp.h +++ b/sys/cpu/i386/include/ieeefp.h @@ -102,12 +102,12 @@ typedef enum { #ifdef __GNUC__ -#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))) +#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))) /* * Load the control word. Be careful not to trap if there is a currently @@ -117,7 +117,7 @@ typedef enum { * is very inefficient, so only do it when necessary. */ static __inline void -__fnldcw(unsigned short _cw, unsigned short _newcw) +_fnldcw(unsigned short _cw, unsigned short _newcw) { struct { unsigned _cw; @@ -126,15 +126,15 @@ __fnldcw(unsigned short _cw, unsigned short _newcw) unsigned short _sw; if ((_cw & FP_MSKS_FLD) != FP_MSKS_FLD) { - __fnstsw(&_sw); + _fnstsw(&_sw); if (((_sw & ~_cw) & FP_STKY_FLD) != 0) { - __fnstenv(&_env); + _fnstenv(&_env); _env._cw = _newcw; - __fldenv(&_env); + _fldenv(&_env); return; } } - __fldcw(&_newcw); + _fldcw(&_newcw); } static __inline fp_rnd_t @@ -142,7 +142,7 @@ fpgetround(void) { unsigned short _cw; - __fnstcw(&_cw); + _fnstcw(&_cw); return ((fp_rnd_t)((_cw & FP_RND_FLD) >> FP_RND_OFF)); } @@ -152,11 +152,11 @@ fpsetround(fp_rnd_t _m) fp_rnd_t _p; unsigned short _cw, _newcw; - __fnstcw(&_cw); + _fnstcw(&_cw); _p = (fp_rnd_t)((_cw & FP_RND_FLD) >> FP_RND_OFF); _newcw = _cw & ~FP_RND_FLD; _newcw |= (_m << FP_RND_OFF) & FP_RND_FLD; - __fnldcw(_cw, _newcw); + _fnldcw(_cw, _newcw); return (_p); } @@ -165,7 +165,7 @@ fpgetprec(void) { unsigned short _cw; - __fnstcw(&_cw); + _fnstcw(&_cw); return ((fp_prec_t)((_cw & FP_PRC_FLD) >> FP_PRC_OFF)); } @@ -175,11 +175,11 @@ fpsetprec(fp_prec_t _m) fp_prec_t _p; unsigned short _cw, _newcw; - __fnstcw(&_cw); + _fnstcw(&_cw); _p = (fp_prec_t)((_cw & FP_PRC_FLD) >> FP_PRC_OFF); _newcw = _cw & ~FP_PRC_FLD; _newcw |= (_m << FP_PRC_OFF) & FP_PRC_FLD; - __fnldcw(_cw, _newcw); + _fnldcw(_cw, _newcw); return (_p); } @@ -194,7 +194,7 @@ fpgetmask(void) { unsigned short _cw; - __fnstcw(&_cw); + _fnstcw(&_cw); return ((~_cw & FP_MSKS_FLD) >> FP_MSKS_OFF); } @@ -204,11 +204,11 @@ fpsetmask(fp_except_t _m) fp_except_t _p; unsigned short _cw, _newcw; - __fnstcw(&_cw); + _fnstcw(&_cw); _p = (~_cw & FP_MSKS_FLD) >> FP_MSKS_OFF; _newcw = _cw & ~FP_MSKS_FLD; _newcw |= (~_m << FP_MSKS_OFF) & FP_MSKS_FLD; - __fnldcw(_cw, _newcw); + _fnldcw(_cw, _newcw); return (_p); } @@ -218,7 +218,7 @@ fpgetsticky(void) unsigned _ex; unsigned short _sw; - __fnstsw(&_sw); + _fnstsw(&_sw); _ex = (_sw & FP_STKY_FLD) >> FP_STKY_OFF; return ((fp_except_t)_ex); } @@ -238,12 +238,12 @@ fpresetsticky(fp_except_t _m) if ((_p & ~_m) == _p) return (_p); if ((_p & ~_m) == 0) { - __fnclex(); + _fnclex(); return (_p); } - __fnstenv(&_env); + _fnstenv(&_env); _env._sw &= ~_m; - __fldenv(&_env); + _fldenv(&_env); return (_p); } diff --git a/sys/cpu/x86_64/include/ieeefp.h b/sys/cpu/x86_64/include/ieeefp.h index 4a300985b1..b8d952fdba 100644 --- a/sys/cpu/x86_64/include/ieeefp.h +++ b/sys/cpu/x86_64/include/ieeefp.h @@ -120,13 +120,13 @@ typedef enum { #if defined(__GNUC__) && !defined(__cplusplus) -#define __fldcw(addr) __asm __volatile("fldcw %0" : : "m" (*(addr))) -#define __fldenv(addr) __asm __volatile("fldenv %0" : : "m" (*(addr))) -#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))) +#define _fldcw(addr) __asm __volatile("fldcw %0" : : "m" (*(addr))) +#define _fldenv(addr) __asm __volatile("fldenv %0" : : "m" (*(addr))) +#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 @@ -136,7 +136,7 @@ typedef enum { * is very inefficient, so only do it when necessary. */ static __inline void -__fnldcw(unsigned short _cw, unsigned short _newcw) +_fnldcw(unsigned short _cw, unsigned short _newcw) { struct { unsigned _cw; @@ -145,15 +145,15 @@ __fnldcw(unsigned short _cw, unsigned short _newcw) unsigned short _sw; if ((_cw & FP_MSKS_FLD) != FP_MSKS_FLD) { - __fnstsw(&_sw); + _fnstsw(&_sw); if (((_sw & ~_cw) & FP_STKY_FLD) != 0) { - __fnstenv(&_env); + _fnstenv(&_env); _env._cw = _newcw; - __fldenv(&_env); + _fldenv(&_env); return; } } - __fldcw(&_newcw); + _fldcw(&_newcw); } /* @@ -168,30 +168,30 @@ __fnldcw(unsigned short _cw, unsigned short _newcw) */ static __inline fp_rnd_t -__fpgetround(void) +_fpgetround(void) { unsigned short _cw; - __fnstcw(&_cw); + _fnstcw(&_cw); return ((fp_rnd_t)((_cw & FP_RND_FLD) >> FP_RND_OFF)); } static __inline fp_rnd_t -__fpsetround(fp_rnd_t _m) +_fpsetround(fp_rnd_t _m) { fp_rnd_t _p; unsigned _mxcsr; unsigned short _cw, _newcw; - __fnstcw(&_cw); + _fnstcw(&_cw); _p = (fp_rnd_t)((_cw & FP_RND_FLD) >> FP_RND_OFF); _newcw = _cw & ~FP_RND_FLD; _newcw |= (_m << FP_RND_OFF) & FP_RND_FLD; - __fnldcw(_cw, _newcw); - __stmxcsr(&_mxcsr); + _fnldcw(_cw, _newcw); + _stmxcsr(&_mxcsr); _mxcsr &= ~SSE_RND_FLD; _mxcsr |= (_m << SSE_RND_OFF) & SSE_RND_FLD; - __ldmxcsr(&_mxcsr); + _ldmxcsr(&_mxcsr); return (_p); } @@ -201,25 +201,25 @@ __fpsetround(fp_rnd_t _m) */ static __inline fp_prec_t -__fpgetprec(void) +_fpgetprec(void) { unsigned short _cw; - __fnstcw(&_cw); + _fnstcw(&_cw); return ((fp_prec_t)((_cw & FP_PRC_FLD) >> FP_PRC_OFF)); } static __inline fp_prec_t -__fpsetprec(fp_prec_t _m) +_fpsetprec(fp_prec_t _m) { fp_prec_t _p; unsigned short _cw, _newcw; - __fnstcw(&_cw); + _fnstcw(&_cw); _p = (fp_prec_t)((_cw & FP_PRC_FLD) >> FP_PRC_OFF); _newcw = _cw & ~FP_PRC_FLD; _newcw |= (_m << FP_PRC_OFF) & FP_PRC_FLD; - __fnldcw(_cw, _newcw); + _fnldcw(_cw, _newcw); return (_p); } @@ -230,43 +230,43 @@ __fpsetprec(fp_prec_t _m) */ static __inline fp_except_t -__fpgetmask(void) +_fpgetmask(void) { unsigned short _cw; - __fnstcw(&_cw); + _fnstcw(&_cw); return ((~_cw & FP_MSKS_FLD) >> FP_MSKS_OFF); } static __inline fp_except_t -__fpsetmask(fp_except_t _m) +_fpsetmask(fp_except_t _m) { fp_except_t _p; unsigned _mxcsr; unsigned short _cw, _newcw; - __fnstcw(&_cw); + _fnstcw(&_cw); _p = (~_cw & FP_MSKS_FLD) >> FP_MSKS_OFF; _newcw = _cw & ~FP_MSKS_FLD; _newcw |= (~_m << FP_MSKS_OFF) & FP_MSKS_FLD; - __fnldcw(_cw, _newcw); - __stmxcsr(&_mxcsr); + _fnldcw(_cw, _newcw); + _stmxcsr(&_mxcsr); /* XXX should we clear non-ieee SSE_DAZ_FLD and SSE_FZ_FLD ? */ _mxcsr &= ~SSE_MSKS_FLD; _mxcsr |= (~_m << SSE_MSKS_OFF) & SSE_MSKS_FLD; - __ldmxcsr(&_mxcsr); + _ldmxcsr(&_mxcsr); return (_p); } static __inline fp_except_t -__fpgetsticky(void) +_fpgetsticky(void) { unsigned _ex, _mxcsr; unsigned short _sw; - __fnstsw(&_sw); + _fnstsw(&_sw); _ex = (_sw & FP_STKY_FLD) >> FP_STKY_OFF; - __stmxcsr(&_mxcsr); + _stmxcsr(&_mxcsr); _ex |= (_mxcsr & SSE_STKY_FLD) >> SSE_STKY_OFF; return ((fp_except_t)_ex); } @@ -275,13 +275,13 @@ __fpgetsticky(void) #if !defined(__IEEEFP_NOINLINES__) && !defined(__cplusplus) && defined(__GNUC__) -#define fpgetmask() __fpgetmask() -#define fpgetprec() __fpgetprec() -#define fpgetround() __fpgetround() -#define fpgetsticky() __fpgetsticky() -#define fpsetmask(m) __fpsetmask(m) -#define fpsetprec(m) __fpsetprec(m) -#define fpsetround(m) __fpsetround(m) +#define fpgetmask() _fpgetmask() +#define fpgetprec() _fpgetprec() +#define fpgetround() _fpgetround() +#define fpgetsticky() _fpgetsticky() +#define fpsetmask(m) _fpsetmask(m) +#define fpsetprec(m) _fpsetprec(m) +#define fpsetround(m) _fpsetround(m) /* Suppress prototypes in the MI header. */ #define _IEEEFP_INLINED_ 1 -- 2.41.0