projects
/
deliverable
/
binutils-gdb.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
import gdb-19990422 snapshot
[deliverable/binutils-gdb.git]
/
gdb
/
typeprint.c
diff --git
a/gdb/typeprint.c
b/gdb/typeprint.c
index 92e26140bb7799e4f7d22e5ae1c47019f2110626..3ace7beeef3a5c6d40ec98ceeafe115d03ae6235 100644
(file)
--- a/
gdb/typeprint.c
+++ b/
gdb/typeprint.c
@@
-1,5
+1,5
@@
/* Language independent support for printing types for GDB, the GNU debugger.
/* Language independent support for printing types for GDB, the GNU debugger.
- Copyright 1986,
1988, 1989, 1991, 1992, 1993
Free Software Foundation, Inc.
+ Copyright 1986,
88, 89, 91, 92, 93, 1998
Free Software Foundation, Inc.
This file is part of GDB.
This file is part of GDB.
@@
-15,7
+15,7
@@
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
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. */
+Foundation, Inc.,
59 Temple Place - Suite 330, Boston, MA 02111-1307
, USA. */
#include "defs.h"
#include "obstack.h"
#include "defs.h"
#include "obstack.h"
@@
-31,9
+31,13
@@
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
#include "language.h"
#include "demangle.h"
#include "language.h"
#include "demangle.h"
-#include
<string.h>
+#include
"gdb_string.h"
#include <errno.h>
#include <errno.h>
+/* For real-type printing in whatis_exp() */
+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));
static void
ptype_command PARAMS ((char *, int));
@@
-72,19
+76,33
@@
whatis_exp (exp, show)
int show;
{
struct expression *expr;
int show;
{
struct expression *expr;
- register value val;
+ register value
_ptr
val;
register struct cleanup *old_chain = NULL;
register struct cleanup *old_chain = NULL;
+ struct type * real_type = NULL;
+ int full = 0;
+ int top = -1;
+ int using_enc = 0;
if (exp)
{
expr = parse_expression (exp);
if (exp)
{
expr = parse_expression (exp);
- old_chain = make_cleanup (free_current_contents, &expr);
+ old_chain = make_cleanup ((make_cleanup_func) 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);
+
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); */
+
type_print (VALUE_TYPE (val), "", gdb_stdout, show);
printf_filtered ("\n");
type_print (VALUE_TYPE (val), "", gdb_stdout, show);
printf_filtered ("\n");
@@
-140,7
+158,8
@@
ptype_command (typename, from_tty)
else
{
expr = parse_expression (typename);
else
{
expr = parse_expression (typename);
- old_chain = make_cleanup (free_current_contents, &expr);
+ old_chain = make_cleanup ((make_cleanup_func) free_current_contents,
+ &expr);
type = ptype_eval (expr);
if (type != NULL)
{
type = ptype_eval (expr);
if (type != NULL)
{
@@
-180,6
+199,8
@@
print_type_scalar (type, val, stream)
unsigned int i;
unsigned len;
unsigned int i;
unsigned len;
+ CHECK_TYPEDEF (type);
+
switch (TYPE_CODE (type))
{
switch (TYPE_CODE (type))
{
@@
-214,6
+235,10
@@
print_type_scalar (type, val, stream)
fprintf_filtered (stream, val ? "TRUE" : "FALSE");
break;
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:
case TYPE_CODE_UNDEF:
case TYPE_CODE_PTR:
case TYPE_CODE_ARRAY:
@@
-223,7
+248,6
@@
print_type_scalar (type, val, stream)
case TYPE_CODE_FLT:
case TYPE_CODE_VOID:
case TYPE_CODE_SET:
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_STRING:
case TYPE_CODE_ERROR:
case TYPE_CODE_MEMBER:
@@
-238,8
+262,6
@@
print_type_scalar (type, val, stream)
gdb_flush (stream);
}
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(). */
/* Dump details of a type specified either directly or indirectly.
Uses the same sort of type lookup mechanism as ptype_command()
and whatis_command(). */
@@
-249,7
+271,7
@@
maintenance_print_type (typename, from_tty)
char *typename;
int from_tty;
{
char *typename;
int from_tty;
{
- register value val;
+ register value
_ptr
val;
register struct type *type;
register struct cleanup *old_chain;
struct expression *expr;
register struct type *type;
register struct cleanup *old_chain;
struct expression *expr;
@@
-257,7
+279,7
@@
maintenance_print_type (typename, from_tty)
if (typename != NULL)
{
expr = parse_expression (typename);
if (typename != NULL)
{
expr = parse_expression (typename);
- old_chain = make_cleanup (free_current_contents, &expr);
+ 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. */
if (expr -> elts[0].opcode == OP_TYPE)
{
/* The user expression names a type directly, just use that type. */
@@
-278,8
+300,6
@@
maintenance_print_type (typename, from_tty)
}
}
}
}
-#endif /* MAINTENANCE_CMDS */
-
\f
void
_initialize_typeprint ()
\f
void
_initialize_typeprint ()
This page took
0.028521 seconds
and
4
git commands to generate.