X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=gdb%2Ftypeprint.c;h=c25e705d1c7154bf5df410ec9eef948f6e885eed;hb=a493e3e2e429e4832b8620bd920ad07d0c2892d7;hp=37d6ebc39b2aad65e22ddff6f45b04668c9ab378;hpb=2b57629364528ef2fd913154e58f626123d51f1c;p=platform%2Fupstream%2Fbinutils.git
diff --git a/gdb/typeprint.c b/gdb/typeprint.c
index 37d6ebc..c25e705 100644
--- a/gdb/typeprint.c
+++ b/gdb/typeprint.c
@@ -1,24 +1,25 @@
/* Language independent support for printing types for GDB, the GNU debugger.
- Copyright 1986, 1988, 1989, 1991, 1992, 1993 Free Software Foundation, Inc.
-This file is part of GDB.
+ Copyright (C) 1986, 1988-1989, 1991-1995, 1998-2001, 2003, 2006-2012
+ 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., 675 Mass Ave, Cambridge, MA 02139, 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 . */
#include "defs.h"
-#include "obstack.h"
+#include "gdb_obstack.h"
#include "bfd.h" /* Binary File Description */
#include "symtab.h"
#include "gdbtypes.h"
@@ -29,22 +30,40 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
#include "gdbcmd.h"
#include "target.h"
#include "language.h"
-#include "demangle.h"
-
+#include "cp-abi.h"
+#include "typeprint.h"
#include "gdb_string.h"
+#include "exceptions.h"
+#include "valprint.h"
#include
-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.)
@@ -54,26 +73,54 @@ whatis_exp PARAMS ((char *, int));
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, const char *varstring, struct ui_file *stream,
+ int show)
{
LA_PRINT_TYPE (type, varstring, stream, show, 0);
}
+/* Print TYPE to a string, returning it. The caller is responsible for
+ freeing the string. */
+
+char *
+type_to_string (struct type *type)
+{
+ char *s = NULL;
+ struct ui_file *stb;
+ struct cleanup *old_chain;
+ volatile struct gdb_exception except;
+
+ stb = mem_fileopen ();
+ old_chain = make_cleanup_ui_file_delete (stb);
+
+ TRY_CATCH (except, RETURN_MASK_ALL)
+ {
+ type_print (type, "", stb, -1);
+ s = ui_file_xstrdup (stb, NULL);
+ }
+ if (except.reason < 0)
+ s = NULL;
+
+ do_cleanups (old_chain);
+
+ return s;
+}
+
/* Print type of EXP, or last thing in value history if EXP == NULL.
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;
- register value_ptr val;
- register struct cleanup *old_chain = 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;
+ struct value_print_options opts;
if (exp)
{
@@ -84,19 +131,39 @@ whatis_exp (exp, show)
else
val = access_value_history (0);
+ type = value_type (val);
+
+ get_user_print_options (&opts);
+ if (opts.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_indirect_type (val, &full, &top, &using_enc);
+ else if (TYPE_CODE (type) == TYPE_CODE_CLASS)
+ real_type = value_rtti_type (val, &full, &top, &using_enc);
+ }
+
printf_filtered ("type = ");
- type_print (VALUE_TYPE (val), "", gdb_stdout, show);
+
+ 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 (type, "", gdb_stdout, show);
printf_filtered ("\n");
if (exp)
do_cleanups (old_chain);
}
-/* ARGSUSED */
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.
@@ -104,59 +171,12 @@ whatis_command (exp, from_tty)
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. */
-/* ARGSUSED */
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 (free_current_contents, &expr);
- type = ptype_eval (expr);
- if (type != NULL)
- {
- /* User did "ptype " */
- printf_filtered ("type = ");
- type_print (type, "", gdb_stdout, 1);
- printf_filtered ("\n");
- do_cleanups (old_chain);
- }
- else
- {
- /* User did "ptype " */
- do_cleanups (old_chain);
- whatis_exp (typename, 1);
- }
- }
+ whatis_exp (typename, 1);
}
/* Print integral scalar data VAL, of type TYPE, onto stdio stream STREAM.
@@ -169,17 +189,16 @@ 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
- 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
-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;
+ CHECK_TYPEDEF (type);
+
switch (TYPE_CODE (type))
{
@@ -187,7 +206,7 @@ print_type_scalar (type, val, stream)
len = TYPE_NFIELDS (type);
for (i = 0; i < len; i++)
{
- if (TYPE_FIELD_BITPOS (type, i) == val)
+ if (TYPE_FIELD_ENUMVAL (type, i) == val)
{
break;
}
@@ -207,13 +226,17 @@ print_type_scalar (type, val, stream)
break;
case TYPE_CODE_CHAR:
- LA_PRINT_CHAR ((unsigned char) val, stream);
+ LA_PRINT_CHAR ((unsigned char) val, type, stream);
break;
case TYPE_CODE_BOOL:
fprintf_filtered (stream, val ? "TRUE" : "FALSE");
break;
+ case TYPE_CODE_RANGE:
+ print_type_scalar (TYPE_TARGET_TYPE (type), val, stream);
+ return;
+
case TYPE_CODE_UNDEF:
case TYPE_CODE_PTR:
case TYPE_CODE_ARRAY:
@@ -223,75 +246,70 @@ print_type_scalar (type, val, stream)
case TYPE_CODE_FLT:
case TYPE_CODE_VOID:
case TYPE_CODE_SET:
- case TYPE_CODE_RANGE:
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:
- error ("internal error: unhandled type in print_type_scalar");
+ case TYPE_CODE_NAMESPACE:
+ error (_("internal error: unhandled type in print_type_scalar"));
break;
default:
- error ("Invalid type code in symbol table.");
+ error (_("Invalid type code in symbol table."));
}
gdb_flush (stream);
}
-#if MAINTENANCE_CMDS
-
/* 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
-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)
- {
- 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);
- }
+ {
+ 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);
+ }
}
-
-#endif /* MAINTENANCE_CMDS */
-
+
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\
-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.\n\
+Contrary to \"whatis\", \"ptype\" always unrolls any typedefs."));
add_com ("whatis", class_vars, whatis_command,
- "Print data type of expression EXP.");
-
+ _("Print data type of expression EXP.\n\
+Only one level of typedefs is unrolled. See also \"ptype\"."));
}