2005-02-15 Andrew Cagney <[email protected]>

[binutils.git] / gdb / jv-valprint.c

diff --git a/gdb/jv-valprint.c b/gdb/jv-valprint.c
index 6bfae7e3274e9fa8b4d98389047f27c9d5dda72b..51ba6fb52e52c048ad3fe092ee064fa594b63367 100644 (file)
--- a/gdb/jv-valprint.c
+++ b/gdb/jv-valprint.c
@@ -1,25 +1,29 @@
 /* Support for printing Java values for GDB, the GNU debugger.
 /* Support for printing Java values for GDB, the GNU debugger.

-   Copyright 1997, 1998, 1999 Free Software Foundation, Inc.

 
 

-This file is part of GDB.
+   Copyright 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 Free
+   Software Foundation, Inc.

 
 

-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
+   This file is part of GDB.

 
 

-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.

 
 

-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.  */

 
 #include "defs.h"
 #include "symtab.h"
 #include "gdbtypes.h"
 
 #include "defs.h"
 #include "symtab.h"
 #include "gdbtypes.h"

+#include "gdbcore.h"

 #include "expression.h"
 #include "value.h"
 #include "demangle.h"
 #include "expression.h"
 #include "value.h"
 #include "demangle.h"


@@ -27,21 +31,22 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 #include "language.h"
 #include "jv-lang.h"
 #include "c-lang.h"
 #include "language.h"
 #include "jv-lang.h"
 #include "c-lang.h"

+#include "annotate.h"
+#include "gdb_string.h"
+
+/* Local functions */

 
 int
 
 int

-java_value_print (val, stream, format, pretty)
-     value_ptr val;
-     GDB_FILE *stream;
-     int format;
-     enum val_prettyprint pretty;
+java_value_print (struct value *val, struct ui_file *stream, int format,
+                 enum val_prettyprint pretty)

 {
   struct type *type;
   CORE_ADDR address;
   int i;
   char *name;
 
 {
   struct type *type;
   CORE_ADDR address;
   int i;
   char *name;
 

-  type = VALUE_TYPE (val);
-  address = VALUE_ADDRESS (val) + VALUE_OFFSET (val);
+  type = value_type (val);
+  address = VALUE_ADDRESS (val) + value_offset (val);

 
   if (is_object_type (type))
     {
 
   if (is_object_type (type))
     {


@@ -49,28 +54,28 @@ java_value_print (val, stream, format, pretty)
 
       /* Get the run-time type, and cast the object into that */
 
 
       /* Get the run-time type, and cast the object into that */
 

-      obj_addr = unpack_pointer (type, VALUE_CONTENTS (val));
+      obj_addr = unpack_pointer (type, value_contents (val));

 
       if (obj_addr != 0)
        {
          type = type_from_class (java_class_from_object (val));
          type = lookup_pointer_type (type);
 
 
       if (obj_addr != 0)
        {
          type = type_from_class (java_class_from_object (val));
          type = lookup_pointer_type (type);
 

-         val = value_at (type, address, NULL);
+         val = value_at (type, address);

        }
     }
 
        }
     }
 

-  if (TYPE_CODE (type) == TYPE_CODE_PTR && ! value_logical_not (val))
+  if (TYPE_CODE (type) == TYPE_CODE_PTR && !value_logical_not (val))

     type_print (TYPE_TARGET_TYPE (type), "", stream, -1);
 
   name = TYPE_TAG_NAME (type);
   if (TYPE_CODE (type) == TYPE_CODE_STRUCT && name != NULL
     type_print (TYPE_TARGET_TYPE (type), "", stream, -1);
 
   name = TYPE_TAG_NAME (type);
   if (TYPE_CODE (type) == TYPE_CODE_STRUCT && name != NULL

-      && (i = strlen (name), name[i-1] == ']'))
+      && (i = strlen (name), name[i - 1] == ']'))

     {
       char buf4[4];
       long length;
       unsigned int things_printed = 0;
     {
       char buf4[4];
       long length;
       unsigned int things_printed = 0;

-      int reps; 
+      int reps;

       struct type *el_type = java_primitive_type_from_name (name, i - 2);
 
       i = 0;
       struct type *el_type = java_primitive_type_from_name (name, i - 2);
 
       i = 0;


@@ -81,14 +86,16 @@ java_value_print (val, stream, format, pretty)
 
       if (el_type == NULL)
        {
 
       if (el_type == NULL)
        {

-         CORE_ADDR element, next_element;
+         CORE_ADDR element;
+         CORE_ADDR next_element = -1; /* dummy initial value */

 
 

-         address += JAVA_OBJECT_SIZE + 4; /* Skip object header and length. */
+         address += JAVA_OBJECT_SIZE + 4;      /* Skip object header and length. */

 
          while (i < length && things_printed < print_max)
            {
 
          while (i < length && things_printed < print_max)
            {

-             char buf[TARGET_PTR_BIT / HOST_CHAR_BIT];
+             char *buf;

 
 

+             buf = alloca (TARGET_PTR_BIT / HOST_CHAR_BIT);

              fputs_filtered (", ", stream);
              wrap_here (n_spaces (2));
 
              fputs_filtered (", ", stream);
              wrap_here (n_spaces (2));
 


@@ -96,16 +103,24 @@ java_value_print (val, stream, format, pretty)
                element = next_element;
              else
                {
                element = next_element;
              else
                {

-                 read_memory (address, buf, sizeof(buf));
+                 read_memory (address, buf, sizeof (buf));

                  address += TARGET_PTR_BIT / HOST_CHAR_BIT;
                  address += TARGET_PTR_BIT / HOST_CHAR_BIT;

-                 element = extract_address (buf, sizeof(buf));
+                 /* FIXME: cagney/2003-05-24: Bogus or what.  It
+                     pulls a host sized pointer out of the target and
+                     then extracts that as an address (while assuming
+                     that the address is unsigned)!  */
+                 element = extract_unsigned_integer (buf, sizeof (buf));

                }
 
                }
 

-             for (reps = 1;  i + reps < length;  reps++)
+             for (reps = 1; i + reps < length; reps++)

                {
                {

-                 read_memory (address, buf, sizeof(buf));
+                 read_memory (address, buf, sizeof (buf));

                  address += TARGET_PTR_BIT / HOST_CHAR_BIT;
                  address += TARGET_PTR_BIT / HOST_CHAR_BIT;

-                 next_element = extract_address (buf, sizeof(buf));
+                 /* FIXME: cagney/2003-05-24: Bogus or what.  It
+                     pulls a host sized pointer out of the target and
+                     then extracts that as an address (while assuming
+                     that the address is unsigned)!  */
+                 next_element = extract_unsigned_integer (buf, sizeof (buf));

                  if (next_element != element)
                    break;
                }
                  if (next_element != element)
                    break;
                }


@@ -118,7 +133,7 @@ java_value_print (val, stream, format, pretty)
              if (element == 0)
                fprintf_filtered (stream, "null");
              else
              if (element == 0)
                fprintf_filtered (stream, "null");
              else

-               fprintf_filtered (stream, "@%x", element);
+               fprintf_filtered (stream, "@%s", paddr_nz (element));

 
              things_printed++;
              i += reps;
 
              things_printed++;
              i += reps;


@@ -126,8 +141,8 @@ java_value_print (val, stream, format, pretty)
        }
       else
        {
        }
       else
        {

-         value_ptr v = allocate_value (el_type);
-         value_ptr next_v = allocate_value (el_type);
+         struct value *v = allocate_value (el_type);
+         struct value *next_v = allocate_value (el_type);

 
          VALUE_ADDRESS (v) = address + JAVA_OBJECT_SIZE + 4;
          VALUE_ADDRESS (next_v) = VALUE_ADDRESS (v);
 
          VALUE_ADDRESS (v) = address + JAVA_OBJECT_SIZE + 4;
          VALUE_ADDRESS (next_v) = VALUE_ADDRESS (v);


@@ -139,7 +154,7 @@ java_value_print (val, stream, format, pretty)
 
              if (i > 0)
                {
 
              if (i > 0)
                {

-                 value_ptr tmp;
+                 struct value *tmp;

 
                  tmp = next_v;
                  next_v = v;
 
                  tmp = next_v;
                  next_v = v;


@@ -147,17 +162,17 @@ java_value_print (val, stream, format, pretty)
                }
              else
                {
                }
              else
                {

-                 VALUE_LAZY (v) = 1;
-                 VALUE_OFFSET (v) = 0;
+                 set_value_lazy (v, 1);
+                 set_value_offset (v, 0);

                }
 
                }
 

-             VALUE_OFFSET (next_v) = VALUE_OFFSET (v);
+             set_value_offset (next_v, value_offset (v));

 
 

-             for (reps = 1;  i + reps < length;  reps++)
+             for (reps = 1; i + reps < length; reps++)

                {
                {

-                 VALUE_LAZY (next_v) = 1;
-                 VALUE_OFFSET (next_v) += TYPE_LENGTH (el_type);
-                 if (memcmp (VALUE_CONTENTS (v), VALUE_CONTENTS (next_v),
+                 set_value_lazy (next_v, 1);
+                 set_value_offset (next_v, value_offset (next_v) + TYPE_LENGTH (el_type));
+                 if (memcmp (value_contents (v), value_contents (next_v),

                              TYPE_LENGTH (el_type)) != 0)
                    break;
                }
                              TYPE_LENGTH (el_type)) != 0)
                    break;
                }


@@ -167,7 +182,7 @@ java_value_print (val, stream, format, pretty)
              else
                fprintf_filtered (stream, "%d..%d: ", i, i + reps - 1);
 
              else
                fprintf_filtered (stream, "%d..%d: ", i, i + reps - 1);
 

-             val_print (VALUE_TYPE (v), VALUE_CONTENTS (v), 0, 0,
+             val_print (value_type (v), value_contents (v), 0, 0,

                         stream, format, 2, 1, pretty);
 
              things_printed++;
                         stream, format, 2, 1, pretty);
 
              things_printed++;


@@ -187,38 +202,40 @@ java_value_print (val, stream, format, pretty)
 
   if (TYPE_CODE (type) == TYPE_CODE_PTR
       && TYPE_TARGET_TYPE (type)
 
   if (TYPE_CODE (type) == TYPE_CODE_PTR
       && TYPE_TARGET_TYPE (type)

-      && TYPE_NAME (TYPE_TARGET_TYPE (type))
-      && strcmp (TYPE_NAME (TYPE_TARGET_TYPE (type)), "java.lang.String") == 0
+      && TYPE_TAG_NAME (TYPE_TARGET_TYPE (type))
+      && strcmp (TYPE_TAG_NAME (TYPE_TARGET_TYPE (type)),
+                "java.lang.String") == 0

       && (format == 0 || format == 's')
       && (format == 0 || format == 's')

-      && address != 0)
+      && address != 0
+      && value_as_address (val) != 0)

     {
     {

-      value_ptr data_val;
+      struct value *data_val;

       CORE_ADDR data;
       CORE_ADDR data;

-      value_ptr boffset_val;
+      struct value *boffset_val;

       unsigned long boffset;
       unsigned long boffset;

-      value_ptr count_val;
+      struct value *count_val;

       unsigned long count;
       unsigned long count;

-      value_ptr mark;
+      struct value *mark;

 
       mark = value_mark ();    /* Remember start of new values */
 
       data_val = value_struct_elt (&val, NULL, "data", NULL, NULL);
 
       mark = value_mark ();    /* Remember start of new values */
 
       data_val = value_struct_elt (&val, NULL, "data", NULL, NULL);

-      data = value_as_pointer (data_val);
+      data = value_as_address (data_val);

 
       boffset_val = value_struct_elt (&val, NULL, "boffset", NULL, NULL);
 
       boffset_val = value_struct_elt (&val, NULL, "boffset", NULL, NULL);

-      boffset = value_as_pointer (boffset_val);
+      boffset = value_as_address (boffset_val);

 
       count_val = value_struct_elt (&val, NULL, "count", NULL, NULL);
 
       count_val = value_struct_elt (&val, NULL, "count", NULL, NULL);

-      count = value_as_pointer (count_val);
+      count = value_as_address (count_val);

 
 

-      value_free_to_mark (mark); /* Release unnecessary values */
+      value_free_to_mark (mark);       /* Release unnecessary values */

 
       val_print_string (data + boffset, count, 2, stream);
 
       return 0;
     }
 
 
       val_print_string (data + boffset, count, 2, stream);
 
       return 0;
     }
 

-  return (val_print (type, VALUE_CONTENTS (val), 0, address,
+  return (val_print (type, value_contents (val), 0, address,

                     stream, format, 1, 0, pretty));
 }
 
                     stream, format, 1, 0, pretty));
 }
 


@@ -228,16 +245,10 @@ java_value_print (val, stream, format, pretty)
    DONT_PRINT is an array of baseclass types that we
    should not print, or zero if called from top level.  */
 
    DONT_PRINT is an array of baseclass types that we
    should not print, or zero if called from top level.  */
 

-void
-java_print_value_fields (type, valaddr, address, stream,
-                        format, recurse, pretty)
-     struct type *type;
-     char *valaddr;
-     CORE_ADDR address;
-     GDB_FILE *stream;
-     int format;
-     int recurse;
-     enum val_prettyprint pretty;
+static void
+java_print_value_fields (struct type *type, const bfd_byte *valaddr,
+                        CORE_ADDR address, struct ui_file *stream,
+                        int format, int recurse, enum val_prettyprint pretty)

 {
   int i, len, n_baseclasses;
 
 {
   int i, len, n_baseclasses;
 


@@ -256,8 +267,8 @@ java_print_value_fields (type, valaddr, address, stream,
          int boffset;
          struct type *baseclass = check_typedef (TYPE_BASECLASS (type, i));
          char *basename = TYPE_NAME (baseclass);
          int boffset;
          struct type *baseclass = check_typedef (TYPE_BASECLASS (type, i));
          char *basename = TYPE_NAME (baseclass);

-         char *base_valaddr;
-         
+         const bfd_byte *base_valaddr;
+

          if (BASETYPE_VIA_VIRTUAL (type, i))
            continue;
 
          if (BASETYPE_VIA_VIRTUAL (type, i))
            continue;
 


@@ -269,7 +280,7 @@ java_print_value_fields (type, valaddr, address, stream,
          if (pretty)
            {
              fprintf_filtered (stream, "\n");
          if (pretty)
            {
              fprintf_filtered (stream, "\n");

-             print_spaces_filtered (2 * (recurse+1), stream);
+             print_spaces_filtered (2 * (recurse + 1), stream);

            }
          fputs_filtered ("<", stream);
          /* Not sure what the best notation is in the case where there is no
            }
          fputs_filtered ("<", stream);
          /* Not sure what the best notation is in the case where there is no


@@ -280,11 +291,8 @@ java_print_value_fields (type, valaddr, address, stream,
          base_valaddr = valaddr;
 
          java_print_value_fields (baseclass, base_valaddr, address + boffset,
          base_valaddr = valaddr;
 
          java_print_value_fields (baseclass, base_valaddr, address + boffset,

-                                  stream, format, recurse+1, pretty);
+                                  stream, format, recurse + 1, pretty);

          fputs_filtered (", ", stream);
          fputs_filtered (", ", stream);

-         
-       flush_it:
-         ;

        }
 
     }
        }
 
     }


@@ -293,7 +301,6 @@ java_print_value_fields (type, valaddr, address, stream,
     fprintf_filtered (stream, "<No data fields>");
   else
     {
     fprintf_filtered (stream, "<No data fields>");
   else
     {

-      extern int inspect_it;

       int fields_seen = 0;
 
       for (i = n_baseclasses; i < len; i++)
       int fields_seen = 0;
 
       for (i = n_baseclasses; i < len; i++)


@@ -327,7 +334,7 @@ java_print_value_fields (type, valaddr, address, stream,
              fprintf_filtered (stream, "\n");
              print_spaces_filtered (2 + 2 * recurse, stream);
            }
              fprintf_filtered (stream, "\n");
              print_spaces_filtered (2 + 2 * recurse, stream);
            }

-         else 
+         else

            {
              wrap_here (n_spaces (2 + 2 * recurse));
            }
            {
              wrap_here (n_spaces (2 + 2 * recurse));
            }


@@ -364,50 +371,52 @@ java_print_value_fields (type, valaddr, address, stream,
 
          if (!TYPE_FIELD_STATIC (type, i) && TYPE_FIELD_PACKED (type, i))
            {
 
          if (!TYPE_FIELD_STATIC (type, i) && TYPE_FIELD_PACKED (type, i))
            {

-             value_ptr v;
+             struct value *v;

 
              /* Bitfields require special handling, especially due to byte
 
              /* Bitfields require special handling, especially due to byte

-                order problems.  */
+                order problems.  */

              if (TYPE_FIELD_IGNORE (type, i))
                {
              if (TYPE_FIELD_IGNORE (type, i))
                {

-                  fputs_filtered ("<optimized out or zero length>", stream);
+                 fputs_filtered ("<optimized out or zero length>", stream);

                }
              else
                {
                }
              else
                {

-                  v = value_from_longest (TYPE_FIELD_TYPE (type, i),
+                 v = value_from_longest (TYPE_FIELD_TYPE (type, i),

                                   unpack_field_as_long (type, valaddr, i));
 
                                   unpack_field_as_long (type, valaddr, i));
 

-                   val_print (TYPE_FIELD_TYPE(type, i), VALUE_CONTENTS (v), 0,
-                             0, stream, format, 0, recurse + 1, pretty);
+                 val_print (TYPE_FIELD_TYPE (type, i), value_contents (v), 0,
+                            0, stream, format, 0, recurse + 1, pretty);

                }
            }
          else
            {
              if (TYPE_FIELD_IGNORE (type, i))
                {
                }
            }
          else
            {
              if (TYPE_FIELD_IGNORE (type, i))
                {

-                  fputs_filtered ("<optimized out or zero length>", stream);
+                 fputs_filtered ("<optimized out or zero length>", stream);

                }
              else if (TYPE_FIELD_STATIC (type, i))
                {
                }
              else if (TYPE_FIELD_STATIC (type, i))
                {

-                 value_ptr v = value_static_field (type, i);
+                 struct value *v = value_static_field (type, i);

                  if (v == NULL)
                    fputs_filtered ("<optimized out>", stream);
                  else
                    {
                  if (v == NULL)
                    fputs_filtered ("<optimized out>", stream);
                  else
                    {

-                     struct type *t = check_typedef (VALUE_TYPE (v));
+                     struct type *t = check_typedef (value_type (v));

                      if (TYPE_CODE (t) == TYPE_CODE_STRUCT)
                        v = value_addr (v);
                      if (TYPE_CODE (t) == TYPE_CODE_STRUCT)
                        v = value_addr (v);

-                     val_print (VALUE_TYPE (v),
-                                VALUE_CONTENTS (v), 0, VALUE_ADDRESS (v),
-                                stream, format, 0, recurse+1, pretty);
+                     val_print (value_type (v),
+                                value_contents (v), 0, VALUE_ADDRESS (v),
+                                stream, format, 0, recurse + 1, pretty);

                    }
                }
                    }
                }

+             else if (TYPE_FIELD_TYPE (type, i) == NULL)
+               fputs_filtered ("<unknown type>", stream);

              else
                {
              else
                {

-                  val_print (TYPE_FIELD_TYPE (type, i), 
-                             valaddr + TYPE_FIELD_BITPOS (type, i) / 8, 0,
-                             address + TYPE_FIELD_BITPOS (type, i) / 8,
-                             stream, format, 0, recurse + 1, pretty);
+                 val_print (TYPE_FIELD_TYPE (type, i),
+                            valaddr + TYPE_FIELD_BITPOS (type, i) / 8, 0,
+                            address + TYPE_FIELD_BITPOS (type, i) / 8,
+                            stream, format, 0, recurse + 1, pretty);

                }
            }
          annotate_field_end ();
                }
            }
          annotate_field_end ();


@@ -436,18 +445,12 @@ java_print_value_fields (type, valaddr, address, stream,
    The PRETTY parameter controls prettyprinting.  */
 
 int
    The PRETTY parameter controls prettyprinting.  */
 
 int

-java_val_print (type, valaddr, embedded_offset, address, stream, format,
-               deref_ref, recurse, pretty)
-     struct type *type;
-     char *valaddr;
-     CORE_ADDR address;
-     GDB_FILE *stream;
-     int format;
-     int deref_ref;
-     int recurse;
-     enum val_prettyprint pretty;
+java_val_print (struct type *type, const bfd_byte *valaddr,
+               int embedded_offset, CORE_ADDR address,
+               struct ui_file *stream, int format, int deref_ref,
+               int recurse, enum val_prettyprint pretty)

 {
 {

-  register unsigned int i = 0;         /* Number of characters printed */
+  unsigned int i = 0;  /* Number of characters printed */

   struct type *target_type;
   CORE_ADDR addr;
 
   struct type *target_type;
   CORE_ADDR addr;
 


@@ -461,13 +464,14 @@ java_val_print (type, valaddr, embedded_offset, address, stream, format,
          break;
        }
 #if 0
          break;
        }
 #if 0

-      if (vtblprint && cp_is_vtbl_ptr_type(type))
+      if (vtblprint && cp_is_vtbl_ptr_type (type))

        {
        {

-          /* Print the unmangled name if desired.  */
+         /* Print the unmangled name if desired.  */

          /* Print vtable entry - we only get here if we ARE using
             -fvtable_thunks.  (Otherwise, look under TYPE_CODE_STRUCT.) */
          /* Print vtable entry - we only get here if we ARE using
             -fvtable_thunks.  (Otherwise, look under TYPE_CODE_STRUCT.) */

-         print_address_demangle(extract_address (valaddr, TYPE_LENGTH (type)),
-                                stream, demangle);
+         /* Extract an address, assume that it is unsigned.  */
+         print_address_demangle (extract_unsigned_integer (valaddr, TYPE_LENGTH (type)),
+                                 stream, demangle);

          break;
        }
 #endif
          break;
        }
 #endif


@@ -496,18 +500,17 @@ java_val_print (type, valaddr, embedded_offset, address, stream, format,
       return i;
 
     case TYPE_CODE_CHAR:
       return i;
 
     case TYPE_CODE_CHAR:

-      format = format ? format : output_format;
-      if (format)
-       print_scalar_formatted (valaddr, type, format, 0, stream);
-      else
-       LA_PRINT_CHAR ((int) unpack_long (type, valaddr), stream);
-      break;
-

     case TYPE_CODE_INT:
     case TYPE_CODE_INT:

-      /* Can't just call c_val_print because that print bytes as C chars. */
+      /* Can't just call c_val_print because that prints bytes as C
+        chars.  */

       format = format ? format : output_format;
       if (format)
        print_scalar_formatted (valaddr, type, format, 0, stream);
       format = format ? format : output_format;
       if (format)
        print_scalar_formatted (valaddr, type, format, 0, stream);

+      else if (TYPE_CODE (type) == TYPE_CODE_CHAR
+              || (TYPE_CODE (type) == TYPE_CODE_INT
+                  && TYPE_LENGTH (type) == 2
+                  && strcmp (TYPE_NAME (type), "char") == 0))
+       LA_PRINT_CHAR ((int) unpack_long (type, valaddr), stream);

       else
        val_print_type_code_int (type, valaddr, stream);
       break;
       else
        val_print_type_code_int (type, valaddr, stream);
       break;