From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 27312 invoked by alias); 3 Mar 2003 18:04:27 -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 27301 invoked from network); 3 Mar 2003 18:04:26 -0000 Received: from unknown (HELO jackfruit.Stanford.EDU) (171.64.38.136) by 172.16.49.205 with SMTP; 3 Mar 2003 18:04:26 -0000 Received: (from carlton@localhost) by jackfruit.Stanford.EDU (8.11.6/8.11.6) id h23I4JP30048; Mon, 3 Mar 2003 10:04:19 -0800 X-Authentication-Warning: jackfruit.Stanford.EDU: carlton set sender to carlton@math.stanford.edu using -f To: Elena Zannoni Cc: gdb-patches@sources.redhat.com, Jim Blandy Subject: Re: [rfa] try to remove uses of DEPRECATED_SYMBOL_NAME in symtab.h References: <15970.39249.629140.373607@localhost.redhat.com> From: David Carlton Date: Mon, 03 Mar 2003 18:04:00 -0000 In-Reply-To: <15970.39249.629140.373607@localhost.redhat.com> Message-ID: User-Agent: Gnus/5.0808 (Gnus v5.8.8) XEmacs/21.4 (Common Lisp) MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-SW-Source: 2003-03/txt/msg00056.txt.bz2 On Sun, 2 Mar 2003 18:52:49 -0500, Elena Zannoni said: > I think it would make more sense to get rid of the REGEXP macro > completely. There are only 4 occurrences, and you are really > simplifying it. This should go in as one commit. > As a separate commit you can check in the rest of this patch, to fix > gdb/33. > i.e. deal with one macro at the time. Good idea. Here's the regexp patch, which I've just committed; I'll prepare the other one in a few minutes. David Carlton carlton@math.stanford.edu 2003-03-03 David Carlton * symtab.h (SYMBOL_MATCHES_REGEXP): Delete. * symtab.c (search_symbols): Replace uses of SYMBOL_MATCHES_REGEXP by regexp matching against SYMBOL_NATURAL_NAME. Index: symtab.h =================================================================== RCS file: /cvs/src/src/gdb/symtab.h,v retrieving revision 1.63 diff -u -p -r1.63 symtab.h --- symtab.h 25 Feb 2003 21:36:20 -0000 1.63 +++ symtab.h 3 Mar 2003 18:00:28 -0000 @@ -222,16 +222,6 @@ extern char *symbol_demangled_name (stru || (SYMBOL_DEMANGLED_NAME (symbol) != NULL \ && strcmp_iw (SYMBOL_DEMANGLED_NAME (symbol), (name)) == 0)) -/* Macro that tests a symbol for an re-match against the last compiled regular - expression. First test the unencoded name, then look for and test a C++ - encoded name if it exists. - Evaluates to zero if the match fails, or nonzero if it succeeds. */ - -#define SYMBOL_MATCHES_REGEXP(symbol) \ - (re_exec (DEPRECATED_SYMBOL_NAME (symbol)) != 0 \ - || (SYMBOL_DEMANGLED_NAME (symbol) != NULL \ - && re_exec (SYMBOL_DEMANGLED_NAME (symbol)) != 0)) - /* Define a simple structure used to hold some very basic information about all defined global symbols (text, data, bss, abs, etc). The only required information is the general_symbol_info. Index: symtab.c =================================================================== RCS file: /cvs/src/src/gdb/symtab.c,v retrieving revision 1.96 diff -u -p -r1.96 symtab.c --- symtab.c 27 Feb 2003 20:48:03 -0000 1.96 +++ symtab.c 3 Mar 2003 18:00:24 -0000 @@ -2931,7 +2931,8 @@ search_symbols (char *regexp, namespace_ /* If it would match (logic taken from loop below) load the file and go on to the next one */ if (file_matches (ps->filename, files, nfiles) - && ((regexp == NULL || SYMBOL_MATCHES_REGEXP (*psym)) + && ((regexp == NULL + || re_exec (SYMBOL_NATURAL_NAME (*psym)) != 0) && ((kind == VARIABLES_NAMESPACE && SYMBOL_CLASS (*psym) != LOC_TYPEDEF && SYMBOL_CLASS (*psym) != LOC_BLOCK) || (kind == FUNCTIONS_NAMESPACE && SYMBOL_CLASS (*psym) == LOC_BLOCK) @@ -2968,7 +2969,8 @@ search_symbols (char *regexp, namespace_ MSYMBOL_TYPE (msymbol) == ourtype3 || MSYMBOL_TYPE (msymbol) == ourtype4) { - if (regexp == NULL || SYMBOL_MATCHES_REGEXP (msymbol)) + if (regexp == NULL + || re_exec (SYMBOL_NATURAL_NAME (msymbol)) != 0) { if (0 == find_pc_symtab (SYMBOL_VALUE_ADDRESS (msymbol))) { @@ -3008,7 +3010,8 @@ search_symbols (char *regexp, namespace_ { QUIT; if (file_matches (s->filename, files, nfiles) - && ((regexp == NULL || SYMBOL_MATCHES_REGEXP (sym)) + && ((regexp == NULL + || re_exec (SYMBOL_NATURAL_NAME (sym)) != 0) && ((kind == VARIABLES_NAMESPACE && SYMBOL_CLASS (sym) != LOC_TYPEDEF && SYMBOL_CLASS (sym) != LOC_BLOCK && SYMBOL_CLASS (sym) != LOC_CONST) @@ -3062,7 +3065,8 @@ search_symbols (char *regexp, namespace_ MSYMBOL_TYPE (msymbol) == ourtype3 || MSYMBOL_TYPE (msymbol) == ourtype4) { - if (regexp == NULL || SYMBOL_MATCHES_REGEXP (msymbol)) + if (regexp == NULL + || re_exec (SYMBOL_NATURAL_NAME (msymbol)) != 0) { /* Functions: Look up by address. */ if (kind != FUNCTIONS_NAMESPACE ||