Add load base to map for relocation packing.

The new linker relocation packing support uses non-zero load bases,
so we better handle them properly.

Also print out the load base for a map if it's non-zero.

Bug: 20687795
(cherry picked from commit 329ed7dae49eba09bdf865dd999d1a7e73bb9687)

Change-Id: Ibc37d8c8bb032820dca4e7531184349ba6d402d2

1 files changed, 9 insertions, 0 deletions

diff --git a/include/backtrace/BacktraceMap.h b/include/backtrace/BacktraceMap.h
index da963071b..731c24887 100644
--- a/include/backtrace/BacktraceMap.h
+++ b/include/backtrace/BacktraceMap.h
@@ -37,6 +37,7 @@ struct backtrace_map_t {
 
   uintptr_t start;
   uintptr_t end;
+  uintptr_t load_base;
   int flags;
   std::string name;
 };
@@ -82,6 +83,14 @@ public:
     return map.end > 0;
   }
 
+  static uintptr_t GetRelativePc(const backtrace_map_t& map, uintptr_t pc) {
+    if (IsValid(map)) {
+      return pc - map.start + map.load_base;
+    } else {
+      return pc;
+    }
+  }
+
 protected:
   BacktraceMap(pid_t pid);