mewin/glm
1
0
Fork 0
Code Releases Activity

Fixed glm::detail::nextafter implementation

Browse Source
This commit is contained in:
Christophe Riccio 2011-05-06 12:12:22 +01:00
parent 6efc6940b8
commit 3d7d4dc9c2
1 changed files with 104 additions and 101 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
glm/gtx/ulp.inl
View File

@ -20,8 +20,8 @@
* is preserved. * is preserved.
* ==================================================== * ====================================================
*/ */
/*
#define EXTRACT_WORDS(ix0,ix1,d) \ #define GLM_EXTRACT_WORDS(ix0,ix1,d) \
do { \ do { \
ieee_double_shape_type ew_u; \ ieee_double_shape_type ew_u; \
ew_u.value = (d); \ ew_u.value = (d); \
@ -29,21 +29,21 @@ do { \
(ix1) = ew_u.parts.lsw; \ (ix1) = ew_u.parts.lsw; \
} while (0) } while (0)
#define GET_FLOAT_WORD(i,d) \ #define GLM_GET_FLOAT_WORD(i,d) \
do { \ do { \
ieee_float_shape_type gf_u; \ ieee_float_shape_type gf_u; \
gf_u.value = (d); \ gf_u.value = (d); \
(i) = gf_u.word; \ (i) = gf_u.word; \
} while (0) } while (0)
#define SET_FLOAT_WORD(d,i) \ #define GLM_SET_FLOAT_WORD(d,i) \
do { \ do { \
ieee_float_shape_type sf_u; \ ieee_float_shape_type sf_u; \
sf_u.word = (i); \ sf_u.word = (i); \
(d) = sf_u.value; \ (d) = sf_u.value; \
} while (0) } while (0)
#define INSERT_WORDS(d,ix0,ix1) \ #define GLM_INSERT_WORDS(d,ix0,ix1) \
do { \ do { \
ieee_double_shape_type iw_u; \ ieee_double_shape_type iw_u; \
iw_u.parts.msw = (ix0); \ iw_u.parts.msw = (ix0); \
@ -51,13 +51,16 @@ do { \
(d) = iw_u.value; \ (d) = iw_u.value; \
} while (0) } while (0)
float nextafterf(float x, float y) namespace glm{
namespace detail
{ {
GLM_FUNC_QUALIFIER float nextafterf(float x, float y)
{
volatile float t; volatile float t;
int32_t hx,hy,ix,iy; glm::int32 hx, hy, ix, iy;
GET_FLOAT_WORD(hx,x); GLM_GET_FLOAT_WORD(hx,x);
GET_FLOAT_WORD(hy,y); GLM_GET_FLOAT_WORD(hy,y);
ix = hx&0x7fffffff; // |x| ix = hx&0x7fffffff; // |x|
iy = hy&0x7fffffff; // |y| iy = hy&0x7fffffff; // |y|
@ -66,7 +69,7 @@ float nextafterf(float x, float y)
return x+y; return x+y;
if(x==y) return y; // x=y, return y if(x==y) return y; // x=y, return y
if(ix==0) { // x == 0 if(ix==0) { // x == 0
SET_FLOAT_WORD(x,(hy&0x80000000)|1);// return +-minsubnormal GLM_SET_FLOAT_WORD(x,(hy&0x80000000)|1);// return +-minsubnormal
t = x*x; t = x*x;
if(t==x) return t; else return x; // raise underflow flag if(t==x) return t; else return x; // raise underflow flag
} }
@ -88,32 +91,31 @@ float nextafterf(float x, float y)
if(hy<0x00800000) { // underflow if(hy<0x00800000) { // underflow
t = x*x; t = x*x;
if(t!=x) { // raise underflow flag if(t!=x) { // raise underflow flag
SET_FLOAT_WORD(y,hx); GLM_SET_FLOAT_WORD(y,hx);
return y; return y;
} }
} }
SET_FLOAT_WORD(x,hx); GLM_SET_FLOAT_WORD(x,hx);
return x; return x;
} }
*/
/*
double nextafter(double x, double y)
{
volatile double t;
int32_t hx,hy,ix,iy;
u_int32_t lx,ly;
EXTRACT_WORDS(hx,lx,x); GLM_FUNC_QUALIFIER double nextafter(double x, double y)
EXTRACT_WORDS(hy,ly,y); {
ix = hx&0x7fffffff; // |x| volatile double t;
iy = hy&0x7fffffff; // |y| glm::int32 hx, hy, ix, iy;
glm::uint32 lx, ly;
GLM_EXTRACT_WORDS(hx, lx, x);
GLM_EXTRACT_WORDS(hy, ly, y);
ix = hx & 0x7fffffff; // |x|
iy = hy & 0x7fffffff; // |y|
if(((ix>=0x7ff00000)&&((ix-0x7ff00000)|lx)!=0) || // x is nan if(((ix>=0x7ff00000)&&((ix-0x7ff00000)|lx)!=0) || // x is nan
((iy>=0x7ff00000)&&((iy-0x7ff00000)|ly)!=0)) // y is nan ((iy>=0x7ff00000)&&((iy-0x7ff00000)|ly)!=0)) // y is nan
return x+y; return x+y;
if(x==y) return y; // x=y, return y if(x==y) return y; // x=y, return y
if((ix|lx)==0) { // x == 0 if((ix|lx)==0) { // x == 0
INSERT_WORDS(x,hy&0x80000000,1); // return +-minsubnormal GLM_INSERT_WORDS(x, hy & 0x80000000, 1); // return +-minsubnormal
t = x*x; t = x*x;
if(t==x) return t; else return x; // raise underflow flag if(t==x) return t; else return x; // raise underflow flag
} }
@ -139,25 +141,26 @@ double nextafter(double x, double y)
if(hy<0x00100000) { // underflow if(hy<0x00100000) { // underflow
t = x*x; t = x*x;
if(t!=x) { // raise underflow flag if(t!=x) { // raise underflow flag
INSERT_WORDS(y,hx,lx); GLM_INSERT_WORDS(y,hx,lx);
return y; return y;
} }
} }
INSERT_WORDS(x,hx,lx); GLM_INSERT_WORDS(x,hx,lx);
return x; return x;
} }
*/ }//namespace detail
}//namespace glm
#if(GLM_COMPILER & GLM_COMPILER_VC) #if(GLM_COMPILER & GLM_COMPILER_VC)
# if(GLM_MODEL == GLM_MODEL_32) # if(GLM_MODEL == GLM_MODEL_32)
# define GLM_NEXT_AFTER_FLT(x, toward) (float)_nextafter(x, float(toward)) # define GLM_NEXT_AFTER_FLT(x, toward) glm::detail::nextafter((x), (toward))
# else # else
# define GLM_NEXT_AFTER_FLT(x, toward) _nextafterf(x, toward) # define GLM_NEXT_AFTER_FLT(x, toward) _nextafterf((x), (toward))
# endif # endif
# define GLM_NEXT_AFTER_DBL(x, toward) _nextafter(x, toward) # define GLM_NEXT_AFTER_DBL(x, toward) _nextafter((x), (toward))
#else #else
# define GLM_NEXT_AFTER_FLT(x, toward) nextafterf(x, toward) # define GLM_NEXT_AFTER_FLT(x, toward) nextafterf((x), (toward))
# define GLM_NEXT_AFTER_DBL(x, toward) nextafter(x, toward) # define GLM_NEXT_AFTER_DBL(x, toward) nextafter((x), (toward))
#endif #endif
namespace glm{ namespace glm{