ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-06-17 06:38:21 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

fix NaN handling in floating point comparisons

Browse Source
This commit is contained in:
Joel Dice
2013-04-03 16:08:40 -06:00
parent cc8d655762
commit b436bd460a
4 changed files with 69 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/interpret.cpp
View File

@ -680,6 +680,18 @@ store(Thread* t, unsigned index)
BytesPerWord * 2);
}
bool
isNaN(double v)
{
return fpclassify(v) == FP_NAN;
}
bool
isNaN(float v)
{
return fpclassify(v) == FP_NAN;
}
uint64_t
findExceptionHandler(Thread* t, object method, unsigned ip)
{
@ -1157,7 +1169,9 @@ interpret3(Thread* t, const int base)
double b = popDouble(t);
double a = popDouble(t);
if (a < b) {
if (isNaN(a) or isNaN(b)) {
pushInt(t, 1);
} if (a < b) {
pushInt(t, static_cast<unsigned>(-1));
} else if (a > b) {
pushInt(t, 1);
@ -1172,7 +1186,9 @@ interpret3(Thread* t, const int base)
double b = popDouble(t);
double a = popDouble(t);
if (a < b) {
if (isNaN(a) or isNaN(b)) {
pushInt(t, static_cast<unsigned>(-1));
} if (a < b) {
pushInt(t, static_cast<unsigned>(-1));
} else if (a > b) {
pushInt(t, 1);
@ -1370,7 +1386,9 @@ interpret3(Thread* t, const int base)
float b = popFloat(t);
float a = popFloat(t);
if (a < b) {
if (isNaN(a) or isNaN(b)) {
pushInt(t, 1);
} if (a < b) {
pushInt(t, static_cast<unsigned>(-1));
} else if (a > b) {
pushInt(t, 1);
@ -1385,7 +1403,9 @@ interpret3(Thread* t, const int base)
float b = popFloat(t);
float a = popFloat(t);
if (a < b) {
if (isNaN(a) or isNaN(b)) {
pushInt(t, static_cast<unsigned>(-1));
} if (a < b) {
pushInt(t, static_cast<unsigned>(-1));
} else if (a > b) {
pushInt(t, 1);