summaryrefslogtreecommitdiff
path: root/gcc/java
diff options
context:
space:
mode:
authoraph <aph@138bc75d-0d04-0410-961f-82ee72b054a4>2004-08-16 13:03:51 +0000
committeraph <aph@138bc75d-0d04-0410-961f-82ee72b054a4>2004-08-16 13:03:51 +0000
commit91c237c4f3491c15083135bf8e2e2a31fa800e42 (patch)
tree6eec27556d5261ee7e2dfb3a7b78ae656b9db359 /gcc/java
parent0750f30d61b075cc98ecfb9d750ff20d1e46bb7c (diff)
downloadgcc-91c237c4f3491c15083135bf8e2e2a31fa800e42.tar.gz
2004-08-16 Andrew Haley <aph@redhat.com>
* jcf-write.c (find_constant_index): Canonicalize NaNs when generating bytecode. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@86053 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/java')
-rw-r--r--gcc/java/ChangeLog5
-rw-r--r--gcc/java/jcf-write.c13
2 files changed, 18 insertions, 0 deletions
diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog
index 4e0dc7e3de3..761c886f728 100644
--- a/gcc/java/ChangeLog
+++ b/gcc/java/ChangeLog
@@ -1,3 +1,8 @@
+2004-08-16 Andrew Haley <aph@redhat.com>
+
+ * jcf-write.c (find_constant_index): Canonicalize NaNs when
+ generating bytecode.
+
2004-08-16 Elliot Lee <sopwith@redhat.com>
PR java/9677
diff --git a/gcc/java/jcf-write.c b/gcc/java/jcf-write.c
index d775a816ff2..7b5bdcce7f1 100644
--- a/gcc/java/jcf-write.c
+++ b/gcc/java/jcf-write.c
@@ -798,6 +798,19 @@ find_constant_index (tree value, struct jcf_partial *state)
{
long words[2];
+ /* IEEE NaN can have many values, but the Java VM spec defines a
+ canonical NaN. */
+ if (flag_emit_class_files
+ && REAL_VALUE_ISNAN (TREE_REAL_CST (value)))
+ {
+ if (TYPE_PRECISION (TREE_TYPE (value)) == 32)
+ return find_constant1 (&state->cpool, CONSTANT_Float,
+ 0x7fc00000);
+ else
+ return find_constant2 (&state->cpool, CONSTANT_Double,
+ 0x7ff80000, 0x00000000);
+ }
+
real_to_target (words, &TREE_REAL_CST (value),
TYPE_MODE (TREE_TYPE (value)));
words[0] &= 0xffffffff;