From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 6435 invoked by alias); 16 Jan 2008 09:55:08 -0000 Received: (qmail 6410 invoked by uid 22791); 16 Jan 2008 09:55:05 -0000 X-Spam-Check-By: sourceware.org Received: from mtagate7.de.ibm.com (HELO mtagate7.de.ibm.com) (195.212.29.156) by sourceware.org (qpsmtpd/0.31) with ESMTP; Wed, 16 Jan 2008 09:54:39 +0000 Received: from d12nrmr1607.megacenter.de.ibm.com (d12nrmr1607.megacenter.de.ibm.com [9.149.167.49]) by mtagate7.de.ibm.com (8.13.8/8.13.8) with ESMTP id m0G9sasv254630 for ; Wed, 16 Jan 2008 09:54:36 GMT Received: from d12av02.megacenter.de.ibm.com (d12av02.megacenter.de.ibm.com [9.149.165.228]) by d12nrmr1607.megacenter.de.ibm.com (8.13.8/8.13.8/NCO v8.7) with ESMTP id m0G9saH42748604 for ; Wed, 16 Jan 2008 10:54:36 +0100 Received: from d12av02.megacenter.de.ibm.com (loopback [127.0.0.1]) by d12av02.megacenter.de.ibm.com (8.12.11.20060308/8.13.3) with ESMTP id m0G9sa7H001984 for ; Wed, 16 Jan 2008 10:54:36 +0100 Received: from bbkeks.de.ibm.com (dyn-9-152-248-46.boeblingen.de.ibm.com [9.152.248.46]) by d12av02.megacenter.de.ibm.com (8.12.11.20060308/8.12.11) with ESMTP id m0G9sYFM001968 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Wed, 16 Jan 2008 10:54:36 +0100 Message-ID: <478DD3EB.3020803@de.ibm.com> Date: Wed, 16 Jan 2008 09:55:00 -0000 From: Markus Deuling User-Agent: Thunderbird 2.0.0.9 (X11/20071031) MIME-Version: 1.0 To: GDB Patches CC: Ulrich Weigand Subject: [rfc] Replace DEPRECATED_STREQ Content-Type: multipart/mixed; boundary="------------060202000806010607000108" 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: 2008-01/txt/msg00389.txt.bz2 This is a multi-part message in MIME format. --------------060202000806010607000108 Content-Type: text/plain; charset=ISO-8859-15; format=flowed Content-Transfer-Encoding: 7bit Content-length: 679 Hi, this patch replaces and removes DEPRECATED_STREQ. Tested on x86 and PowerPC without regression. Is this ok to commit ? ChangeLog: * rs6000-nat.c (add_vmap, vmap_ldinfo, vmap_exec): Replace DEPRECATED_STREQ by its expression. * coffread.c (coff_locate_sections, coff_symtab_read): Likewise. * xcoffread.c (read_xcoff_symtab, read_symbol_lineno, find_linenos) (scan_xcoff_symtab): Likewise. * hppa-hpux-tdep.c (hppa_hpux_skip_trampoline_code): Likewise. * f-lang.c (find_common_for_function): Likewise. * objc-exp.y (parse_number): Likewise. * defs.h (DEPRECATED_STREQ): Remove. -- Markus Deuling GNU Toolchain for Linux on Cell BE deuling@de.ibm.com --------------060202000806010607000108 Content-Type: text/plain; name="diff-DEPRECATED_STREQ" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="diff-DEPRECATED_STREQ" Content-length: 8714 diff -urpN src/gdb/coffread.c dev/gdb/coffread.c --- src/gdb/coffread.c 2008-01-01 23:53:09.000000000 +0100 +++ dev/gdb/coffread.c 2008-01-16 09:48:28.000000000 +0100 @@ -198,7 +198,7 @@ coff_locate_sections (bfd *abfd, asectio csi = (struct coff_symfile_info *) csip; name = bfd_get_section_name (abfd, sectp); - if (DEPRECATED_STREQ (name, ".text")) + if (!strcmp (name, ".text")) { csi->textaddr = bfd_section_vma (abfd, sectp); csi->textsize += bfd_section_size (abfd, sectp); @@ -207,7 +207,7 @@ coff_locate_sections (bfd *abfd, asectio { csi->textsize += bfd_section_size (abfd, sectp); } - else if (DEPRECATED_STREQ (name, ".stabstr")) + else if (!strcmp (name, ".stabstr")) { csi->stabstrsect = sectp; } @@ -823,7 +823,7 @@ coff_symtab_read (long symtab_offset, un case C_THUMBSTATFUNC: if (cs->c_name[0] == '.') { - if (DEPRECATED_STREQ (cs->c_name, ".text")) + if (!strcmp (cs->c_name, ".text")) { /* FIXME: don't wire in ".text" as section name or symbol name! */ @@ -947,7 +947,7 @@ coff_symtab_read (long symtab_offset, un break; case C_FCN: - if (DEPRECATED_STREQ (cs->c_name, ".bf")) + if (!strcmp (cs->c_name, ".bf")) { within_function = 1; @@ -969,7 +969,7 @@ coff_symtab_read (long symtab_offset, un new->name = process_coff_symbol (&fcn_cs_saved, &fcn_aux_saved, objfile); } - else if (DEPRECATED_STREQ (cs->c_name, ".ef")) + else if (!strcmp (cs->c_name, ".ef")) { if (!within_function) error (_("Bad coff function information.")); @@ -1045,13 +1045,13 @@ coff_symtab_read (long symtab_offset, un break; case C_BLOCK: - if (DEPRECATED_STREQ (cs->c_name, ".bb")) + if (!strcmp (cs->c_name, ".bb")) { tmpaddr = cs->c_value; tmpaddr += ANOFFSET (objfile->section_offsets, SECT_OFF_TEXT (objfile)); push_context (++depth, tmpaddr); } - else if (DEPRECATED_STREQ (cs->c_name, ".eb")) + else if (!strcmp (cs->c_name, ".eb")) { if (context_stack_depth <= 0) { /* We attempted to pop an empty context stack */ diff -urpN src/gdb/defs.h dev/gdb/defs.h --- src/gdb/defs.h 2008-01-11 13:28:02.000000000 +0100 +++ dev/gdb/defs.h 2008-01-16 10:03:12.000000000 +0100 @@ -153,7 +153,6 @@ typedef bfd_vma CORE_ADDR; not responsible for any breakage due to code that relied on the old underlying implementation. */ -#define DEPRECATED_STREQ(a,b) (strcmp ((a), (b)) == 0) #define DEPRECATED_STREQN(a,b,c) (strncmp ((a), (b), (c)) == 0) /* Check if a character is one of the commonly used C++ marker characters. */ diff -urpN src/gdb/f-lang.c dev/gdb/f-lang.c --- src/gdb/f-lang.c 2008-01-01 23:53:09.000000000 +0100 +++ dev/gdb/f-lang.c 2008-01-16 09:57:18.000000000 +0100 @@ -637,8 +637,8 @@ find_common_for_function (char *name, ch while (tmp != NULL) { - if (DEPRECATED_STREQ (tmp->name, name) - && DEPRECATED_STREQ (tmp->owning_function, funcname)) + if (!strcmp (tmp->name, name) + && !strcmp (tmp->owning_function, funcname)) return (tmp); else tmp = tmp->next; diff -urpN src/gdb/hppa-hpux-tdep.c dev/gdb/hppa-hpux-tdep.c --- src/gdb/hppa-hpux-tdep.c 2008-01-01 23:53:10.000000000 +0100 +++ dev/gdb/hppa-hpux-tdep.c 2008-01-16 09:56:39.000000000 +0100 @@ -376,7 +376,8 @@ hppa_hpux_skip_trampoline_code (struct f ALL_MSYMBOLS (objfile, msymbol) { if (MSYMBOL_TYPE (msymbol) == mst_text - && DEPRECATED_STREQ (DEPRECATED_SYMBOL_NAME (msymbol), DEPRECATED_SYMBOL_NAME (msym))) + && !strcmp (DEPRECATED_SYMBOL_NAME (msymbol), + DEPRECATED_SYMBOL_NAME (msym))) { function_found = 1; break; diff -urpN src/gdb/objc-exp.y dev/gdb/objc-exp.y --- src/gdb/objc-exp.y 2008-01-10 10:37:22.000000000 +0100 +++ dev/gdb/objc-exp.y 2008-01-16 09:59:03.000000000 +0100 @@ -680,7 +680,7 @@ qualified_name: typebase COLONCOLON name error ("`%s' is not defined as an aggregate type.", TYPE_NAME (type)); - if (!DEPRECATED_STREQ (type_name_no_tag (type), $4.ptr)) + if (strcmp (type_name_no_tag (type), $4.ptr)) error ("invalid destructor `%s::~%s'", type_name_no_tag (type), $4.ptr); diff -urpN src/gdb/rs6000-nat.c dev/gdb/rs6000-nat.c --- src/gdb/rs6000-nat.c 2008-01-01 23:53:12.000000000 +0100 +++ dev/gdb/rs6000-nat.c 2008-01-16 09:42:29.000000000 +0100 @@ -762,7 +762,7 @@ add_vmap (LdInfo *ldi) last = 0; /* FIXME??? am I tossing BFDs? bfd? */ while ((last = bfd_openr_next_archived_file (abfd, last))) - if (DEPRECATED_STREQ (mem, last->filename)) + if (strcmp (mem, last->filename) == 0) break; if (!last) @@ -846,8 +846,8 @@ vmap_ldinfo (LdInfo *ldi) /* The filenames are not always sufficient to match on. */ - if ((name[0] == '/' && !DEPRECATED_STREQ (name, vp->name)) - || (memb[0] && !DEPRECATED_STREQ (memb, vp->member))) + if ((name[0] == '/' && strcmp (name, vp->name)) + || (memb[0] && strcmp (memb, vp->member))) continue; /* See if we are referring to the same file. @@ -944,17 +944,17 @@ vmap_exec (void) for (i = 0; &exec_ops.to_sections[i] < exec_ops.to_sections_end; i++) { - if (DEPRECATED_STREQ (".text", exec_ops.to_sections[i].the_bfd_section->name)) + if (!strcmp (".text", exec_ops.to_sections[i].the_bfd_section->name)) { exec_ops.to_sections[i].addr += vmap->tstart - vmap->tvma; exec_ops.to_sections[i].endaddr += vmap->tstart - vmap->tvma; } - else if (DEPRECATED_STREQ (".data", exec_ops.to_sections[i].the_bfd_section->name)) + else if (!strcmp (".data", exec_ops.to_sections[i].the_bfd_section->name)) { exec_ops.to_sections[i].addr += vmap->dstart - vmap->dvma; exec_ops.to_sections[i].endaddr += vmap->dstart - vmap->dvma; } - else if (DEPRECATED_STREQ (".bss", exec_ops.to_sections[i].the_bfd_section->name)) + else if (!strcmp (".bss", exec_ops.to_sections[i].the_bfd_section->name)) { exec_ops.to_sections[i].addr += vmap->dstart - vmap->dvma; exec_ops.to_sections[i].endaddr += vmap->dstart - vmap->dvma; diff -urpN src/gdb/xcoffread.c dev/gdb/xcoffread.c --- src/gdb/xcoffread.c 2008-01-01 23:53:13.000000000 +0100 +++ dev/gdb/xcoffread.c 2008-01-16 09:51:08.000000000 +0100 @@ -1251,7 +1251,7 @@ read_xcoff_symtab (struct partial_symtab break; case C_FCN: - if (DEPRECATED_STREQ (cs->c_name, ".bf")) + if (!strcmp (cs->c_name, ".bf")) { CORE_ADDR off = ANOFFSET (objfile->section_offsets, SECT_OFF_TEXT (objfile)); @@ -1268,7 +1268,7 @@ read_xcoff_symtab (struct partial_symtab if (new->name != NULL) SYMBOL_SECTION (new->name) = SECT_OFF_TEXT (objfile); } - else if (DEPRECATED_STREQ (cs->c_name, ".ef")) + else if (!strcmp (cs->c_name, ".ef")) { bfd_coff_swap_aux_in (abfd, raw_auxptr, cs->c_type, cs->c_sclass, @@ -1362,7 +1362,7 @@ read_xcoff_symtab (struct partial_symtab break; case C_BLOCK: - if (DEPRECATED_STREQ (cs->c_name, ".bb")) + if (!strcmp (cs->c_name, ".bb")) { depth++; new = push_context (depth, @@ -1370,7 +1370,7 @@ read_xcoff_symtab (struct partial_symtab + ANOFFSET (objfile->section_offsets, SECT_OFF_TEXT (objfile)))); } - else if (DEPRECATED_STREQ (cs->c_name, ".eb")) + else if (!strcmp (cs->c_name, ".eb")) { if (context_stack_depth <= 0) { /* We attempted to pop an empty context stack */ @@ -1666,7 +1666,7 @@ read_symbol_lineno (int symno) if (symbol->n_sclass == C_FCN) { char *name = xcoff64 ? strtbl + symbol->n_offset : symbol->n_name; - if (DEPRECATED_STREQ (name, ".bf")) + if (!strcmp (name, ".bf")) goto gotit; } symno += symbol->n_numaux + 1; @@ -1700,7 +1700,7 @@ find_linenos (struct bfd *abfd, struct b count = asect->lineno_count; - if (!DEPRECATED_STREQ (asect->name, ".text") || count == 0) + if (strcmp (asect->name, ".text") || count == 0) return; size = count * coff_data (abfd)->local_linesz; @@ -2525,12 +2525,12 @@ scan_xcoff_symtab (struct objfile *objfi things like "break c-exp.y:435" need to work (I suppose the psymtab_include_list could be hashed or put in a binary tree, if profiling shows this is a major hog). */ - if (pst && DEPRECATED_STREQ (namestring, pst->filename)) + if (pst && !strcmp (namestring, pst->filename)) continue; { int i; for (i = 0; i < includes_used; i++) - if (DEPRECATED_STREQ (namestring, psymtab_include_list[i])) + if (!strcmp (namestring, psymtab_include_list[i])) { i = -1; break; --------------060202000806010607000108--