* jcf-parse.c (get_constant): Decode from IEEE no matter

        what the target format.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@57389 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog
index 46c11b4..45776e6 100644 (file)
--- a/gcc/java/ChangeLog
+++ b/gcc/java/ChangeLog
@@ -1,3 +1,8 @@
+2002-09-21  Richard Henderson  <rth@redhat.com>
+
+       * jcf-parse.c (get_constant): Decode from IEEE no matter 
+       what the target format.
+
 2002-09-20  Kazu Hirata  <kazu@cs.umass.edu>
 
        * ChangeLog: Follow spelling conventions.

diff --git a/gcc/java/jcf-parse.c b/gcc/java/jcf-parse.c
index 5e7957f..f4bcd99 100644 (file)
--- a/gcc/java/jcf-parse.c
+++ b/gcc/java/jcf-parse.c
@@ -292,41 +292,33 @@ get_constant (jcf, index)
       }
 
     case CONSTANT_Float:
-      /* ??? Even more ideal would be to import the number using the
-        IEEE decode routines, then use whatever format the target
-        actually uses.  This would enable Java on VAX to kind work.  */
-      if (TARGET_FLOAT_FORMAT == IEEE_FLOAT_FORMAT)
-       {
-         jint num = JPOOL_INT(jcf, index);
-         long buf = num;
-         REAL_VALUE_TYPE d;
-         real_from_target (&d, &buf, SFmode);
-         value = build_real (float_type_node, d);
-         break;
-       }
-      else
-       goto bad;
+      {
+       jint num = JPOOL_INT(jcf, index);
+       long buf = num;
+       REAL_VALUE_TYPE d;
+
+       real_from_target_fmt (&d, &buf, &ieee_single_format);
+       value = build_real (float_type_node, d);
+       break;
+      }
 
     case CONSTANT_Double:
-      if (TARGET_FLOAT_FORMAT == IEEE_FLOAT_FORMAT)
-       {
-         long buf[2], lo, hi;
-         REAL_VALUE_TYPE d;
+      {
+       long buf[2], lo, hi;
+       REAL_VALUE_TYPE d;
 
-         hi = JPOOL_UINT (jcf, index);
-         lo = JPOOL_UINT (jcf, index+1);
+       hi = JPOOL_UINT (jcf, index);
+       lo = JPOOL_UINT (jcf, index+1);
 
-         if (FLOAT_WORDS_BIG_ENDIAN)
-           buf[0] = hi, buf[1] = lo;
-         else
-           buf[0] = lo, buf[1] = hi;
+       if (FLOAT_WORDS_BIG_ENDIAN)
+         buf[0] = hi, buf[1] = lo;
+       else
+         buf[0] = lo, buf[1] = hi;
 
-         real_from_target (&d, buf, DFmode);
-         value = build_real (double_type_node, d);
-         break;
-       }
-      else
-       goto bad;
+       real_from_target_fmt (&d, &buf, &ieee_double_format);
+       value = build_real (double_type_node, d);
+       break;
+      }
 
     case CONSTANT_String:
       {