generic-library/bionic
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

am cebc8fb0: am 6bc18fa5: Merge "libm: fix invalid result of function remquo/remquof"

Browse Source 
* commit 'cebc8fb0862a8e1ecd86f9d09b0a3fca0f0781fa':
  libm: fix invalid result of function remquo/remquof
This commit is contained in:
Elliott Hughes 2012-04-13 17:10:06 -07:00 committed by Android Git Automerger
commit 307d1c982d
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libm/src/s_remquo.c
View File

@ -49,7 +49,7 @@ remquo(double x, double y, int *quo)
goto fixup; /* |x|<|y| return x or x-y */ goto fixup; /* |x|<|y| return x or x-y */
} }
if(lx==ly) { if(lx==ly) {
*quo = 1; *quo = (sxy ? -1 : 1);
return Zero[(u_int32_t)sx>>31]; /* |x|=|y| return x*0*/ return Zero[(u_int32_t)sx>>31]; /* |x|=|y| return x*0*/
} }
} }
@ -112,6 +112,7 @@ remquo(double x, double y, int *quo)
/* convert back to floating value and restore the sign */ /* convert back to floating value and restore the sign */
if((hx|lx)==0) { /* return sign(x)*0 */ if((hx|lx)==0) { /* return sign(x)*0 */
q &= 0x7fffffff;
*quo = (sxy ? -q : q); *quo = (sxy ? -q : q);
return Zero[(u_int32_t)sx>>31]; return Zero[(u_int32_t)sx>>31];
} }
@ -127,9 +128,9 @@ remquo(double x, double y, int *quo)
lx = (lx>>n)|((u_int32_t)hx<<(32-n)); lx = (lx>>n)|((u_int32_t)hx<<(32-n));
hx >>= n; hx >>= n;
} else if (n<=31) { } else if (n<=31) {
lx = (hx<<(32-n))|(lx>>n); hx = sx; lx = (hx<<(32-n))|(lx>>n); hx = 0;
} else { } else {
lx = hx>>(n-32); hx = sx; lx = hx>>(n-32); hx = 0;
} }
} }
fixup: fixup:

3
libm/src/s_remquof.c
View File

@ -46,7 +46,7 @@ remquof(float x, float y, int *quo)
q = 0; q = 0;
goto fixup; /* |x|<|y| return x or x-y */ goto fixup; /* |x|<|y| return x or x-y */
} else if(hx==hy) { } else if(hx==hy) {
*quo = 1; *quo = (sxy ? -1 : 1);
return Zero[(u_int32_t)sx>>31]; /* |x|=|y| return x*0*/ return Zero[(u_int32_t)sx>>31]; /* |x|=|y| return x*0*/
} }
@ -88,6 +88,7 @@ remquof(float x, float y, int *quo)
/* convert back to floating value and restore the sign */ /* convert back to floating value and restore the sign */
if(hx==0) { /* return sign(x)*0 */ if(hx==0) { /* return sign(x)*0 */
q &= 0x7fffffff;
*quo = (sxy ? -q : q); *quo = (sxy ? -q : q);
return Zero[(u_int32_t)sx>>31]; return Zero[(u_int32_t)sx>>31];
} }