Changeset 1c85380 in rtems-tools

Timestamp:

May 11, 2018, 5:21:05 AM (12 months ago)

Author:

Chris Johns <chrisj@…>

Branches:

master

Children:

d6ae3ae

Parents:

881824f

git-author:

Chris Johns <chrisj@…> (05/11/18 05:21:05)

git-committer:

Chris Johns <chrisj@…> (06/18/18 02:26:16)

Message:

rtemstoolkit/dwarf: Change the address source line to signed so valid() works.

Also add a check to valid where there must be source to be valid.

Location:

rtemstoolkit

Files:

• rld-dwarf.cpp (modified) (5 diffs)
• rld-dwarf.h (modified) (2 diffs)

rtemstoolkit/rld-dwarf.cpp

@@ -64 +64 @@
         end_sequence (false)
     {
-        dwarf_error de;
-        int         dr;
-        dr = ::dwarf_lineaddr(line, &addr, &de);
-        libdwarf_error_check ("address::address", dr, de);
-        dr = ::dwarf_line_srcfileno(line, &source_index, &de);
-        libdwarf_error_check ("address::address", dr, de);
-        dr = ::dwarf_lineno(line, &source_line, &de);
-        libdwarf_error_check ("address::address", dr, de);
-        dwarf_bool b;
-        dr = ::dwarf_linebeginstatement(line, &b, &de);
-        libdwarf_error_check ("address::address", dr, de);
-        begin_statement = b ? true : false;
-        dr = ::dwarf_lineblock(line, &b, &de);
-        libdwarf_error_check ("address::address", dr, de);
-        block = b ? true : false;
-        dr = ::dwarf_lineendsequence(line, &b, &de);
-        libdwarf_error_check ("address::address", dr, de);
-        end_sequence = b ? true : false;
+      dwarf_error de;
+      int         dr;
+      dr = ::dwarf_lineaddr(line, &addr, &de);
+      libdwarf_error_check ("address::address", dr, de);
+      dr = ::dwarf_line_srcfileno(line, &source_index, &de);
+      libdwarf_error_check ("address::address", dr, de);
+      dwarf_unsigned src_line;
+      dr = ::dwarf_lineno(line, &src_line, &de);
+      libdwarf_error_check ("address::address", dr, de);
+      source_line = src_line;
+      dwarf_bool b;
+      dr = ::dwarf_linebeginstatement(line, &b, &de);
+      libdwarf_error_check ("address::address", dr, de);
+      begin_statement = b ? true : false;
+      dr = ::dwarf_lineblock(line, &b, &de);
+      libdwarf_error_check ("address::address", dr, de);
+      block = b ? true : false;
+      dr = ::dwarf_lineendsequence(line, &b, &de);
+      libdwarf_error_check ("address::address", dr, de);
+      end_sequence = b ? true : false;
     }
 
@@ -109 +111 @@
     {
       source = nullptr;
+      source_line = -1;
     }
 
@@ -114 +117 @@
     address::valid () const
     {
-      return source_line > 0;
+      return source != nullptr && source_line > 0;
     }
 
@@ -156 +159 @@
 
     address&
-    address::operator = (address& rhs)
+    address::operator = (const address& rhs)
     {
       if (this != &rhs)
@@ -613 +616 @@
     {
       if (addr_lines_.find (addr) == addr_lines_.end ())
-        return false;
+          return false;
       addr_line = addr_lines_[addr];
       return true;

rtemstoolkit/rld-dwarf.h

@@ -89 +89 @@
        * Assigment operator.
        */
-      address& operator = (address& rhs);
+      address& operator = (const address& rhs);
 
     private:
@@ -96 +96 @@
       sources const* source;
       dwarf_unsigned source_index;
-      dwarf_unsigned source_line;
+      dwarf_signed   source_line;
       bool           begin_statement;
       bool           block;