From patchwork Mon Nov 10 21:41:33 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Taylor X-Patchwork-Id: 3643 Received: (qmail 14094 invoked by alias); 10 Nov 2014 21:41:56 -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 14082 invoked by uid 89); 10 Nov 2014 21:41:55 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.6 required=5.0 tests=AWL, BAYES_00, RP_MATCHES_RCVD, SPF_PASS autolearn=ham version=3.3.2 X-HELO: mailuogwhop.emc.com Received: from mailuogwhop.emc.com (HELO mailuogwhop.emc.com) (168.159.213.141) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES256-SHA encrypted) ESMTPS; Mon, 10 Nov 2014 21:41:53 +0000 Received: from maildlpprd02.lss.emc.com (maildlpprd02.lss.emc.com [10.253.24.34]) by mailuogwprd03.lss.emc.com (Sentrion-MTA-4.3.1/Sentrion-MTA-4.3.0) with ESMTP id sAALfpCk023038 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Mon, 10 Nov 2014 16:41:51 -0500 X-DKIM: OpenDKIM Filter v2.4.3 mailuogwprd03.lss.emc.com sAALfpCk023038 X-DKIM: OpenDKIM Filter v2.4.3 mailuogwprd03.lss.emc.com sAALfpCk023038 Received: from mailhub.lss.emc.com (mailhubhoprd04.lss.emc.com [10.254.222.226]) by maildlpprd02.lss.emc.com (RSA Interceptor) for ; Mon, 10 Nov 2014 16:40:44 -0500 Received: from usendtaylorx2l.lss.emc.com (usendtaylorx2l.lss.emc.com [10.243.10.188]) by mailhub.lss.emc.com (Switch-3.4.3/Switch-3.4.3) with ESMTP id sAALfZxO005145 for ; Mon, 10 Nov 2014 16:41:35 -0500 Received: by usendtaylorx2l.lss.emc.com (Postfix, from userid 26043) id 95DFF5D7BFE; Mon, 10 Nov 2014 16:41:33 -0500 (EST) Received: from usendtaylorx2l (localhost [127.0.0.1]) by usendtaylorx2l.lss.emc.com (Postfix) with ESMTP id E552B5D748C for ; Mon, 10 Nov 2014 16:41:33 -0500 (EST) From: David Taylor To: gdb-patches@sourceware.org Subject: RFA: info macro [-at LOCATION,] Date: Mon, 10 Nov 2014 16:41:33 -0500 Message-ID: <31913.1415655693@usendtaylorx2l> X-EMM-MHVC: 1 X-RSA-Classifications: Source Code, public X-Sentrion-Hostname: mailuogwprd03.lss.emc.com X-IsSubscribed: yes A few releases ago it was possible to set a location that would be used by 'info location' by typing something like: list file.c:42 and then do: info macro MACRONAME . Sometime between release 7.1 and 7.8 that stopped working. The following patch adds the option [-at LOCATION,] to 'info macro' to enable the use of a user selected location as a documented feature. Three files, three change log entries: gdb/ChangeLog: 2014-11-10 David Taylor * macrocmd.c (info_macro_command): Add support for new option '-at LOCATION'. (_initialize_macrocmd): Update doc string for 'info macro' command. gdb/doc/ChangeLog: 2014-11-10 David Taylor * gdb.texinfo: Document new -at LOCATION option of the 'info macro' command. gdb/testsuite/ChangeLog: 2014-11-10 David Taylor * gdb.base/info-macros.exp: Add testcases for new -at LOCATION option of the 'info macro' command. On an x86-64 Linux platform, there were no testsuite regressions and the new tests passed. The actual patch: Index: gdb/macrocmd.c =================================================================== RCS file: /home/cvsroot/GDB/gdb/macrocmd.c,v retrieving revision 1.1.1.3 diff -u -r1.1.1.3 macrocmd.c --- gdb/macrocmd.c 21 Aug 2014 13:17:23 -0000 1.1.1.3 +++ gdb/macrocmd.c 10 Nov 2014 21:23:37 -0000 @@ -206,21 +206,43 @@ info_macro_command (char *args, int from_tty) { struct macro_scope *ms = NULL; - struct cleanup *cleanup_chain; + struct cleanup *cleanup_chain = NULL; char *name; int show_all_macros_named = 0; char *arg_start = args; int processing_args = 1; - while (processing_args - && arg_start && *arg_start == '-' && *arg_start != '\0') - { - char *p = skip_to_space (arg_start); + int location_specified = 0; - if (strncmp (arg_start, "-a", p - arg_start) == 0 - || strncmp (arg_start, "-all", p - arg_start) == 0) + while (processing_args && args && *args == '-') + { + if (check_for_argument (&args, "-a", sizeof ("-a") - 1) + || check_for_argument (&args, "-all", sizeof ("-all") - 1)) show_all_macros_named = 1; - else if (strncmp (arg_start, "--", p - arg_start) == 0) + else if (check_for_argument (&args, "-at", sizeof ("-at") - 1)) + { + struct linespec_result canonical; + + location_specified = 1; + + args = skip_spaces (args); + init_linespec_result (&canonical); + decode_line_full (&args, DECODE_LINE_FUNFIRSTLINE, + (struct symtab *) NULL, 0, &canonical, + NULL, NULL); + + cleanup_chain = make_cleanup_destroy_linespec_result (&canonical); + args = skip_spaces (args); + if (args[0] == ',') + { + args++; + args = skip_spaces (args); + } + ms = sal_macro_scope (canonical.sals->vec->sals.sals[0]); + do_cleanups (cleanup_chain); + cleanup_chain = make_cleanup (free_current_contents, &ms); + } + else if (check_for_argument (&args, "--", sizeof ("--") - 1)) /* Our macro support seems rather C specific but this would seem necessary for languages allowing - in macro names. e.g. Scheme's (defmacro ->foo () "bar\n") */ @@ -228,24 +250,26 @@ else { /* Relies on modified 'args' not making it in to history */ - *p = '\0'; error (_("Unrecognized option '%s' to info macro command. " - "Try \"help info macro\"."), arg_start); + "Try \"help info macro\"."), args); } - arg_start = skip_spaces (p); + args = skip_spaces (args); } - name = arg_start; + name = skip_spaces (args); if (! name || ! *name) error (_("You must follow the `info macro' command with the name" " of the macro\n" "whose definition you want to see.")); - ms = default_macro_scope (); - cleanup_chain = make_cleanup (free_current_contents, &ms); - + if (! location_specified) + { + ms = default_macro_scope (); + cleanup_chain = make_cleanup (free_current_contents, &ms); + } + if (! ms) macro_inform_no_debuginfo (); else if (show_all_macros_named) @@ -525,10 +549,11 @@ add_cmd ("macro", no_class, info_macro_command, _("Show the definition of MACRO, and it's source location.\n\ -Usage: info macro [-a|-all] [--] MACRO\n\ +Usage: info macro [-a|-all] [-at LOCATION,] [--] MACRO\n\ Options: \n\ -a, --all Output all definitions of MACRO in the current compilation\ unit.\n\ + -at Use LOCATION rather than the current PC for selecting macros.\n\ -- Specify the end of arguments and the beginning of the MACRO."), &infolist); Index: gdb/doc/gdb.texinfo =================================================================== RCS file: /home/cvsroot/GDB/gdb/doc/gdb.texinfo,v retrieving revision 1.3 diff -u -r1.3 gdb.texinfo --- gdb/doc/gdb.texinfo 21 Aug 2014 14:07:17 -0000 1.3 +++ gdb/doc/gdb.texinfo 10 Nov 2014 21:23:37 -0000 @@ -11412,12 +11412,13 @@ @cindex macro definition, showing @cindex definition of a macro, showing @cindex macros, from debug info -@item info macro [-a|-all] [--] @var{macro} +@item info macro [-a|-all] [-at LOCATION,] [--] @var{macro} Show the current definition or all definitions of the named @var{macro}, and describe the source location or compiler command-line where that definition was established. The optional double dash is to signify the end of argument processing and the beginning of @var{macro} for non C-like macros where -the macro may begin with a hyphen. +the macro may begin with a hyphen. If the optional LOCATION is specified, +it is used instead of the current location. @kindex info macros @item info macros @var{linespec} Index: gdb/testsuite/gdb.base/info-macros.exp =================================================================== RCS file: /home/cvsroot/GDB/gdb/testsuite/gdb.base/info-macros.exp,v retrieving revision 1.1.1.3 diff -u -r1.1.1.3 info-macros.exp --- gdb/testsuite/gdb.base/info-macros.exp 21 Aug 2014 13:17:27 -0000 1.1.1.3 +++ gdb/testsuite/gdb.base/info-macros.exp 10 Nov 2014 21:23:38 -0000 @@ -133,6 +133,30 @@ set testname "$test" gdb_test "$test" "$r1$r2$r3$r4" "$testname" +set test "info macro -at LOCATION, FOO" + +set r5 ".* has no definition .*\r\nat .*$srcfile:\[0-9\]+" +set testname "$test 1" +gdb_test "info macro -at info-macros.c:42, FOO" "$r1" "$testname" + +set testname "$test 2" +gdb_test "info macro -at info-macros.c:46, FOO" "$r2" "$testname" + +set testname "$test 3" +gdb_test "info macro -at info-macros.c:50, FOO" "$r3" "$testname" + +set testname "$test 4" +gdb_test "info macro -at info-macros.c:54, FOO" "$r2" "$testname" + +set testname "$test 5" +gdb_test "info macro -at info-macros.c:58, FOO" "$r1" "$testname" + +set testname "$test 6" +gdb_test "info macro -at info-macros.c:62, FOO" "$r5" "$testname" + +set testname "$test 7" +gdb_test "info macro -at info-macros.c:66, FOO" "$r4" "$testname" + set test "info macros" set r1 ".*#define FOO \"hello\"" set r2 ".*#define ONE"