From 600ea1bed94c3136a765ee8b9694c86e0b90de57 Mon Sep 17 00:00:00 2001 From: Jan Kratochvil Date: Tue, 1 Feb 2011 18:56:34 +0000 Subject: [PATCH] gdb/ Fix debug printing of TYPE_INSTANCE. * expprint.c (print_subexp_standard) : New. (dump_subexp_body_standard) : New. --- gdb/ChangeLog | 6 ++++++ gdb/expprint.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 50 insertions(+) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index f68051c81b..84013cba04 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,9 @@ +2011-02-01 Jan Kratochvil + + Fix debug printing of TYPE_INSTANCE. + * expprint.c (print_subexp_standard) : New. + (dump_subexp_body_standard) : New. + 2011-02-01 Jan Kratochvil Fix debug printing of BINOP_IN, OP_OBJC_MSGCALL, diff --git a/gdb/expprint.c b/gdb/expprint.c index 1d2ce8534e..a6c13f9e61 100644 --- a/gdb/expprint.c +++ b/gdb/expprint.c @@ -534,6 +534,27 @@ print_subexp_standard (struct expression *exp, int *pos, fprintf_unfiltered (stream, ")"); return; + case TYPE_INSTANCE: + { + LONGEST count = exp->elts[pc + 1].longconst; + + /* The COUNT. */ + (*pos)++; + fputs_unfiltered ("TypesInstance(", stream); + while (count-- > 0) + { + type_print (exp->elts[(*pos)++].type, "", stream, 0); + if (count > 0) + fputs_unfiltered (",", stream); + } + fputs_unfiltered (",", stream); + /* Ending COUNT and ending TYPE_INSTANCE. */ + (*pos) += 2; + print_subexp (exp, pos, stream, PREC_PREFIX); + fputs_unfiltered (")", stream); + return; + } + /* Default ops */ default: @@ -937,6 +958,29 @@ dump_subexp_body_standard (struct expression *exp, elt += 4 + BYTES_TO_EXP_ELEM (len + 1); } break; + case TYPE_INSTANCE: + { + char *elem_name; + LONGEST len; + + len = exp->elts[elt++].longconst; + fprintf_filtered (stream, "%s TypeInstance: ", plongest (len)); + while (len-- > 0) + { + fprintf_filtered (stream, "Type @"); + gdb_print_host_address (exp->elts[elt].type, stream); + fprintf_filtered (stream, " ("); + type_print (exp->elts[elt].type, NULL, stream, 0); + fprintf_filtered (stream, ")"); + elt++; + if (len > 0) + fputs_filtered (", ", stream); + } + /* Ending LEN and ending TYPE_INSTANCE. */ + elt += 2; + elt = dump_subexp (exp, stream, elt); + } + break; default: case OP_NULL: case MULTI_SUBSCRIPT: -- 2.34.1