diff src/share/vm/runtime/sharedRuntimeTrig.cpp @ 14909:4ca6dc0799b6

Backout jdk9 merge
author Gilles Duboscq <duboscq@ssw.jku.at>
date Tue, 01 Apr 2014 13:57:07 +0200
parents 8a9bb7821e28
children 52b4284cb496
line wrap: on
line diff
--- a/src/share/vm/runtime/sharedRuntimeTrig.cpp	Tue Apr 01 14:09:03 2014 +0200
+++ b/src/share/vm/runtime/sharedRuntimeTrig.cpp	Tue Apr 01 13:57:07 2014 +0200
@@ -223,7 +223,7 @@
  *
  *      fq[]    final product of x*(2/pi) in fq[0],..,fq[jk]
  *
- *      ih      integer. If >0 it indicates q[] is >= 0.5, hence
+ *      ih      integer. If >0 it indicats q[] is >= 0.5, hence
  *              it also indicates the *sign* of the result.
  *
  */
@@ -347,7 +347,7 @@
   if(z==0.0) {
     jz -= 1; q0 -= 24;
     while(iq[jz]==0) { jz--; q0-=24;}
-  } else { /* break z into 24-bit if necessary */
+  } else { /* break z into 24-bit if neccessary */
     z = scalbnA(z,-q0);
     if(z>=two24B) {
       fw = (double)((int)(twon24*z));
@@ -409,7 +409,7 @@
 
 /*
  * ====================================================
- * Copyright (c) 1993 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1993 Oracle and/or its affilates. All rights reserved.
  *
  * Developed at SunPro, a Sun Microsystems, Inc. business.
  * Permission to use, copy, modify, and distribute this
@@ -658,7 +658,7 @@
 
 static double __kernel_cos(double x, double y)
 {
-  double a,h,z,r,qx;
+  double a,hz,z,r,qx;
   int ix;
   ix = __HI(x)&0x7fffffff;      /* ix = |x|'s high word*/
   if(ix<0x3e400000) {                   /* if x < 2**27 */
@@ -675,9 +675,9 @@
       __HI(qx) = ix-0x00200000; /* x/4 */
       __LO(qx) = 0;
     }
-    h = 0.5*z-qx;
-    a = one-qx;
-    return a - (h - (z*r-x*y));
+    hz = 0.5*z-qx;
+    a  = one-qx;
+    return a - (hz - (z*r-x*y));
   }
 }