From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 25259 invoked by alias); 9 Nov 2009 20:31:01 -0000 Received: (qmail 25247 invoked by uid 22791); 9 Nov 2009 20:31:00 -0000 X-SWARE-Spam-Status: No, hits=-2.5 required=5.0 tests=AWL,BAYES_00 X-Spam-Check-By: sourceware.org Received: from smtp1-g21.free.fr (HELO smtp1-g21.free.fr) (212.27.42.1) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Mon, 09 Nov 2009 20:30:54 +0000 Received: from smtp1-g21.free.fr (localhost [127.0.0.1]) by smtp1-g21.free.fr (Postfix) with ESMTP id ACD86940210; Mon, 9 Nov 2009 21:30:47 +0100 (CET) Received: from [192.168.0.11] (cvl92-3-82-247-217-100.fbx.proxad.net [82.247.217.100]) by smtp1-g21.free.fr (Postfix) with ESMTP id 8EE1894022E; Mon, 9 Nov 2009 21:30:44 +0100 (CET) Message-ID: <4AF87BF4.5040303@free.fr> Date: Mon, 09 Nov 2009 20:31:00 -0000 From: =?ISO-8859-1?Q?S=E9bastien_Granjoux?= User-Agent: Thunderbird 2.0.0.23 (X11/20090822) MIME-Version: 1.0 To: gdb-patches@sourceware.org CC: Joel Brobecker Subject: Re: Fix breakpoints when several source files have the same name Content-Type: multipart/mixed; boundary="------------010003000201060601020209" X-IsSubscribed: yes 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 X-SW-Source: 2009-11/txt/msg00163.txt.bz2 This is a multi-part message in MIME format. --------------010003000201060601020209 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 8bit Content-length: 100 Hi, I have sent an updated patch to fix bug 9583, it is waiting for a review. Regards, Sébastien --------------010003000201060601020209 Content-Type: text/plain; name="fix_multiple_breakpoint3.path" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="fix_multiple_breakpoint3.path" Content-length: 6319 ? .deps ? .gdbinit ? Makefile ? ada-exp.c ? ada-lex.c ? c-exp.c ? config.cache ? config.h ? config.log ? config.status ? cp-name-parser.c ? f-exp.c ? gdb ? gdbtui ? init.c ? jv-exp.c ? m2-exp.c ? objc-exp.c ? observer.h ? observer.inc ? p-exp.c ? stamp-h ? stamp-h1 ? stamp-xml ? toto ? toto2 ? version.c ? xml-builtin.c ? doc/Makefile ? doc/config.log ? doc/config.status ? gdbserver/Makefile ? gdbserver/config.h ? gdbserver/config.log ? gdbserver/config.status ? gdbserver/gdbreplay ? gdbserver/gdbserver ? gdbserver/reg-i386-linux.c ? gdbserver/stamp-h ? gdbserver/version.c ? gnulib/.deps ? gnulib/Makefile ? gnulib/string.h ? testsuite/Makefile ? testsuite/config.log ? testsuite/config.status ? testsuite/gdb.ada/Makefile ? testsuite/gdb.arch/Makefile ? testsuite/gdb.asm/Makefile ? testsuite/gdb.base/Makefile ? testsuite/gdb.cp/Makefile ? testsuite/gdb.disasm/Makefile ? testsuite/gdb.dwarf2/Makefile ? testsuite/gdb.fortran/Makefile ? testsuite/gdb.java/Makefile ? testsuite/gdb.mi/Makefile ? testsuite/gdb.modula2/Makefile ? testsuite/gdb.objc/Makefile ? testsuite/gdb.opt/Makefile ? testsuite/gdb.pascal/Makefile ? testsuite/gdb.python/Makefile ? testsuite/gdb.reverse/Makefile ? testsuite/gdb.server/Makefile ? testsuite/gdb.stabs/Makefile ? testsuite/gdb.stabs/config.log ? testsuite/gdb.stabs/config.status ? testsuite/gdb.threads/Makefile ? testsuite/gdb.trace/Makefile ? testsuite/gdb.xml/Makefile Index: symtab.c =================================================================== RCS file: /cvs/src/src/gdb/symtab.c,v retrieving revision 1.216 diff -c -p -r1.216 symtab.c *** symtab.c 19 Oct 2009 09:51:42 -0000 1.216 --- symtab.c 29 Oct 2009 21:39:30 -0000 *************** find_line_symtab (struct symtab *symtab, *** 2416,2433 **** ALL_PSYMTABS (objfile, p) { ! if (strcmp (symtab->filename, p->filename) != 0) continue; PSYMTAB_TO_SYMTAB (p); } ALL_SYMTABS (objfile, s) { struct linetable *l; int ind; ! if (strcmp (symtab->filename, s->filename) != 0) continue; l = LINETABLE (s); ind = find_line_common (l, line, &exact); if (ind >= 0) --- 2416,2440 ---- ALL_PSYMTABS (objfile, p) { ! if (FILENAME_CMP (symtab->filename, p->filename) != 0) continue; PSYMTAB_TO_SYMTAB (p); } + /* Get symbol full file name if possible. */ + symtab_to_fullname (symtab); + ALL_SYMTABS (objfile, s) { struct linetable *l; int ind; ! if (FILENAME_CMP (symtab->filename, s->filename) != 0) continue; + if (symtab->fullname != NULL + && symtab_to_fullname (s) != NULL + && FILENAME_CMP (symtab->fullname, s->fullname) != 0) + continue; l = LINETABLE (s); ind = find_line_common (l, line, &exact); if (ind >= 0) *************** append_expanded_sal (struct symtabs_and_ *** 4591,4602 **** } /* Helper to expand_line_sal below. Search in the symtabs for any ! linetable entry that exactly matches FILENAME and LINENO and append ! them to RET. If there is at least one match, return 1; otherwise, ! return 0, and return the best choice in BEST_ITEM and BEST_SYMTAB. */ static int ! append_exact_match_to_sals (char *filename, int lineno, struct symtabs_and_lines *ret, struct linetable_entry **best_item, struct symtab **best_symtab) --- 4598,4611 ---- } /* Helper to expand_line_sal below. Search in the symtabs for any ! linetable entry that exactly matches FULLNAME and LINENO and append ! them to RET. If FULLNAME is NULL or if a symbol has no full name, ! use FILENAME and LINENO instead. If there is at least one match, ! return 1; otherwise, return 0, and return the best choice in BEST_ITEM ! and BEST_SYMTAB. */ static int ! append_exact_match_to_sals (char *filename, char *fullname, int lineno, struct symtabs_and_lines *ret, struct linetable_entry **best_item, struct symtab **best_symtab) *************** append_exact_match_to_sals (char *filena *** 4612,4621 **** ALL_PSPACES (pspace) ALL_PSPACE_SYMTABS (pspace, objfile, symtab) { ! if (strcmp (filename, symtab->filename) == 0) { struct linetable *l; int len; l = LINETABLE (symtab); if (!l) continue; --- 4621,4634 ---- ALL_PSPACES (pspace) ALL_PSPACE_SYMTABS (pspace, objfile, symtab) { ! if (FILENAME_CMP (filename, symtab->filename) == 0) { struct linetable *l; int len; + if (fullname != NULL + && symtab_to_fullname (symtab) != NULL + && FILENAME_CMP (fullname, symtab->fullname) != 0) + continue; l = LINETABLE (symtab); if (!l) continue; *************** expand_line_sal (struct symtab_and_line *** 4700,4706 **** ALL_PSPACES (pspace) ALL_PSPACE_PSYMTABS (pspace, objfile, psymtab) { ! if (strcmp (match_filename, psymtab->filename) == 0) { set_current_program_space (pspace); --- 4713,4719 ---- ALL_PSPACES (pspace) ALL_PSPACE_PSYMTABS (pspace, objfile, psymtab) { ! if (FILENAME_CMP (match_filename, psymtab->filename) == 0) { set_current_program_space (pspace); *************** expand_line_sal (struct symtab_and_line *** 4712,4721 **** /* Now search the symtab for exact matches and append them. If none is found, append the best_item and all its exact matches. */ ! exact = append_exact_match_to_sals (match_filename, lineno, &ret, &best_item, &best_symtab); if (!exact && best_item) ! append_exact_match_to_sals (best_symtab->filename, best_item->line, &ret, &best_item, &best_symtab); } --- 4725,4737 ---- /* Now search the symtab for exact matches and append them. If none is found, append the best_item and all its exact matches. */ ! symtab_to_fullname (sal.symtab); ! exact = append_exact_match_to_sals (sal.symtab->filename, ! sal.symtab->fullname, lineno, &ret, &best_item, &best_symtab); if (!exact && best_item) ! append_exact_match_to_sals (best_symtab->filename, ! best_symtab->fullname, best_item->line, &ret, &best_item, &best_symtab); } --------------010003000201060601020209 Content-Type: text/plain; name="ChangeLog.txt" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="ChangeLog.txt" Content-length: 200 2009-10-29 Sebastien Granjoux PR mi/9583: * symtab.c (find_line_symtab, append_exact_match_to_sals) (expand_line_sal): Use full filename when setting breakpoints if available --------------010003000201060601020209--