From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 31168 invoked by alias); 6 Jan 2016 18:56:41 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Received: (qmail 31139 invoked by uid 89); 6 Jan 2016 18:56:41 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.3 required=5.0 tests=AWL,BAYES_00,KAM_LAZY_DOMAIN_SECURITY autolearn=no version=3.3.2 spammy=39, Expect, Variables, Convenience X-HELO: usplmg21.ericsson.net Received: from usplmg21.ericsson.net (HELO usplmg21.ericsson.net) (198.24.6.65) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES256-SHA encrypted) ESMTPS; Wed, 06 Jan 2016 18:56:40 +0000 Received: from EUSAAHC001.ericsson.se (Unknown_Domain [147.117.188.75]) by usplmg21.ericsson.net (Symantec Mail Security) with SMTP id 9C.D5.32102.9536D865; Wed, 6 Jan 2016 19:56:25 +0100 (CET) Received: from [142.133.110.144] (147.117.188.8) by smtp-am.internal.ericsson.com (147.117.188.77) with Microsoft SMTP Server id 14.3.248.2; Wed, 6 Jan 2016 13:56:37 -0500 Subject: Re: [PATCH v3 1/7] Add a new $_inferior convenience variable To: Pedro Alves , References: <1452085418-18300-1-git-send-email-palves@redhat.com> <1452085418-18300-2-git-send-email-palves@redhat.com> From: Simon Marchi Message-ID: <568D6365.2080601@ericsson.com> Date: Wed, 06 Jan 2016 18:56:00 -0000 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.4.0 MIME-Version: 1.0 In-Reply-To: <1452085418-18300-2-git-send-email-palves@redhat.com> Content-Type: text/plain; charset="windows-1252" Content-Transfer-Encoding: 7bit X-IsSubscribed: yes X-SW-Source: 2016-01/txt/msg00097.txt.bz2 On 16-01-06 08:03 AM, Pedro Alves wrote: > Like $_thread, but holds the current inferior number. > > gdb/ChangeLog: > 2016-01-06 Pedro Alves > > * NEWS: Mention $_inferior. > * inferior.c (inferior_id_make_value): New. > (inferior_funcs): New. > (_initialize_inferior): Create $_inferior variable. > > gdb/testsuite/ChangeLog: > 2016-01-06 Pedro Alves > > * gdb.base/default.exp: Expect $_inferior as well. > * gdb.multi/base.exp: Test $_inferior. > > gdb/doc/ChangeLog: > 2016-01-06 Pedro Alves > > * gdb.texinfo (Inferiors and Programs): Document the $_inferior > convenience variable. > (Convenience Vars): Likewise. > --- > gdb/NEWS | 3 +++ > gdb/doc/gdb.texinfo | 10 ++++++++++ > gdb/inferior.c | 21 +++++++++++++++++++++ > gdb/testsuite/gdb.base/default.exp | 1 + > gdb/testsuite/gdb.multi/base.exp | 4 ++++ > 5 files changed, 39 insertions(+) > > diff --git a/gdb/NEWS b/gdb/NEWS > index 484d98d..31c870d 100644 > --- a/gdb/NEWS > +++ b/gdb/NEWS > @@ -3,6 +3,9 @@ > > *** Changes since GDB 7.10 > > +* The new convenience variable $_inferior holds the number of the > + current inferior. > + > * Record btrace now supports non-stop mode. > > * Support for tracepoints on aarch64-linux was added in GDBserver. > diff --git a/gdb/doc/gdb.texinfo b/gdb/doc/gdb.texinfo > index 0778383..f01b703 100644 > --- a/gdb/doc/gdb.texinfo > +++ b/gdb/doc/gdb.texinfo > @@ -2658,6 +2658,12 @@ Make inferior number @var{infno} the current inferior. The argument > in the first field of the @samp{info inferiors} display. > @end table > > +@vindex $_inferior@r{, convenience variable} > +The debugger convenience variable @samp{$_inferior} contains the > +number of the current inferior. You may find this useful in writing > +breakpoint conditional expressions, command scripts, and so forth. > +@xref{Convenience Vars,, Convenience Variables}, for general > +information on convenience variables. > > You can get multiple executables into a debugging session via the > @code{add-inferior} and @w{@code{clone-inferior}} commands. On some > @@ -10382,6 +10388,10 @@ gdbserver that supports the @code{qGetTIBAddr} request. > @xref{General Query Packets}. > This variable contains the address of the thread information block. > > +@item $_inferior > +The number of the current inferior. @xref{Inferiors and > +Programs, ,Debugging Multiple Inferiors and Programs}. > + > @end table > > @node Convenience Funs > diff --git a/gdb/inferior.c b/gdb/inferior.c > index e71104d..8f9ac33 100644 > --- a/gdb/inferior.c > +++ b/gdb/inferior.c > @@ -1008,6 +1008,26 @@ show_print_inferior_events (struct ui_file *file, int from_tty, > fprintf_filtered (file, _("Printing of inferior events is %s.\n"), value); > } > > +/* Return a new value for the selected inferior's id. */ > + > +static struct value * > +inferior_id_make_value (struct gdbarch *gdbarch, struct internalvar *var, > + void *ignore) > +{ > + struct inferior *inf = current_inferior (); > + > + return value_from_longest (builtin_type (gdbarch)->builtin_int, inf->num); > +} > + > +/* Implementation of `$_inferior' variable. */ > + > +static const struct internalvar_funcs inferior_funcs = > +{ > + inferior_id_make_value, > + NULL, > + NULL > +}; > + > > > void > @@ -1071,4 +1091,5 @@ Show printing of inferior events (e.g., inferior start and exit)."), NULL, > show_print_inferior_events, > &setprintlist, &showprintlist); > > + create_internalvar_type_lazy ("_inferior", &inferior_funcs, NULL); > } > diff --git a/gdb/testsuite/gdb.base/default.exp b/gdb/testsuite/gdb.base/default.exp > index 90bf27d..fec2cde 100644 > --- a/gdb/testsuite/gdb.base/default.exp > +++ b/gdb/testsuite/gdb.base/default.exp > @@ -587,6 +587,7 @@ set show_conv_list \ > {$_sdata = void} \ > {$_siginfo = void} \ > {$_thread = 0} \ > + {$_inferior = 1} \ > {$_exception = } \ > {$_probe_argc = } \ > {$_probe_arg0 = } \ > diff --git a/gdb/testsuite/gdb.multi/base.exp b/gdb/testsuite/gdb.multi/base.exp > index 6f0bc63..1aa907d 100644 > --- a/gdb/testsuite/gdb.multi/base.exp > +++ b/gdb/testsuite/gdb.multi/base.exp > @@ -44,12 +44,16 @@ if { [build_executable ${testfile}.exp ${exec3} "${srcfile3}" {debug}] == -1 } { > > clean_restart ${exec1} > > +gdb_test {print $_inferior} " = 1" > + > # Add an empty inferior, switch to it, and load a main executable into > # it. > gdb_test "add-inferior" "Added inferior 2.*" "add empty inferior 2" > gdb_test "inferior 2" "Switching to inferior 2.*" "switch to inferior 2" > gdb_test "file ${binfile2}" ".*" "load ${exec2} file in inferior 2" > > +gdb_test {print $_inferior} " = 2" "print \$_inferior after switching" > + > # Add a new inferior and load a main executable into it in one > # command. > gdb_test "add-inferior -exec ${binfile3}" \ > LGTM.