diff options
| -rw-r--r-- | dwarf_wrappers.cxx | 11 | ||||
| -rw-r--r-- | dwarf_wrappers.h | 2 | ||||
| -rw-r--r-- | dwflpp.cxx | 22 | ||||
| -rw-r--r-- | loc2c-test.c | 22 | ||||
| -rw-r--r-- | tapsets.cxx | 4 |
5 files changed, 20 insertions, 41 deletions
diff --git a/dwarf_wrappers.cxx b/dwarf_wrappers.cxx index d7183dc3..03979ca2 100644 --- a/dwarf_wrappers.cxx +++ b/dwarf_wrappers.cxx @@ -47,15 +47,4 @@ void dwfl_assert(const std::string& desc, bool condition) } -// Helper for dealing with selected portions of libdwfl in a more readable -// fashion, and with specific cleanup / checking / logging options. - -const char * -dwarf_diename_integrate (Dwarf_Die *die) -{ - Dwarf_Attribute attr_mem; - return dwarf_formstring (dwarf_attr_integrate (die, DW_AT_name, &attr_mem)); -} - - /* vim: set sw=2 ts=8 cino=>4,n-2,{2,^-2,t0,(0,u0,w1,M1 : */ diff --git a/dwarf_wrappers.h b/dwarf_wrappers.h index 1442a17c..959ece92 100644 --- a/dwarf_wrappers.h +++ b/dwarf_wrappers.h @@ -89,8 +89,6 @@ public: } }; -const char *dwarf_diename_integrate (Dwarf_Die *die); - #endif @@ -1561,7 +1561,7 @@ dwflpp::print_members(Dwarf_Die *vardie, ostream &o) if (typetag != DW_TAG_structure_type && typetag != DW_TAG_union_type) { o << " Error: " - << (dwarf_diename_integrate (vardie) ?: "<anonymous>") + << (dwarf_diename (vardie) ?: "<anonymous>") << " isn't a struct/union"; return; } @@ -1573,14 +1573,14 @@ dwflpp::print_members(Dwarf_Die *vardie, ostream &o) { case 1: // No children. o << ((typetag == DW_TAG_union_type) ? " union " : " struct ") - << (dwarf_diename_integrate (die) ?: "<anonymous>") + << (dwarf_diename (die) ?: "<anonymous>") << " is empty"; break; case -1: // Error. default: // Shouldn't happen. o << ((typetag == DW_TAG_union_type) ? " union " : " struct ") - << (dwarf_diename_integrate (die) ?: "<anonymous>") + << (dwarf_diename (die) ?: "<anonymous>") << ": " << dwarf_errmsg (-1); break; @@ -1591,7 +1591,7 @@ dwflpp::print_members(Dwarf_Die *vardie, ostream &o) // Output each sibling's name to 'o'. while (dwarf_tag (die) == DW_TAG_member) { - const char *member = dwarf_diename_integrate (die) ; + const char *member = dwarf_diename (die) ; if ( member != NULL ) o << " " << member; @@ -1641,7 +1641,7 @@ dwflpp::find_struct_member(const target_symbol::component& c, case -1: /* Error. */ default: /* Shouldn't happen */ throw semantic_error (string (dwarf_tag(&die) == DW_TAG_union_type ? "union" : "struct") - + string (dwarf_diename_integrate (&die) ?: "<anonymous>") + + string (dwarf_diename (&die) ?: "<anonymous>") + string (dwarf_errmsg (-1)), c.tok); } @@ -1651,7 +1651,7 @@ dwflpp::find_struct_member(const target_symbol::component& c, if (dwarf_tag(&die) != DW_TAG_member) continue; - const char *name = dwarf_diename_integrate(&die); + const char *name = dwarf_diename(&die); if (name == NULL) { // need to recurse for anonymous structs/unions @@ -1774,7 +1774,7 @@ dwflpp::translate_components(struct obstack *pool, Dwarf_Die *tmpdie = dwflpp::declaration_resolve(dwarf_diename(die)); if (tmpdie == NULL) throw semantic_error ("unresolved struct " - + string (dwarf_diename_integrate (die) ?: "<anonymous>"), + + string (dwarf_diename (die) ?: "<anonymous>"), c.tok); *die_mem = *tmpdie; } @@ -1790,7 +1790,7 @@ dwflpp::translate_components(struct obstack *pool, alternatives = " (alternatives:" + members.str(); throw semantic_error("unable to find member '" + c.member + "' for struct " - + string(dwarf_diename_integrate(die) ?: "<unknown>") + + string(dwarf_diename(die) ?: "<unknown>") + alternatives, c.tok); } @@ -1806,14 +1806,14 @@ dwflpp::translate_components(struct obstack *pool, throw semantic_error ("invalid access '" + lex_cast<string>(c) + "' vs. enum type " - + string(dwarf_diename_integrate (die) ?: "<anonymous type>"), + + string(dwarf_diename (die) ?: "<anonymous type>"), c.tok); break; case DW_TAG_base_type: throw semantic_error ("invalid access '" + lex_cast<string>(c) + "' vs. base type " - + string(dwarf_diename_integrate (die) ?: "<anonymous type>"), + + string(dwarf_diename (die) ?: "<anonymous type>"), c.tok); break; case -1: @@ -1822,7 +1822,7 @@ dwflpp::translate_components(struct obstack *pool, break; default: - throw semantic_error (string(dwarf_diename_integrate (die) ?: "<anonymous type>") + throw semantic_error (string(dwarf_diename (die) ?: "<anonymous type>") + ": unexpected type tag " + lex_cast<string>(dwarf_tag (die)), c.tok); diff --git a/loc2c-test.c b/loc2c-test.c index ccd9510c..79cb3296 100644 --- a/loc2c-test.c +++ b/loc2c-test.c @@ -23,14 +23,6 @@ #define _(msg) msg -static const char * -dwarf_diename_integrate (Dwarf_Die *die) -{ - Dwarf_Attribute attr_mem; - return dwarf_formstring (dwarf_attr_integrate (die, DW_AT_name, &attr_mem)); -} - - static void __attribute__ ((noreturn)) fail (void *arg __attribute__ ((unused)), const char *fmt, ...) { @@ -187,13 +179,13 @@ handle_variable (Dwarf_Die *scopes, int nscopes, int out, { case 1: /* No children. */ error (2, 0, _("empty struct %s"), - dwarf_diename_integrate (die) ?: "<anonymous>"); + dwarf_diename (die) ?: "<anonymous>"); break; case -1: /* Error. */ default: /* Shouldn't happen */ error (2, 0, _("%s %s: %s"), typetag == DW_TAG_union_type ? "union" : "struct", - dwarf_diename_integrate (die) ?: "<anonymous>", + dwarf_diename (die) ?: "<anonymous>", dwarf_errmsg (-1)); break; @@ -201,7 +193,7 @@ handle_variable (Dwarf_Die *scopes, int nscopes, int out, break; } while (dwarf_tag (die) != DW_TAG_member - || ({ const char *member = dwarf_diename_integrate (die); + || ({ const char *member = dwarf_diename (die); member == NULL || strcmp (member, *fields); })) if (dwarf_siblingof (die, &die_mem) != 0) error (2, 0, _("field name %s not found"), *fields); @@ -230,11 +222,11 @@ handle_variable (Dwarf_Die *scopes, int nscopes, int out, if (dwarf_formsdata (&attr_mem, &off) != 0) error (2, 0, _("Bad offset for %s %s: %s"), typetag == DW_TAG_union_type ? "union" : "struct", - dwarf_diename_integrate (die) ?: "<anonymous>", + dwarf_diename (die) ?: "<anonymous>", dwarf_errmsg (-1)); if (off != 0) c_translate_add_offset (&pool, 1, - dwarf_diename_integrate (die) + dwarf_diename (die) ?: "", off, &tail); break; @@ -252,7 +244,7 @@ handle_variable (Dwarf_Die *scopes, int nscopes, int out, case DW_TAG_base_type: error (2, 0, _("field %s vs base type %s"), - *fields, dwarf_diename_integrate (die) ?: "<anonymous type>"); + *fields, dwarf_diename (die) ?: "<anonymous type>"); break; case -1: @@ -261,7 +253,7 @@ handle_variable (Dwarf_Die *scopes, int nscopes, int out, default: error (2, 0, _("%s: unexpected type tag %#x"), - dwarf_diename_integrate (die) ?: "<anonymous type>", + dwarf_diename (die) ?: "<anonymous type>", dwarf_tag (die)); break; } diff --git a/tapsets.cxx b/tapsets.cxx index f91d15d3..8d0e0ab2 100644 --- a/tapsets.cxx +++ b/tapsets.cxx @@ -5607,7 +5607,7 @@ dwarf_type_name(Dwarf_Die& type_die, string& c_type) } if (done) { - c_type.append(dwarf_diename_integrate(&type_die)); + c_type.append(dwarf_diename(&type_die)); return true; } @@ -5699,7 +5699,7 @@ tracepoint_derived_probe::build_args(dwflpp& dw, Dwarf_Die& func_die) { // build a tracepoint_arg for this parameter tracepoint_arg tparg; - tparg.name = dwarf_diename_integrate(&arg); + tparg.name = dwarf_diename(&arg); // read the type of this parameter Dwarf_Attribute type_attr; |