From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 17655 invoked by alias); 21 Jan 2003 00:58:06 -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 17647 invoked from network); 21 Jan 2003 00:58:05 -0000 Received: from unknown (HELO jackfruit.Stanford.EDU) (171.64.38.136) by 172.16.49.205 with SMTP; 21 Jan 2003 00:58:05 -0000 Received: (from carlton@localhost) by jackfruit.Stanford.EDU (8.11.6/8.11.6) id h0L0w3U20377; Mon, 20 Jan 2003 16:58:04 -0800 X-Authentication-Warning: jackfruit.Stanford.EDU: carlton set sender to carlton@math.stanford.edu using -f To: gdb-patches@sources.redhat.com Subject: [rfa] delete macro SYMBOL_LINKAGE_NAME Cc: Elena Zannoni , Jim Blandy From: David Carlton Date: Tue, 21 Jan 2003 00:58:00 -0000 Message-ID: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-SW-Source: 2003-01/txt/msg00682.txt.bz2 This is the first part of my plan to clean up symbol accessors. It deletes the macro SYMBOL_LINKAGE_NAME: that macro is only used in two places in one function, and is easy to replace by an equivalent use of asm_demangle, SYMBOL_SOURCE_NAME, and SYMBOL_NAME. Given that I'd like to use the name SYMBOL_LINKAGE_NAME for something else, I'd like to get rid of its current use. Tested on i686-pc-linux-gnu/GCC3.1/DWARF-2 (and seems obviously correct by inspection, assuming that you agree that its goal is valid). OK to commit? David Carlton carlton@math.stanford.edu 2003-01-20 David Carlton * symtab.h (SYMBOL_LINKAGE_NAME): Delete. * printcmd.c (build_address_symbolic): Replace uses of SYMBOL_LINKAGE_NAME by equivalent uses of SYMBOL_SOURCE_NAME, SYMBOL_NAME, and asm_demangle. Update copyright. Index: symtab.h =================================================================== RCS file: /cvs/src/src/gdb/symtab.h,v retrieving revision 1.55 diff -u -p -r1.55 symtab.h --- symtab.h 19 Jan 2003 04:06:46 -0000 1.55 +++ symtab.h 21 Jan 2003 00:18:36 -0000 @@ -172,17 +172,6 @@ extern char *symbol_demangled_name (stru ? SYMBOL_DEMANGLED_NAME (symbol) \ : SYMBOL_NAME (symbol)) -/* Macro that returns the "natural assembly name" of a symbol. In C++ this is - the "mangled" form of the name if demangle is off, or if demangle is on and - asm_demangle is off. Otherwise if asm_demangle is on it is the "demangled" - form. In other languages this is just the symbol name. The result should - never be NULL. */ - -#define SYMBOL_LINKAGE_NAME(symbol) \ - (demangle && asm_demangle && SYMBOL_DEMANGLED_NAME (symbol) != NULL \ - ? SYMBOL_DEMANGLED_NAME (symbol) \ - : SYMBOL_NAME (symbol)) - /* Macro that tests a symbol for a match against a specified name string. First test the unencoded name, then looks for and test a C++ encoded name if it exists. Note that whitespace is ignored while attempting to Index: printcmd.c =================================================================== RCS file: /cvs/src/src/gdb/printcmd.c,v retrieving revision 1.50 diff -u -p -r1.50 printcmd.c --- printcmd.c 21 Nov 2002 18:54:44 -0000 1.50 +++ printcmd.c 21 Jan 2003 00:56:47 -0000 @@ -1,7 +1,7 @@ /* Print values for GNU debugger GDB. Copyright 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994, - 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 Free Software + 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc. This file is part of GDB. @@ -639,10 +639,10 @@ build_address_symbolic (CORE_ADDR addr, if (symbol) { name_location = BLOCK_START (SYMBOL_BLOCK_VALUE (symbol)); - if (do_demangle) + if (do_demangle || asm_demangle) name_temp = SYMBOL_SOURCE_NAME (symbol); else - name_temp = SYMBOL_LINKAGE_NAME (symbol); + name_temp = SYMBOL_NAME (symbol); } if (msymbol != NULL) @@ -654,10 +654,10 @@ build_address_symbolic (CORE_ADDR addr, symbol = 0; symtab = 0; name_location = SYMBOL_VALUE_ADDRESS (msymbol); - if (do_demangle) + if (do_demangle || asm_demangle) name_temp = SYMBOL_SOURCE_NAME (msymbol); else - name_temp = SYMBOL_LINKAGE_NAME (msymbol); + name_temp = SYMBOL_NAME (msymbol); } } if (symbol == NULL && msymbol == NULL)