[rtems-tools commit] rtemstoolkit/dwarf: Fix some C++ handling issues.
Chris Johns
chrisj at rtems.org
Mon Sep 2 00:24:11 UTC 2019
Module: rtems-tools
Branch: master
Commit: c1e38871b2a2b3d19aad271384d77a5f05cec49a
Changeset: http://git.rtems.org/rtems-tools/commit/?id=c1e38871b2a2b3d19aad271384d77a5f05cec49a
Author: Chris Johns <chrisj at rtems.org>
Date: Mon Sep 2 10:10:05 2019 +1000
rtemstoolkit/dwarf: Fix some C++ handling issues.
---
rtemstoolkit/rld-dwarf.cpp | 131 +++++++++++++++++++++++--------------------
rtemstoolkit/rld-symbols.cpp | 3 +-
2 files changed, 72 insertions(+), 62 deletions(-)
diff --git a/rtemstoolkit/rld-dwarf.cpp b/rtemstoolkit/rld-dwarf.cpp
index 6f249bf..1e62b3c 100644
--- a/rtemstoolkit/rld-dwarf.cpp
+++ b/rtemstoolkit/rld-dwarf.cpp
@@ -32,6 +32,7 @@
#include <rld.h>
#include <rld-path.h>
#include <rld-dwarf.h>
+#include <rld-symbols.h>
namespace rld
{
@@ -635,82 +636,78 @@ namespace rld
}
}
- if (declaration_)
- {
- die.attribute (DW_AT_name, name_);
- }
- else
+ /*
+ * Get the name attribute. (if present)
+ */
+ if (!die.attribute (DW_AT_name, name_, false))
{
+ bool found = false;
+
/*
- * Get the name attribute. (if present)
+ * For inlined function, the actual name is probably in the DIE
+ * referenced by DW_AT_abstract_origin. (if present)
*/
- if (!die.attribute (DW_AT_name, name_, false))
+ dwarf_attribute abst_at;
+ if (die.attribute (DW_AT_abstract_origin, abst_at, false))
{
- bool found = false;
-
- /*
- * For inlined function, the actual name is probably in the DIE
- * referenced by DW_AT_abstract_origin. (if present)
- */
- dwarf_attribute abst_at;
- if (die.attribute (DW_AT_abstract_origin, abst_at, false))
+ dwarf_offset abst_at_die_offset;
+ dwarf_error de;
+ int dr;
+ dr = ::dwarf_global_formref (abst_at, &abst_at_die_offset, &de);
+ if (dr == DW_DLV_OK)
{
- dwarf_offset abst_at_die_offset;
+ debug_info_entry abst_at_die (debug, abst_at_die_offset);
+ if (abst_at_die.attribute (DW_AT_name, name_, false))
+ {
+ found = true;
+ abst_at_die.attribute (DW_AT_inline, inline_, false);
+ if (abst_at_die.attribute (DW_AT_external, db, false))
+ external_ = db ? true : false;
+ if (abst_at_die.attribute (DW_AT_declaration, db, false))
+ declaration_ = db ? true : false;
+ abst_at_die.attribute (DW_AT_linkage_name, linkage_name_, false);
+ abst_at_die.attribute (DW_AT_decl_file, decl_file_, false);
+ abst_at_die.attribute (DW_AT_decl_line, decl_line_, false);
+ }
+ }
+ }
+
+ /*
+ * If DW_AT_name is not present, but DW_AT_specification is present,
+ * then probably the actual name is in the DIE referenced by
+ * DW_AT_specification.
+ */
+ if (!found)
+ {
+ dwarf_attribute spec;
+ if (die.attribute (DW_AT_specification, spec, false))
+ {
+ dwarf_offset spec_die_offset;
dwarf_error de;
int dr;
- dr = ::dwarf_global_formref (abst_at, &abst_at_die_offset, &de);
+ dr = ::dwarf_global_formref (spec, &spec_die_offset, &de);
if (dr == DW_DLV_OK)
{
- debug_info_entry abst_at_die (debug, abst_at_die_offset);
- if (abst_at_die.attribute (DW_AT_name, name_, false))
+ debug_info_entry spec_die (debug, spec_die_offset);
+ if (spec_die.attribute (DW_AT_name, name_, false))
{
found = true;
- abst_at_die.attribute (DW_AT_inline, inline_, false);
- if (abst_at_die.attribute (DW_AT_external, db, false))
+ if (spec_die.attribute (DW_AT_external, db, false))
external_ = db ? true : false;
- if (abst_at_die.attribute (DW_AT_declaration, db, false))
+ if (spec_die.attribute (DW_AT_declaration, db, false))
declaration_ = db ? true : false;
- abst_at_die.attribute (DW_AT_linkage_name, linkage_name_, false);
- abst_at_die.attribute (DW_AT_decl_file, decl_file_, false);
- abst_at_die.attribute (DW_AT_decl_line, decl_line_, false);
- }
- }
- }
-
- /*
- * If DW_AT_name is not present, but DW_AT_specification is present,
- * then probably the actual name is in the DIE referenced by
- * DW_AT_specification.
- */
- if (!found)
- {
- dwarf_attribute spec;
- if (die.attribute (DW_AT_specification, spec, false))
- {
- dwarf_offset spec_die_offset;
- dwarf_error de;
- int dr;
- dr = ::dwarf_global_formref (spec, &spec_die_offset, &de);
- if (dr == DW_DLV_OK)
- {
- debug_info_entry spec_die (debug, spec_die_offset);
- if (spec_die.attribute (DW_AT_name, name_, false))
- {
- found = true;
- if (spec_die.attribute (DW_AT_external, db, false))
- external_ = db ? true : false;
- if (spec_die.attribute (DW_AT_declaration, db, false))
- declaration_ = db ? true : false;
- spec_die.attribute (DW_AT_linkage_name, linkage_name_, false);
- spec_die.attribute (DW_AT_decl_file, decl_file_, false);
- spec_die.attribute (DW_AT_decl_line, decl_line_, false);
- }
+ spec_die.attribute (DW_AT_linkage_name, linkage_name_, false);
+ spec_die.attribute (DW_AT_decl_file, decl_file_, false);
+ spec_die.attribute (DW_AT_decl_line, decl_line_, false);
}
}
}
}
}
+ if (!linkage_name_.empty() && name_.empty())
+ rld::symbols::demangle_name(linkage_name_, name_);
+
if (rld::verbose () >= RLD_VERBOSE_FULL_DEBUG)
{
std::cout << "dwarf::function: ";
@@ -911,7 +908,11 @@ namespace rld
out << " pc_low=0x" << pc_low_
<< " pc_high=0x" << pc_high_;
if (!linkage_name_.empty ())
- out << " ln=" << linkage_name_;
+ {
+ std::string show_name;
+ rld::symbols::demangle_name(linkage_name_, show_name);
+ out << " ln=" << show_name;
+ }
out << std::dec << std::setfill (' ');
if (!call_file_.empty ())
out << " cf=" << call_file_ << ':' << call_line_;
@@ -1428,6 +1429,12 @@ namespace rld
dr = ::dwarf_attrval_string (die, attr, &s, &de);
libdwarf_error_check ("debug_info_entry::dump", dr, de);
out << " : " << s;
+ if (rld::symbols::is_cplusplus(s))
+ {
+ std::string cpps;
+ rld::symbols::demangle_name(s, cpps);
+ out << " `" << cpps << '`';
+ }
break;
case DW_FORM_sec_offset:
switch (attr)
@@ -1609,11 +1616,11 @@ namespace rld
auto first = addr_lines_.begin ();
auto last = addr_lines_.end () - 1;
std::cout << "dwarf::compilation_unit: line_low=0x"
- << std::hex
+ << std::hex << std::setfill('0')
<< std::setw (8) << first->location ()
<< ", line_high=0x"
<< std::setw (8) << last->location ()
- << std::dec
+ << std::dec << std::setfill(' ')
<< std::endl;
}
}
@@ -1625,7 +1632,9 @@ namespace rld
{
std::cout << "dwarf::compilation_unit: " << std::setw (3) << ++lc
<< ": 0x"
- << std::hex << std::setw (8) << l.location () << std::dec
+ << std::hex << std::setfill('0')
+ << std::setw (8) << l.location ()
+ << std::dec << std::setfill(' ')
<< " - "
<< (char) (l.is_a_begin_statement () ? 'B' : '.')
<< (char) (l.is_in_a_block () ? 'I' : '.')
diff --git a/rtemstoolkit/rld-symbols.cpp b/rtemstoolkit/rld-symbols.cpp
index 00af9b5..661b598 100644
--- a/rtemstoolkit/rld-symbols.cpp
+++ b/rtemstoolkit/rld-symbols.cpp
@@ -50,7 +50,8 @@ namespace rld
if (name.compare (0, wrapper.length (), wrapper) == 0)
offset = wrapper.length ();
char* demangled_name = ::cplus_demangle (name.c_str () + offset,
- DMGL_ANSI | DMGL_PARAMS);
+ DMGL_ANSI | DMGL_PARAMS | DMGL_TYPES |
+ DMGL_RET_POSTFIX);
if (demangled_name)
{
demangled = demangled_name;
More information about the vc
mailing list