archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-26 06:14:49 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

6778657: Casts in SharedRuntime::f2i, f2l, d2i and d2l rely on undefined C++ behaviour

Browse source 
Replaces SharedRuntime::f2i et al with versions that should work

Reviewed-by: never
This commit is contained in:
Gary Benson 2008-12-22 15:43:02 -08:00 • committed by Vladimir Kozlov
parent 34c4172bfe
commit 347b8afe5b
2 changed files with 103 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

74
hotspot/src/share/vm/runtime/sharedRuntime.cpp
View file

@ -192,64 +192,46 @@ JRT_END
JRT_LEAF(jint, SharedRuntime::f2i(jfloat x))
if (g_isnan(x)) {return 0;}
jlong lltmp = (jlong)x;
jint ltmp = (jint)lltmp;
if (ltmp == lltmp) {
return ltmp;
} else {
if (x < 0) {
return min_jint;
} else {
return max_jint;
}
}
if (g_isnan(x))
return 0;
if (x >= (jfloat) max_jint)
return max_jint;
if (x <= (jfloat) min_jint)
return min_jint;
return (jint) x;
JRT_END
JRT_LEAF(jlong, SharedRuntime::f2l(jfloat x))
if (g_isnan(x)) {return 0;}
jlong lltmp = (jlong)x;
if (lltmp != min_jlong) {
return lltmp;
} else {
if (x < 0) {
return min_jlong;
} else {
return max_jlong;
}
}
if (g_isnan(x))
return 0;
if (x >= (jfloat) max_jlong)
return max_jlong;
if (x <= (jfloat) min_jlong)
return min_jlong;
return (jlong) x;
JRT_END
JRT_LEAF(jint, SharedRuntime::d2i(jdouble x))
if (g_isnan(x)) {return 0;}
jlong lltmp = (jlong)x;
jint ltmp = (jint)lltmp;
if (ltmp == lltmp) {
return ltmp;
} else {
if (x < 0) {
return min_jint;
} else {
return max_jint;
}
}
if (g_isnan(x))
return 0;
if (x >= (jdouble) max_jint)
return max_jint;
if (x <= (jdouble) min_jint)
return min_jint;
return (jint) x;
JRT_END
JRT_LEAF(jlong, SharedRuntime::d2l(jdouble x))
if (g_isnan(x)) {return 0;}
jlong lltmp = (jlong)x;
if (lltmp != min_jlong) {
return lltmp;
} else {
if (x < 0) {
return min_jlong;
} else {
return max_jlong;
}
}
if (g_isnan(x))
return 0;
if (x >= (jdouble) max_jlong)
return max_jlong;
if (x <= (jdouble) min_jlong)
return min_jlong;
return (jlong) x;
JRT_END