From patchwork Thu Jul 23 02:23:17 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Doug Evans X-Patchwork-Id: 7804 Received: (qmail 111314 invoked by alias); 23 Jul 2015 02:24:24 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Delivered-To: mailing list gdb-patches@sourceware.org Received: (qmail 111253 invoked by uid 89); 23 Jul 2015 02:24:11 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.1 required=5.0 tests=AWL, BAYES_00, FREEMAIL_ENVFROM_END_DIGIT, FREEMAIL_FROM, KAM_STOCKGEN, RCVD_IN_DNSWL_LOW, SPF_PASS autolearn=no version=3.3.2 X-HELO: mail-pd0-f170.google.com Received: from mail-pd0-f170.google.com (HELO mail-pd0-f170.google.com) (209.85.192.170) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES128-GCM-SHA256 encrypted) ESMTPS; Thu, 23 Jul 2015 02:24:09 +0000 Received: by pdbnt7 with SMTP id nt7so77253747pdb.0 for ; Wed, 22 Jul 2015 19:24:07 -0700 (PDT) X-Received: by 10.66.144.40 with SMTP id sj8mr12719622pab.55.1437618247227; Wed, 22 Jul 2015 19:24:07 -0700 (PDT) Received: from seba.sebabeach.org.gmail.com (173-13-178-53-sfba.hfc.comcastbusiness.net. [173.13.178.53]) by smtp.gmail.com with ESMTPSA id p9sm5625815pds.92.2015.07.22.19.24.06 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 22 Jul 2015 19:24:06 -0700 (PDT) From: Doug Evans To: gdb-patches@sourceware.org Subject: [PATCH] Remove "val" arg to add_psymbol_to_bcache Date: Wed, 22 Jul 2015 19:23:17 -0700 Message-ID: MIME-Version: 1.0 X-IsSubscribed: yes Hi. The "val" arg to add_psymbol_to_bcache and add_psymbol_to_list is unused. Regression tested on amd64-linux. 2015-07-22 Doug Evans * psymtab.c (add_psymbol_to_bcache): Remove "val" arg. All callers updated. (add_psymbol_to_list): Ditto. diff --git a/gdb/dbxread.c b/gdb/dbxread.c index 6098b35..3fc3760 100644 --- a/gdb/dbxread.c +++ b/gdb/dbxread.c @@ -1704,8 +1704,7 @@ read_dbx_symtab (struct objfile *objfile) add_psymbol_to_list (sym_name, sym_len, 1, VAR_DOMAIN, LOC_STATIC, &objfile->static_psymbols, - 0, nlist.n_value, - psymtab_language, objfile); + nlist.n_value, psymtab_language, objfile); continue; case 'G': @@ -1716,8 +1715,7 @@ read_dbx_symtab (struct objfile *objfile) add_psymbol_to_list (sym_name, sym_len, 1, VAR_DOMAIN, LOC_STATIC, &objfile->global_psymbols, - 0, nlist.n_value, - psymtab_language, objfile); + nlist.n_value, psymtab_language, objfile); continue; case 'T': @@ -1734,16 +1732,14 @@ read_dbx_symtab (struct objfile *objfile) add_psymbol_to_list (sym_name, sym_len, 1, STRUCT_DOMAIN, LOC_TYPEDEF, &objfile->static_psymbols, - nlist.n_value, 0, - psymtab_language, objfile); + 0, psymtab_language, objfile); if (p[2] == 't') { /* Also a typedef with the same name. */ add_psymbol_to_list (sym_name, sym_len, 1, VAR_DOMAIN, LOC_TYPEDEF, &objfile->static_psymbols, - nlist.n_value, 0, - psymtab_language, objfile); + 0, psymtab_language, objfile); p += 1; } } @@ -1755,8 +1751,7 @@ read_dbx_symtab (struct objfile *objfile) add_psymbol_to_list (sym_name, sym_len, 1, VAR_DOMAIN, LOC_TYPEDEF, &objfile->static_psymbols, - nlist.n_value, 0, - psymtab_language, objfile); + 0, psymtab_language, objfile); } check_enum: /* If this is an enumerated type, we need to @@ -1817,7 +1812,7 @@ read_dbx_symtab (struct objfile *objfile) add_psymbol_to_list (p, q - p, 1, VAR_DOMAIN, LOC_CONST, &objfile->static_psymbols, 0, - 0, psymtab_language, objfile); + psymtab_language, objfile); /* Point past the name. */ p = q; /* Skip over the value. */ @@ -1834,8 +1829,8 @@ read_dbx_symtab (struct objfile *objfile) /* Constant, e.g. from "const" in Pascal. */ add_psymbol_to_list (sym_name, sym_len, 1, VAR_DOMAIN, LOC_CONST, - &objfile->static_psymbols, nlist.n_value, - 0, psymtab_language, objfile); + &objfile->static_psymbols, 0, + psymtab_language, objfile); continue; case 'f': @@ -1901,8 +1896,7 @@ read_dbx_symtab (struct objfile *objfile) add_psymbol_to_list (sym_name, sym_len, 1, VAR_DOMAIN, LOC_BLOCK, &objfile->static_psymbols, - 0, nlist.n_value, - psymtab_language, objfile); + nlist.n_value, psymtab_language, objfile); continue; /* Global functions were ignored here, but now they @@ -1971,8 +1965,7 @@ read_dbx_symtab (struct objfile *objfile) add_psymbol_to_list (sym_name, sym_len, 1, VAR_DOMAIN, LOC_BLOCK, &objfile->global_psymbols, - 0, nlist.n_value, - psymtab_language, objfile); + nlist.n_value, psymtab_language, objfile); continue; /* Two things show up here (hopefully); static symbols of diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c index f440956..ee4c2f9 100644 --- a/gdb/dwarf2read.c +++ b/gdb/dwarf2read.c @@ -6905,7 +6905,7 @@ add_partial_symbol (struct partial_die_info *pdi, struct dwarf2_cu *cu) built_actual_name != NULL, VAR_DOMAIN, LOC_BLOCK, &objfile->global_psymbols, - 0, addr, cu->language, objfile); + addr, cu->language, objfile); } else { @@ -6915,7 +6915,7 @@ add_partial_symbol (struct partial_die_info *pdi, struct dwarf2_cu *cu) built_actual_name != NULL, VAR_DOMAIN, LOC_BLOCK, &objfile->static_psymbols, - 0, addr, cu->language, objfile); + addr, cu->language, objfile); } break; case DW_TAG_constant: @@ -6928,7 +6928,7 @@ add_partial_symbol (struct partial_die_info *pdi, struct dwarf2_cu *cu) list = &objfile->static_psymbols; add_psymbol_to_list (actual_name, strlen (actual_name), built_actual_name != NULL, VAR_DOMAIN, LOC_STATIC, - list, 0, 0, cu->language, objfile); + list, 0, cu->language, objfile); } break; case DW_TAG_variable: @@ -6964,7 +6964,7 @@ add_partial_symbol (struct partial_die_info *pdi, struct dwarf2_cu *cu) built_actual_name != NULL, VAR_DOMAIN, LOC_STATIC, &objfile->global_psymbols, - 0, addr + baseaddr, + addr + baseaddr, cu->language, objfile); } else @@ -6985,7 +6985,6 @@ add_partial_symbol (struct partial_die_info *pdi, struct dwarf2_cu *cu) built_actual_name != NULL, VAR_DOMAIN, LOC_STATIC, &objfile->static_psymbols, - 0, has_loc ? addr + baseaddr : (CORE_ADDR) 0, cu->language, objfile); } @@ -6997,7 +6996,7 @@ add_partial_symbol (struct partial_die_info *pdi, struct dwarf2_cu *cu) built_actual_name != NULL, VAR_DOMAIN, LOC_TYPEDEF, &objfile->static_psymbols, - 0, (CORE_ADDR) 0, cu->language, objfile); + 0, cu->language, objfile); break; case DW_TAG_imported_declaration: case DW_TAG_namespace: @@ -7005,14 +7004,14 @@ add_partial_symbol (struct partial_die_info *pdi, struct dwarf2_cu *cu) built_actual_name != NULL, VAR_DOMAIN, LOC_TYPEDEF, &objfile->global_psymbols, - 0, (CORE_ADDR) 0, cu->language, objfile); + 0, cu->language, objfile); break; case DW_TAG_module: add_psymbol_to_list (actual_name, strlen (actual_name), built_actual_name != NULL, MODULE_DOMAIN, LOC_TYPEDEF, &objfile->global_psymbols, - 0, (CORE_ADDR) 0, cu->language, objfile); + 0, cu->language, objfile); break; case DW_TAG_class_type: case DW_TAG_interface_type: @@ -7039,7 +7038,7 @@ add_partial_symbol (struct partial_die_info *pdi, struct dwarf2_cu *cu) || cu->language == language_java) ? &objfile->global_psymbols : &objfile->static_psymbols, - 0, (CORE_ADDR) 0, cu->language, objfile); + 0, cu->language, objfile); break; case DW_TAG_enumerator: @@ -7050,7 +7049,7 @@ add_partial_symbol (struct partial_die_info *pdi, struct dwarf2_cu *cu) || cu->language == language_java) ? &objfile->global_psymbols : &objfile->static_psymbols, - 0, (CORE_ADDR) 0, cu->language, objfile); + 0, cu->language, objfile); break; default: break; @@ -15612,7 +15611,7 @@ load_partial_dies (const struct die_reader_specs *reader, add_psymbol_to_list (part_die->name, strlen (part_die->name), 0, VAR_DOMAIN, LOC_TYPEDEF, &objfile->static_psymbols, - 0, (CORE_ADDR) 0, cu->language, objfile); + 0, cu->language, objfile); info_ptr = locate_pdi_sibling (reader, part_die, info_ptr); continue; } @@ -15651,7 +15650,7 @@ load_partial_dies (const struct die_reader_specs *reader, || cu->language == language_java) ? &objfile->global_psymbols : &objfile->static_psymbols, - 0, (CORE_ADDR) 0, cu->language, objfile); + 0, cu->language, objfile); info_ptr = locate_pdi_sibling (reader, part_die, info_ptr); continue; diff --git a/gdb/mdebugread.c b/gdb/mdebugread.c index 3a81615..47fbdf3 100644 --- a/gdb/mdebugread.c +++ b/gdb/mdebugread.c @@ -3110,7 +3110,7 @@ parse_partial_symbols (struct objfile *objfile) add_psymbol_to_list (namestring, p - namestring, 1, VAR_DOMAIN, LOC_STATIC, &objfile->static_psymbols, - 0, sh.value, + sh.value, psymtab_language, objfile); continue; case 'G': @@ -3122,7 +3122,7 @@ parse_partial_symbols (struct objfile *objfile) add_psymbol_to_list (namestring, p - namestring, 1, VAR_DOMAIN, LOC_STATIC, &objfile->global_psymbols, - 0, sh.value, + sh.value, psymtab_language, objfile); continue; @@ -3140,8 +3140,7 @@ parse_partial_symbols (struct objfile *objfile) add_psymbol_to_list (namestring, p - namestring, 1, STRUCT_DOMAIN, LOC_TYPEDEF, &objfile->static_psymbols, - sh.value, 0, - psymtab_language, objfile); + 0, psymtab_language, objfile); if (p[2] == 't') { /* Also a typedef with the same name. */ @@ -3149,8 +3148,7 @@ parse_partial_symbols (struct objfile *objfile) p - namestring, 1, VAR_DOMAIN, LOC_TYPEDEF, &objfile->static_psymbols, - sh.value, 0, - psymtab_language, + 0, psymtab_language, objfile); p += 1; } @@ -3163,8 +3161,7 @@ parse_partial_symbols (struct objfile *objfile) add_psymbol_to_list (namestring, p - namestring, 1, VAR_DOMAIN, LOC_TYPEDEF, &objfile->static_psymbols, - sh.value, 0, - psymtab_language, objfile); + 0, psymtab_language, objfile); } check_enum: /* If this is an enumerated type, we need to add @@ -3228,7 +3225,7 @@ parse_partial_symbols (struct objfile *objfile) add_psymbol_to_list (p, q - p, 1, VAR_DOMAIN, LOC_CONST, &objfile->static_psymbols, - 0, 0, psymtab_language, + 0, psymtab_language, objfile); /* Point past the name. */ p = q; @@ -3246,8 +3243,7 @@ parse_partial_symbols (struct objfile *objfile) add_psymbol_to_list (namestring, p - namestring, 1, VAR_DOMAIN, LOC_CONST, &objfile->static_psymbols, - sh.value, 0, psymtab_language, - objfile); + 0, psymtab_language, objfile); continue; case 'f': @@ -3266,7 +3262,7 @@ parse_partial_symbols (struct objfile *objfile) add_psymbol_to_list (namestring, p - namestring, 1, VAR_DOMAIN, LOC_BLOCK, &objfile->static_psymbols, - 0, sh.value, + sh.value, psymtab_language, objfile); continue; @@ -3290,7 +3286,7 @@ parse_partial_symbols (struct objfile *objfile) add_psymbol_to_list (namestring, p - namestring, 1, VAR_DOMAIN, LOC_BLOCK, &objfile->global_psymbols, - 0, sh.value, + sh.value, psymtab_language, objfile); continue; @@ -3533,12 +3529,12 @@ parse_partial_symbols (struct objfile *objfile) add_psymbol_to_list (name, strlen (name), 1, VAR_DOMAIN, LOC_BLOCK, &objfile->global_psymbols, - 0, sh.value, psymtab_language, objfile); + sh.value, psymtab_language, objfile); else add_psymbol_to_list (name, strlen (name), 1, VAR_DOMAIN, LOC_BLOCK, &objfile->static_psymbols, - 0, sh.value, psymtab_language, objfile); + sh.value, psymtab_language, objfile); procaddr = sh.value; @@ -3605,8 +3601,7 @@ parse_partial_symbols (struct objfile *objfile) add_psymbol_to_list (name, strlen (name), 1, STRUCT_DOMAIN, LOC_TYPEDEF, &objfile->static_psymbols, - 0, (CORE_ADDR) 0, - psymtab_language, objfile); + 0, psymtab_language, objfile); } handle_psymbol_enumerators (objfile, fh, sh.st, sh.value); @@ -3646,7 +3641,7 @@ parse_partial_symbols (struct objfile *objfile) add_psymbol_to_list (name, strlen (name), 1, VAR_DOMAIN, theclass, &objfile->static_psymbols, - 0, sh.value, psymtab_language, objfile); + sh.value, psymtab_language, objfile); skip: cur_sdx++; /* Go to next file symbol. */ } @@ -3726,8 +3721,7 @@ parse_partial_symbols (struct objfile *objfile) add_psymbol_to_list (name, strlen (name), 1, VAR_DOMAIN, theclass, &objfile->global_psymbols, - 0, svalue, - psymtab_language, objfile); + svalue, psymtab_language, objfile); } } @@ -3889,8 +3883,8 @@ handle_psymbol_enumerators (struct objfile *objfile, FDR *fh, int stype, in psymtabs, just in symtabs. */ add_psymbol_to_list (name, strlen (name), 1, VAR_DOMAIN, LOC_CONST, - &objfile->static_psymbols, 0, - (CORE_ADDR) 0, psymtab_language, objfile); + &objfile->static_psymbols, + 0, psymtab_language, objfile); ext_sym += external_sym_size; } } diff --git a/gdb/psympriv.h b/gdb/psympriv.h index ea2454c..da780bd 100644 --- a/gdb/psympriv.h +++ b/gdb/psympriv.h @@ -212,7 +212,7 @@ extern void add_psymbol_to_list (const char *, int, int, domain_enum, enum address_class, struct psymbol_allocation_list *, - long, CORE_ADDR, + CORE_ADDR, enum language, struct objfile *); extern void init_psymbol_list (struct objfile *, int); diff --git a/gdb/psymtab.c b/gdb/psymtab.c index ba677bc..2475d00 100644 --- a/gdb/psymtab.c +++ b/gdb/psymtab.c @@ -1624,8 +1624,7 @@ static const struct partial_symbol * add_psymbol_to_bcache (const char *name, int namelength, int copy_name, domain_enum domain, enum address_class theclass, - long val, /* Value as a long */ - CORE_ADDR coreaddr, /* Value as a CORE_ADDR */ + CORE_ADDR coreaddr, enum language language, struct objfile *objfile, int *added) { @@ -1636,15 +1635,7 @@ add_psymbol_to_bcache (const char *name, int namelength, int copy_name, holes. */ memset (&psymbol, 0, sizeof (psymbol)); - /* val and coreaddr are mutually exclusive, one of them *will* be zero. */ - if (val != 0) - { - SYMBOL_VALUE (&psymbol) = val; - } - else - { - SYMBOL_VALUE_ADDRESS (&psymbol) = coreaddr; - } + SYMBOL_VALUE_ADDRESS (&psymbol) = coreaddr; SYMBOL_SECTION (&psymbol) = -1; SYMBOL_SET_LANGUAGE (&psymbol, language, &objfile->objfile_obstack); PSYMBOL_DOMAIN (&psymbol) = domain; @@ -1703,6 +1694,8 @@ append_psymbol_to_list (struct psymbol_allocation_list *list, /* Add a symbol with a long value to a psymtab. Since one arg is a struct, we pass in a ptr and deref it (sigh). + The only value we need to store for psyms is an address. + For all other psyms pass zero for COREADDR. Return the partial symbol that has been added. */ void @@ -1710,8 +1703,7 @@ add_psymbol_to_list (const char *name, int namelength, int copy_name, domain_enum domain, enum address_class theclass, struct psymbol_allocation_list *list, - long val, /* Value as a long */ - CORE_ADDR coreaddr, /* Value as a CORE_ADDR */ + CORE_ADDR coreaddr, enum language language, struct objfile *objfile) { const struct partial_symbol *psym; @@ -1720,7 +1712,7 @@ add_psymbol_to_list (const char *name, int namelength, int copy_name, /* Stash the partial symbol away in the cache. */ psym = add_psymbol_to_bcache (name, namelength, copy_name, domain, theclass, - val, coreaddr, language, objfile, &added); + coreaddr, language, objfile, &added); /* Do not duplicate global partial symbols. */ if (list == &objfile->global_psymbols diff --git a/gdb/xcoffread.c b/gdb/xcoffread.c index b5b2a1d..8b38c8f 100644 --- a/gdb/xcoffread.c +++ b/gdb/xcoffread.c @@ -2664,7 +2664,7 @@ scan_xcoff_symtab (struct objfile *objfile) add_psymbol_to_list (namestring, p - namestring, 1, VAR_DOMAIN, LOC_STATIC, &objfile->static_psymbols, - 0, symbol.n_value, + symbol.n_value, psymtab_language, objfile); continue; @@ -2676,7 +2676,7 @@ scan_xcoff_symtab (struct objfile *objfile) add_psymbol_to_list (namestring, p - namestring, 1, VAR_DOMAIN, LOC_STATIC, &objfile->global_psymbols, - 0, symbol.n_value, + symbol.n_value, psymtab_language, objfile); continue; @@ -2694,16 +2694,14 @@ scan_xcoff_symtab (struct objfile *objfile) add_psymbol_to_list (namestring, p - namestring, 1, STRUCT_DOMAIN, LOC_TYPEDEF, &objfile->static_psymbols, - symbol.n_value, 0, - psymtab_language, objfile); + 0, psymtab_language, objfile); if (p[2] == 't') { /* Also a typedef with the same name. */ add_psymbol_to_list (namestring, p - namestring, 1, VAR_DOMAIN, LOC_TYPEDEF, &objfile->static_psymbols, - symbol.n_value, 0, - psymtab_language, objfile); + 0, psymtab_language, objfile); p += 1; } } @@ -2715,8 +2713,7 @@ scan_xcoff_symtab (struct objfile *objfile) add_psymbol_to_list (namestring, p - namestring, 1, VAR_DOMAIN, LOC_TYPEDEF, &objfile->static_psymbols, - symbol.n_value, 0, - psymtab_language, objfile); + 0, psymtab_language, objfile); } check_enum: /* If this is an enumerated type, we need to @@ -2777,7 +2774,7 @@ scan_xcoff_symtab (struct objfile *objfile) enum constants in psymtabs, just in symtabs. */ add_psymbol_to_list (p, q - p, 1, VAR_DOMAIN, LOC_CONST, - &objfile->static_psymbols, 0, + &objfile->static_psymbols, 0, psymtab_language, objfile); /* Point past the name. */ p = q; @@ -2795,7 +2792,7 @@ scan_xcoff_symtab (struct objfile *objfile) /* Constant, e.g. from "const" in Pascal. */ add_psymbol_to_list (namestring, p - namestring, 1, VAR_DOMAIN, LOC_CONST, - &objfile->static_psymbols, symbol.n_value, + &objfile->static_psymbols, 0, psymtab_language, objfile); continue; @@ -2815,7 +2812,7 @@ scan_xcoff_symtab (struct objfile *objfile) add_psymbol_to_list (namestring, p - namestring, 1, VAR_DOMAIN, LOC_BLOCK, &objfile->static_psymbols, - 0, symbol.n_value, + symbol.n_value, psymtab_language, objfile); continue; @@ -2846,7 +2843,7 @@ scan_xcoff_symtab (struct objfile *objfile) add_psymbol_to_list (namestring, p - namestring, 1, VAR_DOMAIN, LOC_BLOCK, &objfile->global_psymbols, - 0, symbol.n_value, + symbol.n_value, psymtab_language, objfile); continue;