From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 3716 invoked by alias); 5 Aug 2011 18:33:12 -0000 Mailing-List: contact archer-commits-help@sourceware.org; run by ezmlm Sender: Precedence: bulk List-Post: List-Help: List-Subscribe: Received: (qmail 3687 invoked by uid 306); 5 Aug 2011 18:33:11 -0000 Date: Fri, 05 Aug 2011 18:33:00 -0000 Message-ID: <20110805183311.3672.qmail@sourceware.org> From: tromey@sourceware.org To: archer-commits@sourceware.org Subject: [SCM] archer-tromey-ambiguous-linespec: fix testsuite/configure buglet X-Git-Refname: refs/heads/archer-tromey-ambiguous-linespec X-Git-Reftype: branch X-Git-Oldrev: 7100f1170ff36ec2ce19365b0d09b97368b9e139 X-Git-Newrev: d0fbe192166f55926023e0dc3e6bf980b5587371 X-SW-Source: 2011-q3/txt/msg00079.txt.bz2 List-Id: The branch, archer-tromey-ambiguous-linespec has been updated via d0fbe192166f55926023e0dc3e6bf980b5587371 (commit) via 73d1496924d593d1fd332d6b7f638866ca060d0a (commit) from 7100f1170ff36ec2ce19365b0d09b97368b9e139 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email. - Log ----------------------------------------------------------------- commit d0fbe192166f55926023e0dc3e6bf980b5587371 Author: Tom Tromey Date: Fri Aug 5 12:33:05 2011 -0600 fix testsuite/configure buglet commit 73d1496924d593d1fd332d6b7f638866ca060d0a Author: Tom Tromey Date: Fri Aug 5 11:57:41 2011 -0600 reimplement decode_dollar in terms of decode_variable ----------------------------------------------------------------------- Summary of changes: gdb/linespec.c | 26 ++++++++++++-------------- gdb/testsuite/configure | 4 ++-- gdb/testsuite/configure.ac | 2 +- 3 files changed, 15 insertions(+), 17 deletions(-) First 500 lines of diff: diff --git a/gdb/linespec.c b/gdb/linespec.c index de66383..af4a935 100644 --- a/gdb/linespec.c +++ b/gdb/linespec.c @@ -2213,20 +2213,18 @@ decode_dollar (struct linespec_state *self, char *copy) /* Not all digits -- may be user variable/function or a convenience variable. */ - /* Look up entire name as a symbol first. */ - sym = lookup_symbol (copy, 0, VAR_DOMAIN, 0); - self->file_symtabs = NULL; - need_canonical = 1; - /* Symbol was found --> jump to normal symbol processing. */ - if (sym) - return symbol_found (self->funfirstline, self->canonical, copy, sym, - NULL, NULL); + volatile struct gdb_exception exc; - /* If symbol was not found, look in minimal symbol tables. */ - msymbol = lookup_minimal_symbol (copy, NULL, NULL); - /* Min symbol was found --> jump to minsym processing. */ - if (msymbol) - return minsym_found (self->funfirstline, msymbol); + TRY_CATCH (exc, RETURN_MASK_ERROR) + { + values = decode_variable (self, copy); + } + + if (exc.reason == 0) + return values; + + if (exc.error != NOT_FOUND_ERROR) + throw_exception (exc); /* Not a user variable or function -- must be convenience variable. */ if (!get_internalvar_integer (lookup_internalvar (copy + 1), &valx)) diff --git a/gdb/testsuite/configure b/gdb/testsuite/configure index 6d94633..fb70b3d 100755 --- a/gdb/testsuite/configure +++ b/gdb/testsuite/configure @@ -3448,7 +3448,7 @@ done -ac_config_files="$ac_config_files Makefile gdb.ada/Makefile gdb.arch/Makefile gdb.asm/Makefile gdb.base/Makefile gdb.cell/Makefile gdb.cp/Makefile gdb.disasm/Makefile gdb.dwarf2/Makefile gdb.fortran/Makefile gdb.server/Makefile gdb.java/Makefile gdb.hp/Makefile gdb.hp/gdb.objdbg/Makefile gdb.hp/gdb.base-hp/Makefile gdb.hp/gdb.aCC/Makefile gdb.hp/gdb.compat/Makefile gdb.hp/gdb.defects/Makefile gdb.linespec gdb.mi/Makefile gdb.modula2/Makefile gdb.multi/Makefile gdb.objc/Makefile gdb.opencl/Makefile gdb.opt/Makefile gdb.pascal/Makefile gdb.python/Makefile gdb.reverse/Makefile gdb.stabs/Makefile gdb.threads/Makefile gdb.trace/Makefile gdb.xml/Makefile" +ac_config_files="$ac_config_files Makefile gdb.ada/Makefile gdb.arch/Makefile gdb.asm/Makefile gdb.base/Makefile gdb.cell/Makefile gdb.cp/Makefile gdb.disasm/Makefile gdb.dwarf2/Makefile gdb.fortran/Makefile gdb.server/Makefile gdb.java/Makefile gdb.hp/Makefile gdb.hp/gdb.objdbg/Makefile gdb.hp/gdb.base-hp/Makefile gdb.hp/gdb.aCC/Makefile gdb.hp/gdb.compat/Makefile gdb.hp/gdb.defects/Makefile gdb.linespec/Makefile gdb.mi/Makefile gdb.modula2/Makefile gdb.multi/Makefile gdb.objc/Makefile gdb.opencl/Makefile gdb.opt/Makefile gdb.pascal/Makefile gdb.python/Makefile gdb.reverse/Makefile gdb.stabs/Makefile gdb.threads/Makefile gdb.trace/Makefile gdb.xml/Makefile" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure @@ -4166,7 +4166,7 @@ do "gdb.hp/gdb.aCC/Makefile") CONFIG_FILES="$CONFIG_FILES gdb.hp/gdb.aCC/Makefile" ;; "gdb.hp/gdb.compat/Makefile") CONFIG_FILES="$CONFIG_FILES gdb.hp/gdb.compat/Makefile" ;; "gdb.hp/gdb.defects/Makefile") CONFIG_FILES="$CONFIG_FILES gdb.hp/gdb.defects/Makefile" ;; - "gdb.linespec") CONFIG_FILES="$CONFIG_FILES gdb.linespec" ;; + "gdb.linespec/Makefile") CONFIG_FILES="$CONFIG_FILES gdb.linespec/Makefile" ;; "gdb.mi/Makefile") CONFIG_FILES="$CONFIG_FILES gdb.mi/Makefile" ;; "gdb.modula2/Makefile") CONFIG_FILES="$CONFIG_FILES gdb.modula2/Makefile" ;; "gdb.multi/Makefile") CONFIG_FILES="$CONFIG_FILES gdb.multi/Makefile" ;; diff --git a/gdb/testsuite/configure.ac b/gdb/testsuite/configure.ac index 2213e40..121fd37 100644 --- a/gdb/testsuite/configure.ac +++ b/gdb/testsuite/configure.ac @@ -95,7 +95,7 @@ AC_OUTPUT([Makefile \ gdb.fortran/Makefile gdb.server/Makefile gdb.java/Makefile \ gdb.hp/Makefile gdb.hp/gdb.objdbg/Makefile gdb.hp/gdb.base-hp/Makefile \ gdb.hp/gdb.aCC/Makefile gdb.hp/gdb.compat/Makefile \ - gdb.hp/gdb.defects/Makefile gdb.linespec \ + gdb.hp/gdb.defects/Makefile gdb.linespec/Makefile \ gdb.mi/Makefile gdb.modula2/Makefile gdb.multi/Makefile \ gdb.objc/Makefile gdb.opencl/Makefile gdb.opt/Makefile gdb.pascal/Makefile \ gdb.python/Makefile gdb.reverse/Makefile gdb.stabs/Makefile \ hooks/post-receive -- Repository for Project Archer.