Skip to content

NaN fixes #749

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
konsoletyper merged 2 commits into from
Sep 20, 2023
Merged

NaN fixes #749

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a32667f
NaN fixes
Ihromant Sep 20, 2023
5757b7e
Added fix for ByteBuffer
Ihromant Sep 20, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 8 additions & 5 deletions classlib/src/main/java/org/teavm/classlib/java/lang/TDouble.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -248,15 +248,18 @@ public boolean isInfinite() {
@Unmanaged
public static native boolean isFinite(double v);

public static long doubleToRawLongBits(double value) {
return doubleToLongBits(value);
}

@InjectedBy(DoubleGenerator.class)
@Import(name = "teavm_reinterpretDoubleToLong")
@NoSideEffects
@Unmanaged
public static native long doubleToLongBits(double value);
public static native long doubleToRawLongBits(double value);

public static long doubleToLongBits(double value) {
if (isNaN(value)) {
return 0x7ff8000000000000L;
}
return doubleToRawLongBits(value);
}

@InjectedBy(DoubleGenerator.class)
@Import(name = "teavm_reinterpretLongToDouble")
Expand Down
15 changes: 9 additions & 6 deletions classlib/src/main/java/org/teavm/classlib/java/lang/TFloat.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -252,15 +252,18 @@ public int compareTo(TFloat other) {
return compare(value, other.value);
}

public static int floatToRawIntBits(float value) {
return floatToIntBits(value);
}

@JSBody(params = "value", script = "return $rt_floatToIntBits(value);")
@JSBody(params = "value", script = "return $rt_floatToRawIntBits(value);")
@Import(name = "teavm_reinterpretFloatToInt")
@NoSideEffects
@Unmanaged
public static native int floatToIntBits(float value);
public static native int floatToRawIntBits(float value);

public static int floatToIntBits(float value) {
if (isNaN(value)) {
return 0x7fc00000;
}
return floatToRawIntBits(value);
}

@JSBody(params = "bits", script = "return $rt_intBitsToFloat(bits);")
@Import(name = "teavm_reinterpretIntToFloat")
Expand Down
4 changes: 2 additions & 2 deletions classlib/src/main/java/org/teavm/classlib/java/nio/TByteBufferImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -379,7 +379,7 @@ public double getDouble() {

@Override
public TByteBuffer putDouble(double value) {
return putLong(Double.doubleToLongBits(value));
return putLong(Double.doubleToRawLongBits(value));
}

@Override
Expand All @@ -389,7 +389,7 @@ public double getDouble(int index) {

@Override
public TByteBuffer putDouble(int index, double value) {
return putLong(index, Double.doubleToLongBits(value));
return putLong(index, Double.doubleToRawLongBits(value));
}

@Override
Expand Down
8 changes: 4 additions & 4 deletions core/src/main/resources/org/teavm/backend/javascript/runtime.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -658,10 +658,10 @@ function $rt_eraseClinit(target) {

var $rt_numberConversionView = new DataView(new ArrayBuffer(8));

var $rt_doubleToLongBits;
var $rt_doubleToRawLongBits;
var $rt_longBitsToDouble;
if (typeof BigInt !== 'function') {
$rt_doubleToLongBits = function(n) {
$rt_doubleToRawLongBits = function(n) {
$rt_numberConversionView.setFloat64(0, n, true);
return new Long($rt_numberConversionView.getInt32(0, true), $rt_numberConversionView.getInt32(4, true));
}
Expand All @@ -671,7 +671,7 @@ if (typeof BigInt !== 'function') {
return $rt_numberConversionView.getFloat64(0, true);
}
} else {
$rt_doubleToLongBits = function(n) {
$rt_doubleToRawLongBits = function(n) {
$rt_numberConversionView.setFloat64(0, n, true);
// For compatibility with Safari
var lo = $rt_numberConversionView.getInt32(0, true);
Expand All @@ -688,7 +688,7 @@ if (typeof BigInt !== 'function') {
}
}

function $rt_floatToIntBits(n) {
function $rt_floatToRawIntBits(n) {
$rt_numberConversionView.setFloat32(0, n);
return $rt_numberConversionView.getInt32(0);
}
Expand Down
15 changes: 14 additions & 1 deletion tests/src/test/java/org/teavm/classlib/java/lang/DoubleTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@

@RunWith(TeaVMTestRunner.class)
public class DoubleTest {
public static final double OTHER_NAN = Double.longBitsToDouble(Double.doubleToLongBits(Double.NaN) + 1);

@Test
public void parsed() {
assertEquals(23, Double.parseDouble("23"), 1E-12);
Expand Down Expand Up @@ -61,7 +63,6 @@ public void parsed() {
public void testEquals() {
assertNotEquals(Double.valueOf(-0.0), Double.valueOf(0.0));
assertEquals(Double.valueOf(3.0), Double.valueOf(3.0));
assertEquals(Double.valueOf(Double.NaN), Double.valueOf(Double.NaN));
assertEquals(Double.valueOf(Double.POSITIVE_INFINITY), Double.valueOf(Double.POSITIVE_INFINITY));
assertNotEquals(Double.valueOf(Double.NEGATIVE_INFINITY), Double.valueOf(Double.POSITIVE_INFINITY));
assertEquals(Double.valueOf(Double.NEGATIVE_INFINITY), Double.valueOf(Double.NEGATIVE_INFINITY));
Expand Down Expand Up @@ -138,4 +139,16 @@ public void compares() {
assertTrue(Double.compare(5, 10) < 0);
assertTrue(Double.compare(5, 5) == 0);
}

@Test
public void testNaN() {
assertTrue(Double.isNaN(OTHER_NAN));
assertTrue(OTHER_NAN != OTHER_NAN);
assertTrue(OTHER_NAN != Double.NaN);
assertEquals(Double.valueOf(Double.NaN), Double.valueOf(Double.NaN));
assertEquals(Double.valueOf(OTHER_NAN), Double.valueOf(Double.NaN));
assertEquals(Double.valueOf(OTHER_NAN), Double.valueOf(OTHER_NAN));
assertNotEquals(Double.doubleToRawLongBits(OTHER_NAN), Double.doubleToRawLongBits(Double.NaN));
assertEquals(Double.doubleToLongBits(OTHER_NAN), Double.doubleToLongBits(Double.NaN));
}
}
15 changes: 14 additions & 1 deletion tests/src/test/java/org/teavm/classlib/java/lang/FloatTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@

@RunWith(TeaVMTestRunner.class)
public class FloatTest {
private static final float OTHER_NAN = Float.intBitsToFloat(Float.floatToIntBits(Float.NaN) + 1);

@Test
public void parsed() {
assertEquals(23, Float.parseFloat("23"), 1E-12F);
Expand Down Expand Up @@ -59,7 +61,6 @@ public void parsed() {
public void testEquals() {
assertNotEquals(Float.valueOf(-0.0f), Float.valueOf(0.0f));
assertEquals(Float.valueOf(5.0f), Float.valueOf(5.0f));
assertEquals(Float.valueOf(Float.NaN), Float.valueOf(Float.NaN));
assertEquals(Float.valueOf(Float.POSITIVE_INFINITY), Float.valueOf(Float.POSITIVE_INFINITY));
assertNotEquals(Float.valueOf(Float.NEGATIVE_INFINITY), Float.valueOf(Float.POSITIVE_INFINITY));
assertEquals(Float.valueOf(Float.NEGATIVE_INFINITY), Float.valueOf(Float.NEGATIVE_INFINITY));
Expand Down Expand Up @@ -119,4 +120,16 @@ public void compares() {
assertTrue(Float.compare(5, 10) < 0);
assertTrue(Float.compare(5, 5) == 0);
}

@Test
public void testNaN() {
assertTrue(Float.isNaN(OTHER_NAN));
assertTrue(OTHER_NAN != OTHER_NAN);
assertTrue(OTHER_NAN != Double.NaN);
assertEquals(Float.valueOf(Float.NaN), Float.valueOf(Float.NaN));
assertEquals(Float.valueOf(OTHER_NAN), Float.valueOf(Float.NaN));
assertEquals(Float.valueOf(OTHER_NAN), Float.valueOf(OTHER_NAN));
assertNotEquals(Float.floatToRawIntBits(OTHER_NAN), Float.floatToRawIntBits(Float.NaN));
assertEquals(Float.floatToIntBits(OTHER_NAN), Float.floatToIntBits(Float.NaN));
}
}
3 changes: 3 additions & 0 deletions tests/src/test/java/org/teavm/classlib/java/nio/ByteBufferTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
import java.nio.ReadOnlyBufferException;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.teavm.classlib.java.lang.DoubleTest;
import org.teavm.junit.TeaVMTestRunner;
import org.teavm.junit.WholeClassCompilation;

Expand Down Expand Up @@ -632,6 +633,8 @@ public void putsDouble() {

buffer.putDouble(1, 2.0);
assertArrayEquals(new byte[] { 63, 64, 0, 0, 0, 0, 0, 0, 0, 55, 0, 0, 0, 0, 0, 0 }, array);
buffer.putDouble(0, DoubleTest.OTHER_NAN);
assertArrayEquals(new byte[] { 127, -8, 0, 0, 0, 0, 0, 1, 0, 55, 0, 0, 0, 0, 0, 0 }, array);
}

@Test
Expand Down