* defs.h (extract_signed_integer, extract_unsigned_integer,

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

diff --git a/gdb/jv-valprint.c b/gdb/jv-valprint.c
index e19a307dac7c6de907dc93a3c95e5518812ad191..08d2e6fb3d540f25c2990f5c25cf54840f1cbf67 100644 (file)
--- a/gdb/jv-valprint.c
+++ b/gdb/jv-valprint.c
@@ -1,11 +1,13 @@
 /* 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.
+
+   Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2007,
+   2008, 2009 Free Software Foundation, Inc.

 
    This file is part of GDB.
 
    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
 
    This file is part of GDB.
 
    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
+   the Free Software Foundation; either version 3 of the License, or

    (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,


@@ -14,9 +16,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
    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.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */

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


@@ -30,26 +30,24 @@
 #include "jv-lang.h"
 #include "c-lang.h"
 #include "annotate.h"
 #include "jv-lang.h"
 #include "c-lang.h"
 #include "annotate.h"

+#include "gdb_string.h"

 
 /* Local functions */
 
 
 /* Local functions */
 

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

 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, 
+                 const struct value_print_options *options)

 {
 {

+  struct gdbarch *gdbarch = get_type_arch (value_type (val));
+  enum bfd_endian byte_order = gdbarch_byte_order (gdbarch);

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

+  struct value_print_options opts;

 
 

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

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


@@ -57,14 +55,14 @@ 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)
        {
 
       if (obj_addr != 0)
        {

-         type = type_from_class (java_class_from_object (val));
+         type = type_from_class (gdbarch, java_class_from_object (val));

          type = lookup_pointer_type (type);
 
          type = lookup_pointer_type (type);
 

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

        }
     }
 
        }
     }
 


@@ -75,28 +73,31 @@ java_value_print (val, stream, format, pretty)
   if (TYPE_CODE (type) == TYPE_CODE_STRUCT && name != NULL
       && (i = strlen (name), name[i - 1] == ']'))
     {
   if (TYPE_CODE (type) == TYPE_CODE_STRUCT && name != NULL
       && (i = strlen (name), name[i - 1] == ']'))
     {

-      char buf4[4];
+      gdb_byte buf4[4];

       long length;
       unsigned int things_printed = 0;
       int reps;
       long length;
       unsigned int things_printed = 0;
       int reps;

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

       i = 0;
       i = 0;

-      read_memory (address + JAVA_OBJECT_SIZE, buf4, 4);
+      read_memory (address + get_java_object_header_size (gdbarch), buf4, 4);

 
 

-      length = (long) extract_signed_integer (buf4, 4);
+      length = (long) extract_signed_integer (buf4, 4, byte_order);

       fprintf_filtered (stream, "{length: %ld", length);
 
       if (el_type == NULL)
        {
       fprintf_filtered (stream, "{length: %ld", length);
 
       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. */
+         /* Skip object header and length. */
+         address += get_java_object_header_size (gdbarch) + 4;

 
 

-         while (i < length && things_printed < print_max)
+         while (i < length && things_printed < options->print_max)

            {
            {

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

 
 

+             buf = alloca (gdbarch_ptr_bit (gdbarch) / HOST_CHAR_BIT);

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


@@ -105,15 +106,25 @@ java_value_print (val, stream, format, pretty)
              else
                {
                  read_memory (address, buf, sizeof (buf));
              else
                {
                  read_memory (address, buf, sizeof (buf));

-                 address += TARGET_PTR_BIT / HOST_CHAR_BIT;
-                 element = extract_address (buf, sizeof (buf));
+                 address += gdbarch_ptr_bit (gdbarch) / HOST_CHAR_BIT;
+                 /* 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),
+                                                     byte_order);

                }
 
              for (reps = 1; i + reps < length; reps++)
                {
                  read_memory (address, buf, sizeof (buf));
                }
 
              for (reps = 1; i + reps < length; reps++)
                {
                  read_memory (address, buf, sizeof (buf));

-                 address += TARGET_PTR_BIT / HOST_CHAR_BIT;
-                 next_element = extract_address (buf, sizeof (buf));
+                 address += gdbarch_ptr_bit (gdbarch) / HOST_CHAR_BIT;
+                 /* 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),
+                                                          byte_order);

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


@@ -126,7 +137,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", paddress (gdbarch, element));

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


@@ -134,20 +145,21 @@ 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);
+         set_value_address (v, (address
+                                + get_java_object_header_size (gdbarch) + 4));
+         set_value_address (next_v, value_raw_address (v));

 
 

-         while (i < length && things_printed < print_max)
+         while (i < length && things_printed < options->print_max)

            {
              fputs_filtered (", ", stream);
              wrap_here (n_spaces (2));
 
              if (i > 0)
                {
            {
              fputs_filtered (", ", stream);
              wrap_here (n_spaces (2));
 
              if (i > 0)
                {

-                 value_ptr tmp;
+                 struct value *tmp;

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


@@ -155,17 +167,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;
                }


@@ -175,8 +187,9 @@ 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,
-                        stream, format, 2, 1, pretty);
+             opts = *options;
+             opts.deref_ref = 1;
+             common_val_print (v, stream, 1, &opts, current_language);

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


@@ -195,57 +208,57 @@ 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
-      && (format == 0 || format == 's')
-      && address != 0)
+      && TYPE_TAG_NAME (TYPE_TARGET_TYPE (type))
+      && strcmp (TYPE_TAG_NAME (TYPE_TARGET_TYPE (type)),
+                "java.lang.String") == 0
+      && (options->format == 0 || options->format == 's')
+      && address != 0
+      && value_as_address (val) != 0)

     {
     {

-      value_ptr data_val;
+      struct type *char_type;
+      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);
+      char_type = builtin_java_type (gdbarch)->builtin_char;
+      val_print_string (char_type, data + boffset, count, stream, options);

 
       return 0;
     }
 
 
       return 0;
     }
 

-  return (val_print (type, VALUE_CONTENTS (val), 0, address,
-                    stream, format, 1, 0, pretty));
+  opts = *options;
+  opts.deref_ref = 1;
+  return common_val_print (val, stream, 0, &opts, current_language);

 }
 
 }
 

-/* TYPE, VALADDR, ADDRESS, STREAM, RECURSE, and PRETTY have the
+/* TYPE, VALADDR, ADDRESS, STREAM, RECURSE, and OPTIONS have the

    same meanings as in cp_print_value and c_val_print.
 
    DONT_PRINT is an array of baseclass types that we
    should not print, or zero if called from top level.  */
 
 static void
    same meanings as in cp_print_value and c_val_print.
 
    DONT_PRINT is an array of baseclass types that we
    should not print, or zero if called from top level.  */
 
 static 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;
+java_print_value_fields (struct type *type, const gdb_byte *valaddr,
+                        CORE_ADDR address, struct ui_file *stream,
+                        int recurse,
+                        const struct value_print_options *options)

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


@@ -264,7 +277,7 @@ 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 gdb_byte *base_valaddr;

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


@@ -274,7 +287,7 @@ java_print_value_fields (type, valaddr, address, stream,
 
          boffset = 0;
 
 
          boffset = 0;
 

-         if (pretty)
+         if (options->pretty)

            {
              fprintf_filtered (stream, "\n");
              print_spaces_filtered (2 * (recurse + 1), stream);
            {
              fprintf_filtered (stream, "\n");
              print_spaces_filtered (2 * (recurse + 1), stream);


@@ -288,11 +301,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, recurse + 1, options);

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

-
-       flush_it:
-         ;

        }
 
     }
        }
 
     }


@@ -301,16 +311,15 @@ 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++)
        {
          /* If requested, skip printing of static fields.  */
       int fields_seen = 0;
 
       for (i = n_baseclasses; i < len; i++)
        {
          /* If requested, skip printing of static fields.  */

-         if (TYPE_FIELD_STATIC (type, i))
+         if (field_is_static (&TYPE_FIELD (type, i)))

            {
              char *name = TYPE_FIELD_NAME (type, i);
            {
              char *name = TYPE_FIELD_NAME (type, i);

-             if (!static_field_print)
+             if (!options->static_field_print)

                continue;
              if (name != NULL && strcmp (name, "class") == 0)
                continue;
                continue;
              if (name != NULL && strcmp (name, "class") == 0)
                continue;


@@ -319,7 +328,7 @@ java_print_value_fields (type, valaddr, address, stream,
            fprintf_filtered (stream, ", ");
          else if (n_baseclasses > 0)
            {
            fprintf_filtered (stream, ", ");
          else if (n_baseclasses > 0)
            {

-             if (pretty)
+             if (options->pretty)

                {
                  fprintf_filtered (stream, "\n");
                  print_spaces_filtered (2 + 2 * recurse, stream);
                {
                  fprintf_filtered (stream, "\n");
                  print_spaces_filtered (2 + 2 * recurse, stream);


@@ -330,7 +339,7 @@ java_print_value_fields (type, valaddr, address, stream,
            }
          fields_seen = 1;
 
            }
          fields_seen = 1;
 

-         if (pretty)
+         if (options->pretty)

            {
              fprintf_filtered (stream, "\n");
              print_spaces_filtered (2 + 2 * recurse, stream);
            {
              fprintf_filtered (stream, "\n");
              print_spaces_filtered (2 + 2 * recurse, stream);


@@ -339,13 +348,13 @@ java_print_value_fields (type, valaddr, address, stream,
            {
              wrap_here (n_spaces (2 + 2 * recurse));
            }
            {
              wrap_here (n_spaces (2 + 2 * recurse));
            }

-         if (inspect_it)
+         if (options->inspect_it)

            {
              if (TYPE_CODE (TYPE_FIELD_TYPE (type, i)) == TYPE_CODE_PTR)
                fputs_filtered ("\"( ptr \"", stream);
              else
                fputs_filtered ("\"( nodef \"", stream);
            {
              if (TYPE_CODE (TYPE_FIELD_TYPE (type, i)) == TYPE_CODE_PTR)
                fputs_filtered ("\"( ptr \"", stream);
              else
                fputs_filtered ("\"( nodef \"", stream);

-             if (TYPE_FIELD_STATIC (type, i))
+             if (field_is_static (&TYPE_FIELD (type, i)))

                fputs_filtered ("static ", stream);
              fprintf_symbol_filtered (stream, TYPE_FIELD_NAME (type, i),
                                       language_cplus,
                fputs_filtered ("static ", stream);
              fprintf_symbol_filtered (stream, TYPE_FIELD_NAME (type, i),
                                       language_cplus,


@@ -360,7 +369,7 @@ java_print_value_fields (type, valaddr, address, stream,
            {
              annotate_field_begin (TYPE_FIELD_TYPE (type, i));
 
            {
              annotate_field_begin (TYPE_FIELD_TYPE (type, i));
 

-             if (TYPE_FIELD_STATIC (type, i))
+             if (field_is_static (&TYPE_FIELD (type, i)))

                fputs_filtered ("static ", stream);
              fprintf_symbol_filtered (stream, TYPE_FIELD_NAME (type, i),
                                       language_cplus,
                fputs_filtered ("static ", stream);
              fprintf_symbol_filtered (stream, TYPE_FIELD_NAME (type, i),
                                       language_cplus,


@@ -370,9 +379,10 @@ java_print_value_fields (type, valaddr, address, stream,
              annotate_field_value ();
            }
 
              annotate_field_value ();
            }
 

-         if (!TYPE_FIELD_STATIC (type, i) && TYPE_FIELD_PACKED (type, i))
+         if (!field_is_static (&TYPE_FIELD (type, i))
+             && TYPE_FIELD_PACKED (type, i))

            {
            {

-             value_ptr v;
+             struct value *v;

 
              /* Bitfields require special handling, especially due to byte
                 order problems.  */
 
              /* Bitfields require special handling, especially due to byte
                 order problems.  */


@@ -382,11 +392,15 @@ java_print_value_fields (type, valaddr, address, stream,
                }
              else
                {
                }
              else
                {

+                 struct value_print_options opts;
+

                  v = value_from_longest (TYPE_FIELD_TYPE (type, i),
                                   unpack_field_as_long (type, valaddr, i));
 
                  v = value_from_longest (TYPE_FIELD_TYPE (type, 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);
+                 opts = *options;
+                 opts.deref_ref = 0;
+                 common_val_print (v, stream, recurse + 1,
+                                   &opts, current_language);

                }
            }
          else
                }
            }
          else


@@ -395,35 +409,40 @@ java_print_value_fields (type, valaddr, address, stream,
                {
                  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 (field_is_static (&TYPE_FIELD (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 value_print_options opts;
+                     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);
+                     opts = *options;
+                     opts.deref_ref = 0;
+                     common_val_print (v, stream, recurse + 1,
+                                       &opts, current_language);

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

+                 struct value_print_options opts = *options;
+                 opts.deref_ref = 0;

                  val_print (TYPE_FIELD_TYPE (type, i),
                             valaddr + TYPE_FIELD_BITPOS (type, i) / 8, 0,
                             address + TYPE_FIELD_BITPOS (type, i) / 8,
                  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);
+                            stream, recurse + 1, &opts,
+                            current_language);

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

-      if (pretty)
+      if (options->pretty)

        {
          fprintf_filtered (stream, "\n");
          print_spaces_filtered (2 * recurse, stream);
        {
          fprintf_filtered (stream, "\n");
          print_spaces_filtered (2 * recurse, stream);


@@ -434,30 +453,19 @@ java_print_value_fields (type, valaddr, address, stream,
 
 /* Print data of type TYPE located at VALADDR (within GDB), which came from
    the inferior at address ADDRESS, onto stdio stream STREAM according to
 
 /* Print data of type TYPE located at VALADDR (within GDB), which came from
    the inferior at address ADDRESS, onto stdio stream STREAM according to

-   FORMAT (a letter or 0 for natural format).  The data at VALADDR is in
-   target byte order.
+   OPTIONS.  The data at VALADDR is in target byte order.

 
    If the data are a string pointer, returns the number of string characters
 
    If the data are a string pointer, returns the number of string characters

-   printed.
-
-   If DEREF_REF is nonzero, then dereference references, otherwise just print
-   them like pointers.
-
-   The PRETTY parameter controls prettyprinting.  */
+   printed.  */

 
 int
 
 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 gdb_byte *valaddr,
+               int embedded_offset, CORE_ADDR address,
+               struct ui_file *stream, int recurse,
+               const struct value_print_options *options)

 {
 {

-  register unsigned int i = 0; /* Number of characters printed */
+  struct gdbarch *gdbarch = get_type_arch (type);
+  unsigned int i = 0;  /* Number of characters printed */

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


@@ -465,18 +473,20 @@ java_val_print (type, valaddr, embedded_offset, address, stream, format,
   switch (TYPE_CODE (type))
     {
     case TYPE_CODE_PTR:
   switch (TYPE_CODE (type))
     {
     case TYPE_CODE_PTR:

-      if (format && format != 's')
+      if (options->format && options->format != 's')

        {
        {

-         print_scalar_formatted (valaddr, type, format, 0, stream);
+         print_scalar_formatted (valaddr, type, options, 0, stream);

          break;
        }
 #if 0
          break;
        }
 #if 0

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

        {
          /* 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 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_address_demangle (extract_address (valaddr, TYPE_LENGTH (type)),
+         /* Extract an address, assume that it is unsigned.  */
+         print_address_demangle (gdbarch,
+                                 extract_unsigned_integer (valaddr, TYPE_LENGTH (type)),

                                  stream, demangle);
          break;
        }
                                  stream, demangle);
          break;
        }


@@ -492,12 +502,12 @@ java_val_print (type, valaddr, embedded_offset, address, stream, format,
       if (TYPE_CODE (target_type) == TYPE_CODE_FUNC)
        {
          /* Try to print what function it points to.  */
       if (TYPE_CODE (target_type) == TYPE_CODE_FUNC)
        {
          /* Try to print what function it points to.  */

-         print_address_demangle (addr, stream, demangle);
+         print_address_demangle (gdbarch, addr, stream, demangle);

          /* Return value is irrelevant except for string pointers.  */
          return (0);
        }
 
          /* Return value is irrelevant except for string pointers.  */
          return (0);
        }
 

-      if (addressprint && format != 's')
+      if (options->addressprint && options->format != 's')

        {
          fputs_filtered ("@", stream);
          print_longest (stream, 'x', 0, (ULONGEST) addr);
        {
          fputs_filtered ("@", stream);
          print_longest (stream, 'x', 0, (ULONGEST) addr);


@@ -506,30 +516,33 @@ 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. */
-      format = format ? format : output_format;
-      if (format)
-       print_scalar_formatted (valaddr, type, format, 0, stream);
+      /* Can't just call c_val_print because that prints bytes as C
+        chars.  */
+      if (options->format || options->output_format)
+       {
+         struct value_print_options opts = *options;
+         opts.format = (options->format ? options->format
+                        : options->output_format);
+         print_scalar_formatted (valaddr, type, &opts, 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), type, stream);

       else
        val_print_type_code_int (type, valaddr, stream);
       break;
 
     case TYPE_CODE_STRUCT:
       else
        val_print_type_code_int (type, valaddr, stream);
       break;
 
     case TYPE_CODE_STRUCT:

-      java_print_value_fields (type, valaddr, address, stream, format,
-                              recurse, pretty);
+      java_print_value_fields (type, valaddr, address, stream, recurse,
+                              options);

       break;
 
     default:
       return c_val_print (type, valaddr, embedded_offset, address, stream,
       break;
 
     default:
       return c_val_print (type, valaddr, embedded_offset, address, stream,

-                         format, deref_ref, recurse, pretty);
+                         recurse, options);

     }
 
   return 0;
     }
 
   return 0;