From patchwork Fri Jul 12 11:37:05 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Burgess X-Patchwork-Id: 33684 Received: (qmail 123938 invoked by alias); 12 Jul 2019 11:37:26 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Delivered-To: mailing list gdb-patches@sourceware.org Received: (qmail 123841 invoked by uid 89); 12 Jul 2019 11:37:26 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-23.2 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, KAM_SHORT, KAM_STOCKGEN, RCVD_IN_DNSWL_NONE, SPF_PASS autolearn=ham version=3.3.1 spammy=sk:print_s X-HELO: mail-wr1-f67.google.com Received: from mail-wr1-f67.google.com (HELO mail-wr1-f67.google.com) (209.85.221.67) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Fri, 12 Jul 2019 11:37:15 +0000 Received: by mail-wr1-f67.google.com with SMTP id 31so9664191wrm.1 for ; Fri, 12 Jul 2019 04:37:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=embecosm.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :in-reply-to:references; bh=KRmj1w7v3hFrs1VyVXAofnDKCFC9pokAFNJ+EwBN94c=; b=XRg0xaNAnLa57uV09VkZZqjNZl5RrNY0D2roRt1iMTWoRs3FEBEEv8xyPUlg1yCypD JoTGi6NYVrog4sSaKDr3XzoFCpU+exyrVAciWrPvwI0rbDgFh+WPYOP3QVfXE8+1GEUh KCFxeIEOB0tY7RhEKwsCiVAnis04U/RRttyzNaHTxqKWqnn4HrU7UHNKKxhjknFHuTwi OtSpUz/zjqzQSjiyQEdrdC78M861gbbhtTF+NLsqEbFdiaJaI1kr+pFGqnlt+z/qwR6Y apvzRz2g2MBsXdPTKnPs3V2r/Y3+YZdBwPYXrrbqic9yu1ZD44u6N2VvGrLGwY6Cwgvt F7+A== Return-Path: Received: from localhost (host86-128-12-99.range86-128.btcentralplus.com. [86.128.12.99]) by smtp.gmail.com with ESMTPSA id b15sm11929784wrt.77.2019.07.12.04.37.12 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 12 Jul 2019 04:37:12 -0700 (PDT) From: Andrew Burgess To: gdb-patches@sourceware.org Cc: Andrew Burgess Subject: [PATCH 2/3] gdb: Improve output from "info types" commad Date: Fri, 12 Jul 2019 12:37:05 +0100 Message-Id: In-Reply-To: References: In-Reply-To: References: X-IsSubscribed: yes This commit makes two changes to the "info types" command: First, only use typedef_print for printing typedefs, and use type_print for printing non-typedef scalar (non-struct) types. The result of this is the output for builtin types goes from this: typedef double; typedef float; typedef int; to this: double; float; int; which seems to make more sense. Next GDB no longer matches msymbols as possible type names. When looking for function symbols it makes sense to report matching msymbols from the text sections, and for variables msymbols from the data/bss sections, but when reporting types GDB would match msymbols of type absolute. But I don't see why these are likely to indicate type names. As such I've updated the msymbol matching lists in symtab.c:search_symbols so that when searching in the TYPES_DOMAIN, we never match any msymbols. gdb/ChangeLog: * symtab.c (search_symbols): Adjust msymbol matching type arrays so that GDB doesn't match any msymbols when searching in the TYPES_DOMAIN. (print_symbol_info): Print using typedef_print or type_print based on the type of the symbol. Add updated FIXME comment mobed from... (_initialize_symtab): ... move and update FIXME comment to above. gdb/testsuite/ChangeLog: * gdb.base/info-types.c: New file. * gdb.base/info-types.exp: New file. * gdb.cp/info-types.cc: New file. * gdb.cp/info-types.exp: New file. --- gdb/ChangeLog | 9 +++++ gdb/symtab.c | 34 +++++++++++-------- gdb/testsuite/ChangeLog | 7 ++++ gdb/testsuite/gdb.base/info-types.c | 62 +++++++++++++++++++++++++++++++++++ gdb/testsuite/gdb.base/info-types.exp | 51 ++++++++++++++++++++++++++++ gdb/testsuite/gdb.cp/info-types.cc | 33 +++++++++++++++++++ gdb/testsuite/gdb.cp/info-types.exp | 42 ++++++++++++++++++++++++ 7 files changed, 225 insertions(+), 13 deletions(-) create mode 100644 gdb/testsuite/gdb.base/info-types.c create mode 100644 gdb/testsuite/gdb.base/info-types.exp create mode 100644 gdb/testsuite/gdb.cp/info-types.cc create mode 100644 gdb/testsuite/gdb.cp/info-types.exp diff --git a/gdb/symtab.c b/gdb/symtab.c index 7b7f1298419..6364605fc60 100644 --- a/gdb/symtab.c +++ b/gdb/symtab.c @@ -4339,13 +4339,13 @@ search_symbols (const char *regexp, enum search_domain kind, struct symbol *sym; int found_misc = 0; static const enum minimal_symbol_type types[] - = {mst_data, mst_text, mst_abs}; + = {mst_data, mst_text, mst_unknown}; static const enum minimal_symbol_type types2[] - = {mst_bss, mst_file_text, mst_abs}; + = {mst_bss, mst_file_text, mst_unknown}; static const enum minimal_symbol_type types3[] - = {mst_file_data, mst_solib_trampoline, mst_abs}; + = {mst_file_data, mst_solib_trampoline, mst_unknown}; static const enum minimal_symbol_type types4[] - = {mst_file_bss, mst_text_gnu_ifunc, mst_abs}; + = {mst_file_bss, mst_text_gnu_ifunc, mst_unknown}; enum minimal_symbol_type ourtype; enum minimal_symbol_type ourtype2; enum minimal_symbol_type ourtype3; @@ -4628,7 +4628,23 @@ print_symbol_info (enum search_domain kind, /* Typedef that is not a C++ class. */ if (kind == TYPES_DOMAIN && SYMBOL_DOMAIN (sym) != STRUCT_DOMAIN) - typedef_print (SYMBOL_TYPE (sym), sym, gdb_stdout); + { + /* FIXME: For C (and C++) we end up with a difference in output here + between how a typedef is printed, and non-typedefs are printed. + The TYPEDEF_PRINT code places a ";" at the end in an attempt to + appear C-like, while TYPE_PRINT doesn't. + + For the struct printing case below, things are worse, we force + printing of the ";" in this function, which is going to be wrong + for languages that don't require a ";" between statements. */ + if (TYPE_CODE (SYMBOL_TYPE (sym)) == TYPE_CODE_TYPEDEF) + typedef_print (SYMBOL_TYPE (sym), sym, gdb_stdout); + else + { + type_print (SYMBOL_TYPE (sym), "", gdb_stdout, -1); + printf_filtered ("\n"); + } + } /* variable, func, or typedef-that-is-c++-class. */ else if (kind < TYPES_DOMAIN || (kind == TYPES_DOMAIN @@ -6078,14 +6094,6 @@ Prints the functions.\n"), _("functions"))); set_cmd_completer_handle_brkchars (c, info_print_command_completer); - /* FIXME: This command has at least the following problems: - 1. It prints builtin types (in a very strange and confusing fashion). - 2. It doesn't print right, e.g. with - typedef struct foo *FOO - type_print prints "FOO" when we want to make it (in this situation) - print "struct foo *". - I also think "ptype" or "whatis" is more likely to be useful (but if - there is much disagreement "info types" can be fixed). */ c = add_info ("types", info_types_command, _("\ All type names, or those matching REGEXP.\n\ Usage: info types [-q] [REGEXP]\n\ diff --git a/gdb/testsuite/gdb.base/info-types.c b/gdb/testsuite/gdb.base/info-types.c new file mode 100644 index 00000000000..d07866544b6 --- /dev/null +++ b/gdb/testsuite/gdb.base/info-types.c @@ -0,0 +1,62 @@ +/* Copyright 2019 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 3 of the License, or + (at your option) any later version. + + 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 . */ + +typedef int my_int_t; +typedef float my_float_t; +typedef my_int_t nested_int_t; +typedef my_float_t nested_float_t; + +struct baz_t +{ + float f; + double d; +}; + +typedef struct baz_t baz_t; +typedef struct baz_t baz; +typedef baz_t nested_baz_t; +typedef baz nested_baz; +typedef struct baz_t *baz_ptr; + +enum enum_t +{ + AA, BB, CC +}; + +typedef enum enum_t my_enum_t; +typedef my_enum_t nested_enum_t; + +volatile int var_a; +volatile float var_b; +volatile my_int_t var_c; +volatile my_float_t var_d; +volatile nested_int_t var_e; +volatile nested_float_t var_f; +volatile struct baz_t var_g; +volatile baz_t var_h; +volatile baz var_i; +volatile nested_baz_t var_j; +volatile nested_baz var_k; +volatile baz_ptr var_l; +volatile enum enum_t var_m; +volatile my_enum_t var_n; +volatile nested_enum_t var_o; + +int +main () +{ + asm ("" ::: "memory"); + return 0; +} diff --git a/gdb/testsuite/gdb.base/info-types.exp b/gdb/testsuite/gdb.base/info-types.exp new file mode 100644 index 00000000000..2ebd76f0e94 --- /dev/null +++ b/gdb/testsuite/gdb.base/info-types.exp @@ -0,0 +1,51 @@ +# Copyright 2019 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 3 of the License, or +# (at your option) any later version. +# +# 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 . + +# Check that 'info types' produces the expected output for an inferior +# containing a number of different types. + +standard_testfile + +if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} { + return -1 +} + +if ![runto_main] then { + fail "can't run to main" + return 0 +} + +gdb_test "info types" \ + [multi_line \ + "All defined types:" \ + "" \ + "File .*:" \ + "28:\[\t \]+typedef struct baz_t baz;" \ + "31:\[\t \]+typedef struct baz_t \\* baz_ptr;" \ + "21:\[\t \]+struct baz_t;" \ + "\[\t \]+double" \ + "33:\[\t \]+enum enum_t;" \ + "\[\t \]+float" \ + "\[\t \]+int" \ + "38:\[\t \]+typedef enum enum_t my_enum_t;" \ + "17:\[\t \]+typedef float my_float_t;" \ + "16:\[\t \]+typedef int my_int_t;" \ + "30:\[\t \]+typedef struct baz_t nested_baz;" \ + "29:\[\t \]+typedef struct baz_t nested_baz_t;" \ + "39:\[\t \]+typedef enum enum_t nested_enum_t;" \ + "19:\[\t \]+typedef float nested_float_t;" \ + "18:\[\t \]+typedef int nested_int_t;" \ + "\[\t \]+unsigned int" ] + diff --git a/gdb/testsuite/gdb.cp/info-types.cc b/gdb/testsuite/gdb.cp/info-types.cc new file mode 100644 index 00000000000..f3ee67a5f52 --- /dev/null +++ b/gdb/testsuite/gdb.cp/info-types.cc @@ -0,0 +1,33 @@ +/* Copyright 2019 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 3 of the License, or + (at your option) any later version. + + 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 . */ + +class AA +{ + int a; +}; + +typedef AA my_a; +typedef AA *my_ptr; + +volatile AA var_a; +volatile my_a var_b; +volatile my_ptr var_c; + +int +main () +{ + asm ("" ::: "memory"); + return 0; +} diff --git a/gdb/testsuite/gdb.cp/info-types.exp b/gdb/testsuite/gdb.cp/info-types.exp new file mode 100644 index 00000000000..4834b52f8f1 --- /dev/null +++ b/gdb/testsuite/gdb.cp/info-types.exp @@ -0,0 +1,42 @@ +# Copyright 2019 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 3 of the License, or +# (at your option) any later version. +# +# 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 . + +# Check that 'info types' produces the expected output for some C++ +# types. Most basic 'info types' functionality is tested in +# gdb.base/info-types.exp. + +if { [skip_cplus_tests] } { continue } + +standard_testfile .cc + +if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} { + return -1 +} + +if ![runto_main] then { + fail "can't run to main" + return 0 +} + +gdb_test "info types" \ + [multi_line \ + "All defined types:" \ + "" \ + "File .*:" \ + "16:\[\t \]+AA;" \ + "\[\t \]+int" \ + "21:\[\t \]+typedef AA my_a;" \ + "22:\[\t \]+typedef AA \\* my_ptr;" ] +