From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gdb-patches-return-44850-listarch-gdb-patches=sources.redhat.com@sourceware.org>
Received: (qmail 26256 invoked by alias); 10 Jul 2006 05:40:36 -0000
Received: (qmail 26166 invoked by uid 22791); 10 Jul 2006 05:40:35 -0000
X-Spam-Check-By: sourceware.org
Received: from nile.gnat.com (HELO nile.gnat.com) (205.232.38.5)     by sourceware.org (qpsmtpd/0.31) with ESMTP; Mon, 10 Jul 2006 05:40:31 +0000
Received: from localhost (localhost [127.0.0.1]) 	by filtered-nile.gnat.com (Postfix) with ESMTP id 5602C48CE90; 	Mon, 10 Jul 2006 01:40:29 -0400 (EDT)
Received: from nile.gnat.com ([127.0.0.1])  by localhost (nile.gnat.com [127.0.0.1]) (amavisd-new, port 10024) with LMTP  id 10859-02-8; Mon, 10 Jul 2006 01:40:29 -0400 (EDT)
Received: from takamaka.act-europe.fr (S0106000625ac85e1.vs.shawcable.net [70.71.27.110]) 	by nile.gnat.com (Postfix) with ESMTP id AC4DA48CDF3; 	Mon, 10 Jul 2006 01:40:28 -0400 (EDT)
Received: by takamaka.act-europe.fr (Postfix, from userid 507) 	id D072147EFA; Sun,  9 Jul 2006 22:40:27 -0700 (PDT)
Date: Mon, 10 Jul 2006 05:40:00 -0000
From: Joel Brobecker <brobecker@adacore.com>
To: Eli Zaretskii <eliz@gnu.org>
Cc: gdb-patches@sources.redhat.com
Subject: Re: [RFA] New substitute-path commands
Message-ID: <20060710054027.GF971@adacore.com>
References: <20060705215606.GF3580@adacore.com> <20060705230129.GA1145@nevyn.them.org> <20060706044733.GC673@adacore.com> <1152198199.6282.63.camel@dufur.beaverton.ibm.com> <20060706162952.GB24631@nevyn.them.org> <20060707052219.GA971@adacore.com> <u8xn5rbx7.fsf@gnu.org> <20060707191203.GD971@adacore.com> <uhd1sp9uv.fsf@gnu.org>
Mime-Version: 1.0
Content-Type: multipart/mixed; boundary="fOHHtNG4YXGJ0yqR"
Content-Disposition: inline
In-Reply-To: <uhd1sp9uv.fsf@gnu.org>
User-Agent: Mutt/1.4i
Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:gdb-patches-subscribe@sourceware.org>
List-Archive: <http://sourceware.org/ml/gdb-patches/>
List-Post: <mailto:gdb-patches@sourceware.org>
List-Help: <mailto:gdb-patches-help@sourceware.org>, <http://sourceware.org/ml/#faqs>
Sender: gdb-patches-owner@sourceware.org
X-SW-Source: 2006-07/txt/msg00076.txt.bz2


--fOHHtNG4YXGJ0yqR
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-length: 1538

Hi Eli,

I incorporated all your comments in the this new version.

> > +directory between compilation and debugging.  @value{GDBN} does a simple
> > +string replacement of the first occurrence of @var{from} with @var{to}
> > +in the directory part of the source file name, and uses the result
> > +instead of the original file name to look up the sources.
> 
> I suggested to have this text after the command description.  In that
> context, @var{from} and @var{to} refer to the command's arguments.
> But you moved the description higher in the text, which made those
> reference dangling.  So this needs to be reworded in some way.

You're right. It didn't work that way at all. You'll see my attempt
at fixing it in this version of the patch.

2006-07-07  Joel Brobecker  <brobecker@adacore.com

        * source.c (substitute_path_from): New static variable.
        (substitute_path_to): Likewise.
        (xrewrite_source_path): New function.
        (find_and_open_source): Add source path rewriting support.
        (show_substitute_path_command): New function.
        (unset_substitute_path_command): New function.
        (set_substitute_path_command): New function.
        (_initialize_source): Add new substitute-path commands.

Patch not re-sent, since identical to previous iteration.
See http://sources.redhat.com/ml/gdb-patches/2006-07/msg00062.html.

2006-07-09  Joel Brobecker  <brobecker@adacore.com

        * gdb.texinfo (Source Path): Add documentation for new
        substitute-path commands.

Thanks,
-- 
Joel

--fOHHtNG4YXGJ0yqR
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename="subst-doc.diff"
Content-length: 3994

Index: gdb.texinfo
===================================================================
RCS file: /cvs/src/src/gdb/doc/gdb.texinfo,v
retrieving revision 1.340
diff -u -p -r1.340 gdb.texinfo
--- gdb.texinfo	21 Jun 2006 13:57:21 -0000	1.340
+++ gdb.texinfo	10 Jul 2006 05:36:05 -0000
@@ -5033,6 +5033,44 @@ To add other directories, use the @code{
 The search path is used to find both program source files and @value{GDBN}
 script files (read using the @samp{-command} option and @samp{source} command).
 
+In addition to the source path, @value{GDBN} provides a set of commands
+that manage a source path substitution rule.  A @dfn{substitution rule}
+specifies how to rewrite source directories stored in the program's
+debug information in case the sources were moved to a different
+directory between compilation and debugging.  The rule is made of
+two strings, the first specifying what needs to be rewritten in
+the path, and the second specifying how it should be rewritten.
+In the @ref{set substitute-path} command description, these two
+parts are named respectively @var{from} and @var{to}.  @value{GDBN}
+does a simple string replacement of the first occurrence of @var{from}
+with @var{to} in the directory part of the source file name, and uses
+the result instead of the original file name to look up the sources.
+
+Using the previous example, suppose the @file{foo-1.0} tree has been
+moved from @file{/usr/src} to @file{/mnt/cross}, then you can tell
+GDB to replace @file{/usr/src} in all source path names with
+@file{/mnt/cross}.  The first lookup will then be
+@file{/mnt/cross/foo-1.0/lib/foo.c} in place of the original location
+of @file{/usr/src/foo-1.0/lib/foo.c}.  To define a source path
+substitution rule, use the @ref{set substitute-path} command.
+
+In many cases, you can achieve the same result using the @code{directory}
+command.  However, @code{set substitute-path} can be more efficient in
+the case where the sources are organized in a complex tree with multiple
+subdirectories.  With the @code{directory} command, you need to add each
+subdirectory of your project.  If you moved the entire tree while
+preserving its internal organization, then @code{set substitute-path}
+allows you to direct the debugger to all the sources with one single
+command.
+
+@code{set substitute-path} is also more than just a shortcut command.
+The source path is only used if the file at the original location no
+longer exists.  On the other hand, @code{set substitute-path} modifies
+the debugger behavior to look at the rewritten location instead.  So, if
+for any reason a source file that is not relevant to your executable is
+located at the original location, the substitution rule is the only
+method available to point GDB at the new location.
+
 @table @code
 @item directory @var{dirname} @dots{}
 @item dir @var{dirname} @dots{}
@@ -5068,6 +5106,34 @@ Reset the source path to its default val
 @item show directories
 @kindex show directories
 Print the source path: show which directories it contains.
+
+@anchor{set substitute-path}
+@item set substitute-path @var{from} @var{to}
+@kindex set substitute-path
+Define a source path substitution rule.  The new substitution rule
+replaces any rule previously defined.
+
+For example, if the file @file{/foo/bar/baz.c} was moved to
+@file{/mnt/cross/baz.c}, then the command
+
+@smallexample
+(@value{GDBP}) set substitute-path /usr/src /mnt/cross
+@end smallexample
+
+@noindent
+will tell @value{GDBN} to replace @samp{/usr/src} with
+@samp{/mnt/cross}, which will allow @value{GDBN} to find the file
+@file{baz.c} even though it was moved.
+
+@item unset substitute-path
+@kindex unset substitute-path
+If a source path substitution rule is active, then cancel it.
+This command has no effect otherwise.
+
+@item show substitute-path
+@kindex show substitute-path
+Print the source path substitution rule if defined.
+
 @end table
 
 If your source path is cluttered with directories that are no longer of

--fOHHtNG4YXGJ0yqR--