Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8b32c30b authored by Christopher Ferris's avatar Christopher Ferris Committed by Gerrit Code Review
Browse files

Merge "Add offset to map data."

parents 577c1245 5c885685

debuggerd/tombstone.cpp

+2 −1
Original line number Diff line number Diff line
@@ -371,7 +371,8 @@ static void dump_all_maps(Backtrace* backtrace, BacktraceMap* map, log_t* log, p 
    } else {

      line += '-';

    }

    line += android::base::StringPrintf("  %8" PRIxPTR, it->end - it->start);

    line += android::base::StringPrintf("  %8" PRIxPTR "  %8" PRIxPTR,

                                        it->offset, it->end - it->start);

    if (it->name.length() > 0) {

      line += "  " + it->name;

      std::string build_id;

include/backtrace/BacktraceMap.h

+1 −0
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ struct backtrace_map_t { 


  uintptr_t start;

  uintptr_t end;

  uintptr_t offset;

  uintptr_t load_base;

  int flags;

  std::string name;

libbacktrace/UnwindMap.cpp

+2 −0
Original line number Diff line number Diff line
@@ -51,6 +51,7 @@ bool UnwindMap::GenerateMap() { 


    map.start = unw_map.start;

    map.end = unw_map.end;

    map.offset = unw_map.offset;

    map.load_base = unw_map.load_base;

    map.flags = unw_map.flags;

    map.name = unw_map.path;
@@ -92,6 +93,7 @@ bool UnwindMapLocal::GenerateMap() { 


      map.start = unw_map.start;

      map.end = unw_map.end;

      map.offset = unw_map.offset;

      map.load_base = unw_map.load_base;

      map.flags = unw_map.flags;

      map.name = unw_map.path;