From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 11326 invoked by alias); 29 Jul 2004 20:54:56 -0000 Mailing-List: contact gdb-patches-help@sources.redhat.com; run by ezmlm Precedence: bulk List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sources.redhat.com Received: (qmail 11318 invoked from network); 29 Jul 2004 20:54:55 -0000 Received: from unknown (HELO mx1.redhat.com) (66.187.233.31) by sourceware.org with SMTP; 29 Jul 2004 20:54:55 -0000 Received: from int-mx1.corp.redhat.com (int-mx1.corp.redhat.com [172.16.52.254]) by mx1.redhat.com (8.12.10/8.12.10) with ESMTP id i6TKste1008581 for ; Thu, 29 Jul 2004 16:54:55 -0400 Received: from pobox.toronto.redhat.com (pobox.toronto.redhat.com [172.16.14.4]) by int-mx1.corp.redhat.com (8.11.6/8.11.6) with ESMTP id i6TKssa12462; Thu, 29 Jul 2004 16:54:54 -0400 Received: from [172.16.14.67] (towel.toronto.redhat.com [172.16.14.67]) by pobox.toronto.redhat.com (8.12.8/8.12.8) with ESMTP id i6TKsrXP027588; Thu, 29 Jul 2004 16:54:53 -0400 Message-ID: <4109641D.7090301@redhat.com> Date: Thu, 29 Jul 2004 20:54:00 -0000 From: Bryce McKinlay User-Agent: Mozilla Thunderbird 0.5 (X11/20040626) MIME-Version: 1.0 To: Jim Blandy CC: gdb-patches@sources.redhat.com Subject: Re: Patch: Handle relative paths in .debug_line References: <41004E5D.5020403@redhat.com> <4101A540.5050208@redhat.com> In-Reply-To: Content-Type: multipart/mixed; boundary="------------080305090306060702090409" X-SW-Source: 2004-07/txt/msg00456.txt.bz2 This is a multi-part message in MIME format. --------------080305090306060702090409 Content-Type: text/plain; charset=us-ascii; format=flowed Content-Transfer-Encoding: 7bit Content-length: 772 Jim Blandy wrote: >Bryce McKinlay writes: > > > >>Jim Blandy wrote: >> >> >> >>>Thanks for this patch! >>> >>>In the revised dwarf2_start_subfile: >>> >>>- It looks to me as if the new code doesn't handle the case where both >>> dirname and comp_dir are null. >>> >>>- It seems to me that, when fullname == filename, the loop over the >>> subfiles duplicates the loop at the top of start_subfile. So that >>> loop should remain conditional. Its comment should be moved and >>> adjusted, too. >>> >>> >>> >>> >>Here's a revised patch that should address this. OK to commit? >> >> > >Almost --- dwarf2_start_subfile still passes comp_dir to concat >without checking whether it's NULL. > > Fixed in the following patch. OK? Bryce --------------080305090306060702090409 Content-Type: text/x-patch; name="gdb-subfile-compdir-3.patch" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="gdb-subfile-compdir-3.patch" Content-length: 3953 2004-07-29 Bryce McKinlay * dwarf2read.c (dwarf_decode_lines): Pass comp_dir to dwarf2_start_subfile. (dwarf2_start_subfile): New comp_dir parameter. Handle relative paths in .debug_line by appending them to comp_dir. Use make_cleanup to free strings used in directory concatenation. Index: dwarf2read.c =================================================================== RCS file: /cvs/src/src/gdb/dwarf2read.c,v retrieving revision 1.156 diff -u -r1.156 dwarf2read.c --- dwarf2read.c 6 Jul 2004 19:29:30 -0000 1.156 +++ dwarf2read.c 29 Jul 2004 20:52:10 -0000 @@ -762,7 +762,7 @@ static void dwarf_decode_lines (struct line_header *, char *, bfd *, struct dwarf2_cu *, struct partial_symtab *); -static void dwarf2_start_subfile (char *, char *); +static void dwarf2_start_subfile (char *, char *, char *); static struct symbol *new_symbol (struct die_info *, struct type *, struct dwarf2_cu *); @@ -5951,12 +5951,10 @@ directory and file name numbers in the statement program are 1-based. */ struct file_entry *fe = &lh->file_names[file - 1]; - char *dir; + char *dir = NULL; if (fe->dir_index) dir = lh->include_dirs[fe->dir_index - 1]; - else - dir = comp_dir; - dwarf2_start_subfile (fe->name, dir); + dwarf2_start_subfile (fe->name, dir, comp_dir); } /* Decode the table. */ @@ -6044,17 +6042,15 @@ but the directory and file name numbers in the statement program are 1-based. */ struct file_entry *fe; - char *dir; + char *dir = NULL; file = read_unsigned_leb128 (abfd, line_ptr, &bytes_read); line_ptr += bytes_read; fe = &lh->file_names[file - 1]; fe->included_p = 1; if (fe->dir_index) dir = lh->include_dirs[fe->dir_index - 1]; - else - dir = comp_dir; if (!decode_for_pst_p) - dwarf2_start_subfile (fe->name, dir); + dwarf2_start_subfile (fe->name, dir, comp_dir); } break; case DW_LNS_set_column: @@ -6112,7 +6108,8 @@ /* Start a subfile for DWARF. FILENAME is the name of the file and DIRNAME the name of the source directory which contains FILENAME - or NULL if not known. + or NULL if not known. COMP_DIR is the value of DW_AT_comp_dir. If + DIRNAME specifies a relative path, it is appended to COMP_DIR. This routine tries to keep line numbers from identical absolute and relative file names in a common subfile. @@ -6131,8 +6128,19 @@ subfile, so that `break /srcdir/list0.c:1' works as expected. */ static void -dwarf2_start_subfile (char *filename, char *dirname) +dwarf2_start_subfile (char *filename, char *dirname, char *comp_dir) { + struct cleanup *back_to = make_cleanup (null_cleanup, 0); + + /* If we have a relative dirname, append it to comp_dir. */ + if (comp_dir != NULL && dirname != NULL && !IS_ABSOLUTE_PATH (dirname)) + { + dirname = concat (comp_dir, "/", dirname, NULL); + make_cleanup (xfree, dirname); + } + else if (dirname == NULL) + dirname = comp_dir; + /* If the filename isn't absolute, try to match an existing subfile with the full pathname. */ @@ -6140,19 +6148,20 @@ { struct subfile *subfile; char *fullname = concat (dirname, "/", filename, NULL); + make_cleanup (xfree, fullname); for (subfile = subfiles; subfile; subfile = subfile->next) { if (FILENAME_CMP (subfile->name, fullname) == 0) { current_subfile = subfile; - xfree (fullname); + do_cleanups (back_to); return; } } - xfree (fullname); } start_subfile (filename, dirname); + do_cleanups (back_to); } static void --------------080305090306060702090409--