1.1 --- a/src/share/vm/runtime/sharedRuntimeTrig.cpp Tue Jul 29 13:54:16 2014 +0200 1.2 +++ b/src/share/vm/runtime/sharedRuntimeTrig.cpp Tue Jul 29 13:56:29 2014 +0200 1.3 @@ -547,7 +547,7 @@ 1.4 { 1.5 double z,r,v; 1.6 int ix; 1.7 - ix = __HI(x)&0x7fffffff; /* high word of x */ 1.8 + ix = high(x)&0x7fffffff; /* high word of x */ 1.9 if(ix<0x3e400000) /* |x| < 2**-27 */ 1.10 {if((int)x==0) return x;} /* generate inexact */ 1.11 z = x*x; 1.12 @@ -602,9 +602,9 @@ 1.13 1.14 static double __kernel_cos(double x, double y) 1.15 { 1.16 - double a,h,z,r,qx; 1.17 + double a,h,z,r,qx=0; 1.18 int ix; 1.19 - ix = __HI(x)&0x7fffffff; /* ix = |x|'s high word*/ 1.20 + ix = high(x)&0x7fffffff; /* ix = |x|'s high word*/ 1.21 if(ix<0x3e400000) { /* if x < 2**27 */ 1.22 if(((int)x)==0) return one; /* generate inexact */ 1.23 } 1.24 @@ -616,8 +616,8 @@ 1.25 if(ix > 0x3fe90000) { /* x > 0.78125 */ 1.26 qx = 0.28125; 1.27 } else { 1.28 - __HI(qx) = ix-0x00200000; /* x/4 */ 1.29 - __LO(qx) = 0; 1.30 + set_high(&qx, ix-0x00200000); /* x/4 */ 1.31 + set_low(&qx, 0); 1.32 } 1.33 h = 0.5*z-qx; 1.34 a = one-qx; 1.35 @@ -682,11 +682,11 @@ 1.36 { 1.37 double z,r,v,w,s; 1.38 int ix,hx; 1.39 - hx = __HI(x); /* high word of x */ 1.40 + hx = high(x); /* high word of x */ 1.41 ix = hx&0x7fffffff; /* high word of |x| */ 1.42 if(ix<0x3e300000) { /* x < 2**-28 */ 1.43 if((int)x==0) { /* generate inexact */ 1.44 - if (((ix | __LO(x)) | (iy + 1)) == 0) 1.45 + if (((ix | low(x)) | (iy + 1)) == 0) 1.46 return one / fabsd(x); 1.47 else { 1.48 if (iy == 1) 1.49 @@ -695,10 +695,10 @@ 1.50 double a, t; 1.51 1.52 z = w = x + y; 1.53 - __LO(z) = 0; 1.54 + set_low(&z, 0); 1.55 v = y - (z - x); 1.56 t = a = -one / w; 1.57 - __LO(t) = 0; 1.58 + set_low(&t, 0); 1.59 s = one + t * z; 1.60 return t + a * (s + t * v); 1.61 } 1.62 @@ -733,10 +733,10 @@ 1.63 /* compute -1.0/(x+r) accurately */ 1.64 double a,t; 1.65 z = w; 1.66 - __LO(z) = 0; 1.67 + set_low(&z, 0); 1.68 v = r-(z - x); /* z+v = r+x */ 1.69 t = a = -1.0/w; /* a = -1.0/w */ 1.70 - __LO(t) = 0; 1.71 + set_low(&t, 0); 1.72 s = 1.0+t*z; 1.73 return t+a*(s+t*v); 1.74 } 1.75 @@ -785,7 +785,7 @@ 1.76 int n, ix; 1.77 1.78 /* High word of x. */ 1.79 - ix = __HI(x); 1.80 + ix = high(x); 1.81 1.82 /* |x| ~< pi/4 */ 1.83 ix &= 0x7fffffff; 1.84 @@ -843,7 +843,7 @@ 1.85 int n, ix; 1.86 1.87 /* High word of x. */ 1.88 - ix = __HI(x); 1.89 + ix = high(x); 1.90 1.91 /* |x| ~< pi/4 */ 1.92 ix &= 0x7fffffff; 1.93 @@ -900,7 +900,7 @@ 1.94 int n, ix; 1.95 1.96 /* High word of x. */ 1.97 - ix = __HI(x); 1.98 + ix = high(x); 1.99 1.100 /* |x| ~< pi/4 */ 1.101 ix &= 0x7fffffff;