* defs.h (extract_signed_integer, extract_unsigned_integer,

[thirdparty/binutils-gdb.git] / gdb / f-valprint.c

diff --git a/gdb/f-valprint.c b/gdb/f-valprint.c
index 3aaa2a7c7a33cbb2fbc83b5daf6cccef6d726cac..0a574042fcd63a0e440be62d0ff5bf8ad2337071 100644 (file)
--- a/gdb/f-valprint.c
+++ b/gdb/f-valprint.c
@@ -1,7 +1,7 @@
 /* Support for printing Fortran values for GDB, the GNU debugger.
 
 /* Support for printing Fortran values for GDB, the GNU debugger.
 

-   Copyright 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2003, 2005 Free
-   Software Foundation, Inc.
+   Copyright (C) 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2003, 2005, 2006,
+   2007, 2008, 2009 Free Software Foundation, Inc.

 
    Contributed by Motorola.  Adapted from the C definitions by Farooq Butt
    (fmbutt@engage.sps.mot.com), additionally worked over by Stan Shebs.
 
    Contributed by Motorola.  Adapted from the C definitions by Farooq Butt
    (fmbutt@engage.sps.mot.com), additionally worked over by Stan Shebs.


@@ -10,7 +10,7 @@
 
    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 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,


@@ -19,9 +19,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 "gdb_string.h"
 
 #include "defs.h"
 #include "gdb_string.h"


@@ -63,124 +61,28 @@ int f77_array_offset_tbl[MAX_FORTRAN_DIMS + 1][2];
 #define F77_DIM_OFFSET(n) (f77_array_offset_tbl[n][0])
 
 int
 #define F77_DIM_OFFSET(n) (f77_array_offset_tbl[n][0])
 
 int

-f77_get_dynamic_lowerbound (struct type *type, int *lower_bound)
+f77_get_lowerbound (struct type *type)

 {
 {

-  CORE_ADDR current_frame_addr;
-  CORE_ADDR ptr_to_lower_bound;
+  if (TYPE_ARRAY_LOWER_BOUND_IS_UNDEFINED (type))
+    error (_("Lower bound may not be '*' in F77"));

 
 

-  switch (TYPE_ARRAY_LOWER_BOUND_TYPE (type))
-    {
-    case BOUND_BY_VALUE_ON_STACK:
-      current_frame_addr = get_frame_base (deprecated_selected_frame);
-      if (current_frame_addr > 0)
-       {
-         *lower_bound =
-           read_memory_integer (current_frame_addr +
-                                TYPE_ARRAY_LOWER_BOUND_VALUE (type),
-                                4);
-       }
-      else
-       {
-         *lower_bound = DEFAULT_LOWER_BOUND;
-         return BOUND_FETCH_ERROR;
-       }
-      break;
-
-    case BOUND_SIMPLE:
-      *lower_bound = TYPE_ARRAY_LOWER_BOUND_VALUE (type);
-      break;
-
-    case BOUND_CANNOT_BE_DETERMINED:
-      error (_("Lower bound may not be '*' in F77"));
-      break;
-
-    case BOUND_BY_REF_ON_STACK:
-      current_frame_addr = get_frame_base (deprecated_selected_frame);
-      if (current_frame_addr > 0)
-       {
-         ptr_to_lower_bound =
-           read_memory_typed_address (current_frame_addr +
-                                      TYPE_ARRAY_LOWER_BOUND_VALUE (type),
-                                      builtin_type_void_data_ptr);
-         *lower_bound = read_memory_integer (ptr_to_lower_bound, 4);
-       }
-      else
-       {
-         *lower_bound = DEFAULT_LOWER_BOUND;
-         return BOUND_FETCH_ERROR;
-       }
-      break;
-
-    case BOUND_BY_REF_IN_REG:
-    case BOUND_BY_VALUE_IN_REG:
-    default:
-      error (_("??? unhandled dynamic array bound type ???"));
-      break;
-    }
-  return BOUND_FETCH_OK;
+  return TYPE_ARRAY_LOWER_BOUND_VALUE (type);

 }
 
 int
 }
 
 int

-f77_get_dynamic_upperbound (struct type *type, int *upper_bound)
+f77_get_upperbound (struct type *type)

 {
 {

-  CORE_ADDR current_frame_addr = 0;
-  CORE_ADDR ptr_to_upper_bound;
-
-  switch (TYPE_ARRAY_UPPER_BOUND_TYPE (type))
+  if (TYPE_ARRAY_UPPER_BOUND_IS_UNDEFINED (type))

     {
     {

-    case BOUND_BY_VALUE_ON_STACK:
-      current_frame_addr = get_frame_base (deprecated_selected_frame);
-      if (current_frame_addr > 0)
-       {
-         *upper_bound =
-           read_memory_integer (current_frame_addr +
-                                TYPE_ARRAY_UPPER_BOUND_VALUE (type),
-                                4);
-       }
-      else
-       {
-         *upper_bound = DEFAULT_UPPER_BOUND;
-         return BOUND_FETCH_ERROR;
-       }
-      break;
-
-    case BOUND_SIMPLE:
-      *upper_bound = TYPE_ARRAY_UPPER_BOUND_VALUE (type);
-      break;
-
-    case BOUND_CANNOT_BE_DETERMINED:
-      /* we have an assumed size array on our hands. Assume that 
-         upper_bound == lower_bound so that we show at least 
-         1 element.If the user wants to see more elements, let 
-         him manually ask for 'em and we'll subscript the 
-         array and show him */
-      f77_get_dynamic_lowerbound (type, upper_bound);
-      break;
-
-    case BOUND_BY_REF_ON_STACK:
-      current_frame_addr = get_frame_base (deprecated_selected_frame);
-      if (current_frame_addr > 0)
-       {
-         ptr_to_upper_bound =
-           read_memory_typed_address (current_frame_addr +
-                                      TYPE_ARRAY_UPPER_BOUND_VALUE (type),
-                                      builtin_type_void_data_ptr);
-         *upper_bound = read_memory_integer (ptr_to_upper_bound, 4);
-       }
-      else
-       {
-         *upper_bound = DEFAULT_UPPER_BOUND;
-         return BOUND_FETCH_ERROR;
-       }
-      break;
+      /* We have an assumed size array on our hands.  Assume that
+        upper_bound == lower_bound so that we show at least 1 element.
+        If the user wants to see more elements, let him manually ask for 'em
+        and we'll subscript the array and show him.  */

 
 

-    case BOUND_BY_REF_IN_REG:
-    case BOUND_BY_VALUE_IN_REG:
-    default:
-      error (_("??? unhandled dynamic array bound type ???"));
-      break;
+      return f77_get_lowerbound (type);

     }
     }

-  return BOUND_FETCH_OK;
+
+  return TYPE_ARRAY_UPPER_BOUND_VALUE (type);

 }
 
 /* Obtain F77 adjustable array dimensions */
 }
 
 /* Obtain F77 adjustable array dimensions */


@@ -206,13 +108,8 @@ f77_get_dynamic_length_of_aggregate (struct type *type)
     f77_get_dynamic_length_of_aggregate (TYPE_TARGET_TYPE (type));
 
   /* Recursion ends here, start setting up lengths.  */
     f77_get_dynamic_length_of_aggregate (TYPE_TARGET_TYPE (type));
 
   /* Recursion ends here, start setting up lengths.  */

-  retcode = f77_get_dynamic_lowerbound (type, &lower_bound);
-  if (retcode == BOUND_FETCH_ERROR)
-    error (_("Cannot obtain valid array lower bound"));
-
-  retcode = f77_get_dynamic_upperbound (type, &upper_bound);
-  if (retcode == BOUND_FETCH_ERROR)
-    error (_("Cannot obtain valid array upper bound"));
+  lower_bound = f77_get_lowerbound (type);
+  upper_bound = f77_get_upperbound (type);

 
   /* Patch in a valid length value. */
 
 
   /* Patch in a valid length value. */
 


@@ -235,16 +132,8 @@ f77_create_arrayprint_offset_tbl (struct type *type, struct ui_file *stream)
 
   while ((TYPE_CODE (tmp_type) == TYPE_CODE_ARRAY))
     {
 
   while ((TYPE_CODE (tmp_type) == TYPE_CODE_ARRAY))
     {

-      if (TYPE_ARRAY_UPPER_BOUND_TYPE (tmp_type) == BOUND_CANNOT_BE_DETERMINED)
-       fprintf_filtered (stream, "<assumed size array> ");
-
-      retcode = f77_get_dynamic_upperbound (tmp_type, &upper);
-      if (retcode == BOUND_FETCH_ERROR)
-       error (_("Cannot obtain dynamic upper bound"));
-
-      retcode = f77_get_dynamic_lowerbound (tmp_type, &lower);
-      if (retcode == BOUND_FETCH_ERROR)
-       error (_("Cannot obtain dynamic lower bound"));
+      upper = f77_get_upperbound (tmp_type);
+      lower = f77_get_lowerbound (tmp_type);

 
       F77_DIM_SIZE (ndimen) = upper - lower + 1;
 
 
       F77_DIM_SIZE (ndimen) = upper - lower + 1;
 


@@ -274,42 +163,43 @@ f77_create_arrayprint_offset_tbl (struct type *type, struct ui_file *stream)
 
 static void
 f77_print_array_1 (int nss, int ndimensions, struct type *type,
 
 static void
 f77_print_array_1 (int nss, int ndimensions, struct type *type,

-                  const bfd_byte *valaddr, CORE_ADDR address,
-                  struct ui_file *stream, int format,
-                  int deref_ref, int recurse, enum val_prettyprint pretty,
+                  const gdb_byte *valaddr, CORE_ADDR address,
+                  struct ui_file *stream, int recurse,
+                  const struct value_print_options *options,

                   int *elts)
 {
   int i;
 
   if (nss != ndimensions)
     {
                   int *elts)
 {
   int i;
 
   if (nss != ndimensions)
     {

-      for (i = 0; (i < F77_DIM_SIZE (nss) && (*elts) < print_max); i++)
+      for (i = 0; (i < F77_DIM_SIZE (nss) && (*elts) < options->print_max); i++)

        {
          fprintf_filtered (stream, "( ");
          f77_print_array_1 (nss + 1, ndimensions, TYPE_TARGET_TYPE (type),
                             valaddr + i * F77_DIM_OFFSET (nss),
                             address + i * F77_DIM_OFFSET (nss),
        {
          fprintf_filtered (stream, "( ");
          f77_print_array_1 (nss + 1, ndimensions, TYPE_TARGET_TYPE (type),
                             valaddr + i * F77_DIM_OFFSET (nss),
                             address + i * F77_DIM_OFFSET (nss),

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

          fprintf_filtered (stream, ") ");
        }
          fprintf_filtered (stream, ") ");
        }

-      if (*elts >= print_max && i < F77_DIM_SIZE (nss)) 
+      if (*elts >= options->print_max && i < F77_DIM_SIZE (nss)) 

        fprintf_filtered (stream, "...");
     }
   else
     {
        fprintf_filtered (stream, "...");
     }
   else
     {

-      for (i = 0; i < F77_DIM_SIZE (nss) && (*elts) < print_max; 
+      for (i = 0; i < F77_DIM_SIZE (nss) && (*elts) < options->print_max;

           i++, (*elts)++)
        {
          val_print (TYPE_TARGET_TYPE (type),
                     valaddr + i * F77_DIM_OFFSET (ndimensions),
                     0,
                     address + i * F77_DIM_OFFSET (ndimensions),
           i++, (*elts)++)
        {
          val_print (TYPE_TARGET_TYPE (type),
                     valaddr + i * F77_DIM_OFFSET (ndimensions),
                     0,
                     address + i * F77_DIM_OFFSET (ndimensions),

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

 
          if (i != (F77_DIM_SIZE (nss) - 1))
            fprintf_filtered (stream, ", ");
 
 
          if (i != (F77_DIM_SIZE (nss) - 1))
            fprintf_filtered (stream, ", ");
 

-         if ((*elts == print_max - 1) && (i != (F77_DIM_SIZE (nss) - 1)))
+         if ((*elts == options->print_max - 1)
+             && (i != (F77_DIM_SIZE (nss) - 1)))

            fprintf_filtered (stream, "...");
        }
     }
            fprintf_filtered (stream, "...");
        }
     }


@@ -319,10 +209,9 @@ f77_print_array_1 (int nss, int ndimensions, struct type *type,
    stuff and then immediately call f77_print_array_1() */
 
 static void
    stuff and then immediately call f77_print_array_1() */
 
 static void

-f77_print_array (struct type *type, const bfd_byte *valaddr,
+f77_print_array (struct type *type, const gdb_byte *valaddr,

                 CORE_ADDR address, struct ui_file *stream,
                 CORE_ADDR address, struct ui_file *stream,

-                int format, int deref_ref, int recurse,
-                enum val_prettyprint pretty)
+                int recurse, const struct value_print_options *options)

 {
   int ndimensions;
   int elts = 0;
 {
   int ndimensions;
   int elts = 0;


@@ -339,53 +228,50 @@ f77_print_array (struct type *type, const bfd_byte *valaddr,
 
   f77_create_arrayprint_offset_tbl (type, stream);
 
 
   f77_create_arrayprint_offset_tbl (type, stream);
 

-  f77_print_array_1 (1, ndimensions, type, valaddr, address, stream, format,
-                    deref_ref, recurse, pretty, &elts);
+  f77_print_array_1 (1, ndimensions, type, valaddr, address, stream,
+                    recurse, options, &elts);

 }
 \f
 
 /* Print data of type TYPE located at VALADDR (within GDB), which came from
    the inferior at address ADDRESS, onto stdio stream STREAM according to
 }
 \f
 
 /* 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

-f_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)
+f_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)

 {
 {

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

   unsigned int i = 0;  /* Number of characters printed */
   struct type *elttype;
   LONGEST val;
   CORE_ADDR addr;
   unsigned int i = 0;  /* Number of characters printed */
   struct type *elttype;
   LONGEST val;
   CORE_ADDR addr;

+  int index;

 
   CHECK_TYPEDEF (type);
   switch (TYPE_CODE (type))
     {
     case TYPE_CODE_STRING:
       f77_get_dynamic_length_of_aggregate (type);
 
   CHECK_TYPEDEF (type);
   switch (TYPE_CODE (type))
     {
     case TYPE_CODE_STRING:
       f77_get_dynamic_length_of_aggregate (type);

-      LA_PRINT_STRING (stream, valaddr, TYPE_LENGTH (type), 1, 0);
+      LA_PRINT_STRING (stream, builtin_type (gdbarch)->builtin_char,
+                      valaddr, TYPE_LENGTH (type), 0, options);

       break;
 
     case TYPE_CODE_ARRAY:
       fprintf_filtered (stream, "(");
       break;
 
     case TYPE_CODE_ARRAY:
       fprintf_filtered (stream, "(");

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

       fprintf_filtered (stream, ")");
       break;
 
     case TYPE_CODE_PTR:
       fprintf_filtered (stream, ")");
       break;
 
     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;
        }
       else
          break;
        }
       else


@@ -396,21 +282,22 @@ f_val_print (struct type *type, const bfd_byte *valaddr, int embedded_offset,
          if (TYPE_CODE (elttype) == TYPE_CODE_FUNC)
            {
              /* Try to print what function it points to.  */
          if (TYPE_CODE (elttype) == 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')
-           deprecated_print_address_numeric (addr, 1, stream);
+         if (options->addressprint && options->format != 's')
+           fputs_filtered (paddress (gdbarch, addr), stream);

 
          /* For a pointer to char or unsigned char, also print the string
             pointed to, unless pointer is null.  */
          if (TYPE_LENGTH (elttype) == 1
              && TYPE_CODE (elttype) == TYPE_CODE_INT
 
          /* For a pointer to char or unsigned char, also print the string
             pointed to, unless pointer is null.  */
          if (TYPE_LENGTH (elttype) == 1
              && TYPE_CODE (elttype) == TYPE_CODE_INT

-             && (format == 0 || format == 's')
+             && (options->format == 0 || options->format == 's')

              && addr != 0)
              && addr != 0)

-           i = val_print_string (addr, -1, TYPE_LENGTH (elttype), stream);
+           i = val_print_string (TYPE_TARGET_TYPE (type), addr, -1, stream,
+                                 options);

 
          /* Return number of characters printed, including the terminating
             '\0' if we reached the end.  val_print_string takes care including
 
          /* Return number of characters printed, including the terminating
             '\0' if we reached the end.  val_print_string takes care including


@@ -421,34 +308,26 @@ f_val_print (struct type *type, const bfd_byte *valaddr, int embedded_offset,
 
     case TYPE_CODE_REF:
       elttype = check_typedef (TYPE_TARGET_TYPE (type));
 
     case TYPE_CODE_REF:
       elttype = check_typedef (TYPE_TARGET_TYPE (type));

-      if (addressprint)
+      if (options->addressprint)

        {
          CORE_ADDR addr
            = extract_typed_address (valaddr + embedded_offset, type);
          fprintf_filtered (stream, "@");
        {
          CORE_ADDR addr
            = extract_typed_address (valaddr + embedded_offset, type);
          fprintf_filtered (stream, "@");

-         deprecated_print_address_numeric (addr, 1, stream);
-         if (deref_ref)
+         fputs_filtered (paddress (gdbarch, addr), stream);
+         if (options->deref_ref)

            fputs_filtered (": ", stream);
        }
       /* De-reference the reference.  */
            fputs_filtered (": ", stream);
        }
       /* De-reference the reference.  */

-      if (deref_ref)
+      if (options->deref_ref)

        {
          if (TYPE_CODE (elttype) != TYPE_CODE_UNDEF)
            {
              struct value *deref_val =
              value_at
              (TYPE_TARGET_TYPE (type),
        {
          if (TYPE_CODE (elttype) != TYPE_CODE_UNDEF)
            {
              struct value *deref_val =
              value_at
              (TYPE_TARGET_TYPE (type),

-              unpack_pointer (lookup_pointer_type (builtin_type_void),
-                              valaddr + embedded_offset));
-             val_print (value_type (deref_val),
-                        value_contents (deref_val),
-                        0,
-                        VALUE_ADDRESS (deref_val),
-                        stream,
-                        format,
-                        deref_ref,
-                        recurse,
-                        pretty);
+              unpack_pointer (type, valaddr + embedded_offset));
+             common_val_print (deref_val, stream, recurse,
+                               options, current_language);

            }
          else
            fputs_filtered ("???", stream);
            }
          else
            fputs_filtered ("???", stream);


@@ -456,9 +335,9 @@ f_val_print (struct type *type, const bfd_byte *valaddr, int embedded_offset,
       break;
 
     case TYPE_CODE_FUNC:
       break;
 
     case TYPE_CODE_FUNC:

-      if (format)
+      if (options->format)

        {
        {

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

          break;
        }
       /* FIXME, we should consider, at least for ANSI C language, eliminating
          break;
        }
       /* FIXME, we should consider, at least for ANSI C language, eliminating


@@ -467,13 +346,17 @@ f_val_print (struct type *type, const bfd_byte *valaddr, int embedded_offset,
       type_print (type, "", stream, -1);
       fprintf_filtered (stream, "} ");
       /* Try to print what function it points to, and its address.  */
       type_print (type, "", stream, -1);
       fprintf_filtered (stream, "} ");
       /* Try to print what function it points to, and its address.  */

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

       break;
 
     case TYPE_CODE_INT:
       break;
 
     case TYPE_CODE_INT:

-      format = format ? format : output_format;
-      if (format)
-       print_scalar_formatted (valaddr, type, format, 0, stream);
+      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
        {
          val_print_type_code_int (type, valaddr, stream);
       else
        {
          val_print_type_code_int (type, valaddr, stream);


@@ -485,14 +368,21 @@ f_val_print (struct type *type, const bfd_byte *valaddr, int embedded_offset,
            {
              fputs_filtered (" ", stream);
              LA_PRINT_CHAR ((unsigned char) unpack_long (type, valaddr),
            {
              fputs_filtered (" ", stream);
              LA_PRINT_CHAR ((unsigned char) unpack_long (type, valaddr),

-                            stream);
+                            type, stream);

            }
        }
       break;
 
            }
        }
       break;
 

+    case TYPE_CODE_FLAGS:
+      if (options->format)
+         print_scalar_formatted (valaddr, type, options, 0, stream);
+      else
+       val_print_type_code_flags (type, valaddr, stream);
+      break;
+

     case TYPE_CODE_FLT:
     case TYPE_CODE_FLT:

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

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


@@ -511,32 +401,17 @@ f_val_print (struct type *type, const bfd_byte *valaddr, int embedded_offset,
       break;
 
     case TYPE_CODE_BOOL:
       break;
 
     case TYPE_CODE_BOOL:

-      format = format ? format : output_format;
-      if (format)
-       print_scalar_formatted (valaddr, type, format, 0, stream);
+      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
        {
       else
        {

-         val = 0;
-         switch (TYPE_LENGTH (type))
-           {
-           case 1:
-             val = unpack_long (builtin_type_f_logical_s1, valaddr);
-             break;
-
-           case 2:
-             val = unpack_long (builtin_type_f_logical_s2, valaddr);
-             break;
-
-           case 4:
-             val = unpack_long (builtin_type_f_logical, valaddr);
-             break;
-
-           default:
-             error (_("Logicals of length %d bytes not supported"),
-                    TYPE_LENGTH (type));
-
-           }
-
+         val = extract_unsigned_integer (valaddr,
+                                         TYPE_LENGTH (type), byte_order);

          if (val == 0)
            fprintf_filtered (stream, ".FALSE.");
          else if (val == 1)
          if (val == 0)
            fprintf_filtered (stream, ".FALSE.");
          else if (val == 1)


@@ -546,8 +421,7 @@ f_val_print (struct type *type, const bfd_byte *valaddr, int embedded_offset,
            {
              /* Bash the type code temporarily.  */
              TYPE_CODE (type) = TYPE_CODE_INT;
            {
              /* Bash the type code temporarily.  */
              TYPE_CODE (type) = TYPE_CODE_INT;

-             f_val_print (type, valaddr, 0, address, stream, format,
-                          deref_ref, recurse, pretty);
+             f_val_print (type, valaddr, 0, address, stream, recurse, options);

              /* Restore the type code so later uses work as intended. */
              TYPE_CODE (type) = TYPE_CODE_BOOL;
            }
              /* Restore the type code so later uses work as intended. */
              TYPE_CODE (type) = TYPE_CODE_BOOL;
            }


@@ -555,20 +429,7 @@ f_val_print (struct type *type, const bfd_byte *valaddr, int embedded_offset,
       break;
 
     case TYPE_CODE_COMPLEX:
       break;
 
     case TYPE_CODE_COMPLEX:

-      switch (TYPE_LENGTH (type))
-       {
-       case 8:
-         type = builtin_type_f_real;
-         break;
-       case 16:
-         type = builtin_type_f_real_s8;
-         break;
-       case 32:
-         type = builtin_type_f_real_s16;
-         break;
-       default:
-         error (_("Cannot print out complex*%d variables"), TYPE_LENGTH (type));
-       }
+      type = TYPE_TARGET_TYPE (type);

       fputs_filtered ("(", stream);
       print_floating (valaddr, type, stream);
       fputs_filtered (",", stream);
       fputs_filtered ("(", stream);
       print_floating (valaddr, type, stream);
       fputs_filtered (",", stream);


@@ -583,6 +444,22 @@ f_val_print (struct type *type, const bfd_byte *valaddr, int embedded_offset,
       fprintf_filtered (stream, "<incomplete type>");
       break;
 
       fprintf_filtered (stream, "<incomplete type>");
       break;
 

+    case TYPE_CODE_STRUCT:
+    case TYPE_CODE_UNION:
+      /* Starting from the Fortran 90 standard, Fortran supports derived
+         types.  */
+      fprintf_filtered (stream, "( ");
+      for (index = 0; index < TYPE_NFIELDS (type); index++)
+        {
+          int offset = TYPE_FIELD_BITPOS (type, index) / 8;
+          f_val_print (TYPE_FIELD_TYPE (type, index), valaddr + offset,
+                       embedded_offset, address, stream, recurse, options);
+          if (index != TYPE_NFIELDS (type) - 1)
+            fputs_filtered (", ", stream);
+        }
+      fprintf_filtered (stream, " )");
+      break;     
+

     default:
       error (_("Invalid F77 type code %d in symbol table."), TYPE_CODE (type));
     }
     default:
       error (_("Invalid F77 type code %d in symbol table."), TYPE_CODE (type));
     }


@@ -626,10 +503,7 @@ info_common_command (char *comname, int from_tty)
      first make sure that it is visible and if so, let 
      us display its contents */
 
      first make sure that it is visible and if so, let 
      us display its contents */
 

-  fi = deprecated_selected_frame;
-
-  if (fi == NULL)
-    error (_("No frame selected"));
+  fi = get_selected_frame (_("No frame selected"));

 
   /* The following is generally ripped off from stack.c's routine 
      print_frame_info() */
 
   /* The following is generally ripped off from stack.c's routine 
      print_frame_info() */


@@ -651,14 +525,15 @@ info_common_command (char *comname, int from_tty)
          be any minimal symbols in the middle of a function.
          FIXME:  (Not necessarily true.  What about text labels) */
 
          be any minimal symbols in the middle of a function.
          FIXME:  (Not necessarily true.  What about text labels) */
 

-      struct minimal_symbol *msymbol = lookup_minimal_symbol_by_pc (get_frame_pc (fi));
+      struct minimal_symbol *msymbol = 
+       lookup_minimal_symbol_by_pc (get_frame_pc (fi));

 
       if (msymbol != NULL
          && (SYMBOL_VALUE_ADDRESS (msymbol)
              > BLOCK_START (SYMBOL_BLOCK_VALUE (func))))
 
       if (msymbol != NULL
          && (SYMBOL_VALUE_ADDRESS (msymbol)
              > BLOCK_START (SYMBOL_BLOCK_VALUE (func))))

-       funname = DEPRECATED_SYMBOL_NAME (msymbol);
+       funname = SYMBOL_LINKAGE_NAME (msymbol);

       else
       else

-       funname = DEPRECATED_SYMBOL_NAME (func);
+       funname = SYMBOL_LINKAGE_NAME (func);

     }
   else
     {
     }
   else
     {


@@ -666,7 +541,9 @@ info_common_command (char *comname, int from_tty)
       lookup_minimal_symbol_by_pc (get_frame_pc (fi));
 
       if (msymbol != NULL)
       lookup_minimal_symbol_by_pc (get_frame_pc (fi));
 
       if (msymbol != NULL)

-       funname = DEPRECATED_SYMBOL_NAME (msymbol);
+       funname = SYMBOL_LINKAGE_NAME (msymbol);
+      else /* Got no 'funname', code below will fail.  */
+       error (_("No function found for frame."));

     }
 
   /* If comname is NULL, we assume the user wishes to see the 
     }
 
   /* If comname is NULL, we assume the user wishes to see the 


@@ -692,9 +569,7 @@ info_common_command (char *comname, int from_tty)
 
       while (entry != NULL)
        {
 
       while (entry != NULL)
        {

-         printf_filtered ("%s = ", DEPRECATED_SYMBOL_NAME (entry->symbol));
-         print_variable_value (entry->symbol, fi, gdb_stdout);
-         printf_filtered ("\n");
+         print_variable_and_value (NULL, entry->symbol, fi, gdb_stdout, 0);

          entry = entry->next;
        }
     }
          entry = entry->next;
        }
     }


@@ -718,10 +593,7 @@ there_is_a_visible_common_named (char *comname)
   if (comname == NULL)
     error (_("Cannot deal with NULL common name!"));
 
   if (comname == NULL)
     error (_("Cannot deal with NULL common name!"));
 

-  fi = deprecated_selected_frame;
-
-  if (fi == NULL)
-    error (_("No frame selected"));
+  fi = get_selected_frame (_("No frame selected"));

 
   /* The following is generally ripped off from stack.c's routine 
      print_frame_info() */
 
   /* The following is generally ripped off from stack.c's routine 
      print_frame_info() */


@@ -748,9 +620,9 @@ there_is_a_visible_common_named (char *comname)
       if (msymbol != NULL
          && (SYMBOL_VALUE_ADDRESS (msymbol)
              > BLOCK_START (SYMBOL_BLOCK_VALUE (func))))
       if (msymbol != NULL
          && (SYMBOL_VALUE_ADDRESS (msymbol)
              > BLOCK_START (SYMBOL_BLOCK_VALUE (func))))

-       funname = DEPRECATED_SYMBOL_NAME (msymbol);
+       funname = SYMBOL_LINKAGE_NAME (msymbol);

       else
       else

-       funname = DEPRECATED_SYMBOL_NAME (func);
+       funname = SYMBOL_LINKAGE_NAME (func);

     }
   else
     {
     }
   else
     {


@@ -758,7 +630,7 @@ there_is_a_visible_common_named (char *comname)
       lookup_minimal_symbol_by_pc (fi->pc);
 
       if (msymbol != NULL)
       lookup_minimal_symbol_by_pc (fi->pc);
 
       if (msymbol != NULL)

-       funname = DEPRECATED_SYMBOL_NAME (msymbol);
+       funname = SYMBOL_LINKAGE_NAME (msymbol);

     }
 
   the_common = find_common_for_function (comname, funname);
     }
 
   the_common = find_common_for_function (comname, funname);


@@ -771,8 +643,8 @@ void
 _initialize_f_valprint (void)
 {
   add_info ("common", info_common_command,
 _initialize_f_valprint (void)
 {
   add_info ("common", info_common_command,

-           "Print out the values contained in a Fortran COMMON block.");
+           _("Print out the values contained in a Fortran COMMON block."));

   if (xdb_commands)
     add_com ("lc", class_info, info_common_command,
   if (xdb_commands)
     add_com ("lc", class_info, info_common_command,

-            "Print out the values contained in a Fortran COMMON block.");
+            _("Print out the values contained in a Fortran COMMON block."));

 }
 }