Remote non-stop mode support.

[deliverable/binutils-gdb.git] / gdb / typeprint.c

diff --git a/gdb/typeprint.c b/gdb/typeprint.c
index 3ace7beeef3a5c6d40ec98ceeafe115d03ae6235..44f1a77e12b982193a873ea3e08baa6ed49a0972 100644 (file)
--- a/gdb/typeprint.c
+++ b/gdb/typeprint.c
@@ -1,24 +1,25 @@
 /* Language independent support for printing types for GDB, the GNU debugger.
 /* Language independent support for printing types for GDB, the GNU debugger.

-   Copyright 1986, 88, 89, 91, 92, 93, 1998 Free Software Foundation, Inc.

 
 

-This file is part of GDB.
+   Copyright (C) 1986, 1988, 1989, 1991, 1992, 1993, 1994, 1995, 1998, 1999,
+   2000, 2001, 2003, 2006, 2007, 2008 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 3 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, see <http://www.gnu.org/licenses/>.  */

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

-#include "obstack.h"
+#include "gdb_obstack.h"

 #include "bfd.h"               /* Binary File Description */
 #include "symtab.h"
 #include "gdbtypes.h"
 #include "bfd.h"               /* Binary File Description */
 #include "symtab.h"
 #include "gdbtypes.h"


@@ -29,8 +30,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 #include "gdbcmd.h"
 #include "target.h"
 #include "language.h"
 #include "gdbcmd.h"
 #include "target.h"
 #include "language.h"

-#include "demangle.h"
-
+#include "cp-abi.h"
+#include "typeprint.h"

 #include "gdb_string.h"
 #include <errno.h>
 
 #include "gdb_string.h"
 #include <errno.h>
 


@@ -38,17 +39,33 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 extern int objectprint;                /* Controls looking up an object's derived type
                                   using what we find in its vtables.  */
 
 extern int objectprint;                /* Controls looking up an object's derived type
                                   using what we find in its vtables.  */
 

-static void
-ptype_command PARAMS ((char *, int));
+extern void _initialize_typeprint (void);

 
 

-static struct type *
-ptype_eval PARAMS ((struct expression *));
+static void ptype_command (char *, int);

 
 

-static void
-whatis_command PARAMS ((char *, int));
+static void whatis_command (char *, int);

 
 

-static void
-whatis_exp PARAMS ((char *, int));
+static void whatis_exp (char *, int);
+
+
+/* Print a description of a type in the format of a 
+   typedef for the current language.
+   NEW is the new name for a type TYPE. */
+
+void
+typedef_print (struct type *type, struct symbol *new, struct ui_file *stream)
+{
+  LA_PRINT_TYPEDEF (type, new, stream);
+}
+
+/* The default way to print a typedef.  */
+
+void
+default_print_typedef (struct type *type, struct symbol *new_symbol,
+                      struct ui_file *stream)
+{
+  error (_("Language not supported."));
+}

 
 /* Print a description of a type TYPE in the form of a declaration of a
    variable named VARSTRING.  (VARSTRING is demangled if necessary.)
 
 /* Print a description of a type TYPE in the form of a declaration of a
    variable named VARSTRING.  (VARSTRING is demangled if necessary.)


@@ -58,11 +75,8 @@ whatis_exp PARAMS ((char *, int));
    If SHOW is negative, we never show the details of elements' types.  */
 
 void
    If SHOW is negative, we never show the details of elements' types.  */
 
 void

-type_print (type, varstring, stream, show)
-     struct type *type;
-     char *varstring;
-     GDB_FILE *stream;
-     int show;
+type_print (struct type *type, char *varstring, struct ui_file *stream,
+           int show)

 {
   LA_PRINT_TYPE (type, varstring, stream, show, 0);
 }
 {
   LA_PRINT_TYPE (type, varstring, stream, show, 0);
 }


@@ -71,14 +85,13 @@ type_print (type, varstring, stream, show)
    show is passed to type_print.  */
 
 static void
    show is passed to type_print.  */
 
 static void

-whatis_exp (exp, show)
-     char *exp;
-     int show;
+whatis_exp (char *exp, int show)

 {
   struct expression *expr;
 {
   struct expression *expr;

-  register value_ptr val;
-  register struct cleanup *old_chain = NULL;
-  struct type * real_type = NULL;
+  struct value *val;
+  struct cleanup *old_chain = NULL;
+  struct type *real_type = NULL;
+  struct type *type;

   int full = 0;
   int top = -1;
   int using_enc = 0;
   int full = 0;
   int top = -1;
   int using_enc = 0;


@@ -86,35 +99,53 @@ whatis_exp (exp, show)
   if (exp)
     {
       expr = parse_expression (exp);
   if (exp)
     {
       expr = parse_expression (exp);

-      old_chain = make_cleanup ((make_cleanup_func) free_current_contents, 
-                                &expr);
+      old_chain = make_cleanup (free_current_contents, &expr);

       val = evaluate_type (expr);
     }
   else
     val = access_value_history (0);
 
       val = evaluate_type (expr);
     }
   else
     val = access_value_history (0);
 

-  real_type = value_rtti_type (val, &full, &top, &using_enc);
+  type = value_type (val);
+
+  if (objectprint)
+    {
+      if (((TYPE_CODE (type) == TYPE_CODE_PTR)
+          || (TYPE_CODE (type) == TYPE_CODE_REF))
+         && (TYPE_CODE (TYPE_TARGET_TYPE (type)) == TYPE_CODE_CLASS))
+        {
+          real_type = value_rtti_target_type (val, &full, &top, &using_enc);
+          if (real_type)
+            {
+              if (TYPE_CODE (type) == TYPE_CODE_PTR)
+                real_type = lookup_pointer_type (real_type);
+              else
+                real_type = lookup_reference_type (real_type);
+            }
+        }
+      else if (TYPE_CODE (type) == TYPE_CODE_CLASS)
+       real_type = value_rtti_type (val, &full, &top, &using_enc);
+    }

 
   printf_filtered ("type = ");
 
 
   printf_filtered ("type = ");
 

-  if (real_type && objectprint)
-    printf_filtered ("/* real type = %s%s */\n",
-                     TYPE_NAME (real_type),
-                     full ? "" : " (incomplete object)");
-  /* FIXME: maybe better to use type_print (real_type, "", gdb_stdout, -1); */
+  if (real_type)
+    {
+      printf_filtered ("/* real type = ");
+      type_print (real_type, "", gdb_stdout, -1);
+      if (! full)
+        printf_filtered (" (incomplete object)");
+      printf_filtered (" */\n");    
+    }

 
 

-  type_print (VALUE_TYPE (val), "", gdb_stdout, show);
+  type_print (type, "", gdb_stdout, show);

   printf_filtered ("\n");
 
   if (exp)
     do_cleanups (old_chain);
 }
 
   printf_filtered ("\n");
 
   if (exp)
     do_cleanups (old_chain);
 }
 

-/* ARGSUSED */

 static void
 static void

-whatis_command (exp, from_tty)
-     char *exp;
-     int from_tty;
+whatis_command (char *exp, int from_tty)

 {
   /* Most of the time users do not want to see all the fields
      in a structure.  If they do they can use the "ptype" command.
 {
   /* Most of the time users do not want to see all the fields
      in a structure.  If they do they can use the "ptype" command.


@@ -122,60 +153,12 @@ whatis_command (exp, from_tty)
   whatis_exp (exp, -1);
 }
 
   whatis_exp (exp, -1);
 }
 

-/* Simple subroutine for ptype_command.  */
-
-static struct type *
-ptype_eval (exp)
-     struct expression *exp;
-{
-  if (exp->elts[0].opcode == OP_TYPE)
-    {
-      return (exp->elts[1].type);
-    }
-  else
-    {
-      return (NULL);
-    }
-}
-

 /* TYPENAME is either the name of a type, or an expression.  */
 
 /* TYPENAME is either the name of a type, or an expression.  */
 

-/* ARGSUSED */

 static void
 static void

-ptype_command (typename, from_tty)
-     char *typename;
-     int from_tty;
+ptype_command (char *typename, int from_tty)

 {
 {

-  register struct type *type;
-  struct expression *expr;
-  register struct cleanup *old_chain;
-
-  if (typename == NULL)
-    {
-      /* Print type of last thing in value history. */
-      whatis_exp (typename, 1);
-    }
-  else
-    {
-      expr = parse_expression (typename);
-      old_chain = make_cleanup ((make_cleanup_func) free_current_contents, 
-                                &expr);
-      type = ptype_eval (expr);
-      if (type != NULL)
-       {
-         /* User did "ptype <typename>" */
-         printf_filtered ("type = ");
-         type_print (type, "", gdb_stdout, 1);
-         printf_filtered ("\n");
-         do_cleanups (old_chain);
-       }
-      else
-       {
-         /* User did "ptype <symbolname>" */
-         do_cleanups (old_chain);
-         whatis_exp (typename, 1);
-       }
-    }
+  whatis_exp (typename, 1);

 }
 
 /* Print integral scalar data VAL, of type TYPE, onto stdio stream STREAM.
 }
 
 /* Print integral scalar data VAL, of type TYPE, onto stdio stream STREAM.


@@ -188,13 +171,10 @@ ptype_command (typename, from_tty)
    currently use it, and it wasn't clear if it really belonged somewhere
    else (like printcmd.c).  There are a lot of other gdb routines that do
    something similar, but they are generally concerned with printing values
    currently use it, and it wasn't clear if it really belonged somewhere
    else (like printcmd.c).  There are a lot of other gdb routines that do
    something similar, but they are generally concerned with printing values

-   that come from the inferior in target byte order and target size. */
+   that come from the inferior in target byte order and target size.  */

 
 void
 
 void

-print_type_scalar (type, val, stream)
-     struct type *type;
-     LONGEST val;
-     GDB_FILE *stream;
+print_type_scalar (struct type *type, LONGEST val, struct ui_file *stream)

 {
   unsigned int i;
   unsigned len;
 {
   unsigned int i;
   unsigned len;


@@ -250,68 +230,66 @@ print_type_scalar (type, val, stream)
     case TYPE_CODE_SET:
     case TYPE_CODE_STRING:
     case TYPE_CODE_ERROR:
     case TYPE_CODE_SET:
     case TYPE_CODE_STRING:
     case TYPE_CODE_ERROR:

-    case TYPE_CODE_MEMBER:
+    case TYPE_CODE_MEMBERPTR:
+    case TYPE_CODE_METHODPTR:

     case TYPE_CODE_METHOD:
     case TYPE_CODE_REF:
     case TYPE_CODE_METHOD:
     case TYPE_CODE_REF:

-      error ("internal error: unhandled type in print_type_scalar");
+    case TYPE_CODE_NAMESPACE:
+      error (_("internal error: unhandled type in print_type_scalar"));

       break;
 
     default:
       break;
 
     default:

-      error ("Invalid type code in symbol table.");
+      error (_("Invalid type code in symbol table."));

     }
   gdb_flush (stream);
 }
 
 /* Dump details of a type specified either directly or indirectly.
    Uses the same sort of type lookup mechanism as ptype_command()
     }
   gdb_flush (stream);
 }
 
 /* Dump details of a type specified either directly or indirectly.
    Uses the same sort of type lookup mechanism as ptype_command()

-   and whatis_command(). */
+   and whatis_command().  */

 
 void
 
 void

-maintenance_print_type (typename, from_tty)
-     char *typename;
-     int from_tty;
+maintenance_print_type (char *typename, int from_tty)

 {
 {

-  register value_ptr val;
-  register struct type *type;
-  register struct cleanup *old_chain;
+  struct value *val;
+  struct type *type;
+  struct cleanup *old_chain;

   struct expression *expr;
 
   if (typename != NULL)
   struct expression *expr;
 
   if (typename != NULL)

-  {
-    expr = parse_expression (typename);
-    old_chain = make_cleanup ((make_cleanup_func) free_current_contents, &expr);
-    if (expr -> elts[0].opcode == OP_TYPE)
-      {
-       /* The user expression names a type directly, just use that type. */
-       type = expr -> elts[1].type;
-      }
-    else
-      {
-       /* The user expression may name a type indirectly by naming an
-          object of that type.  Find that indirectly named type. */
-       val = evaluate_type (expr);
-       type = VALUE_TYPE (val);
-      }
-    if (type != NULL)
-      {
-       recursive_dump_type (type, 0);
-      }
-    do_cleanups (old_chain);
-  }
+    {
+      expr = parse_expression (typename);
+      old_chain = make_cleanup (free_current_contents, &expr);
+      if (expr->elts[0].opcode == OP_TYPE)
+       {
+         /* The user expression names a type directly, just use that type. */
+         type = expr->elts[1].type;
+       }
+      else
+       {
+         /* The user expression may name a type indirectly by naming an
+            object of that type.  Find that indirectly named type. */
+         val = evaluate_type (expr);
+         type = value_type (val);
+       }
+      if (type != NULL)
+       {
+         recursive_dump_type (type, 0);
+       }
+      do_cleanups (old_chain);
+    }

 }
 }

-

 \f
 \f

+

 void
 void

-_initialize_typeprint ()
+_initialize_typeprint (void)

 {
 {

-
-  add_com ("ptype", class_vars, ptype_command,
-          "Print definition of type TYPE.\n\
+  add_com ("ptype", class_vars, ptype_command, _("\
+Print definition of type TYPE.\n\

 Argument may be a type name defined by typedef, or \"struct STRUCT-TAG\"\n\
 or \"class CLASS-NAME\" or \"union UNION-TAG\" or \"enum ENUM-TAG\".\n\
 Argument may be a type name defined by typedef, or \"struct STRUCT-TAG\"\n\
 or \"class CLASS-NAME\" or \"union UNION-TAG\" or \"enum ENUM-TAG\".\n\

-The selected stack frame's lexical context is used to look up the name.");
+The selected stack frame's lexical context is used to look up the name."));

 
   add_com ("whatis", class_vars, whatis_command,
 
   add_com ("whatis", class_vars, whatis_command,

-          "Print data type of expression EXP.");
-
+          _("Print data type of expression EXP."));

 }
 }