am 8b32c30b: Merge "Add offset to map data."

* commit '8b32c30b92be6914da2dca23089473c4f37adfb9':
  Add offset to map data.
This commit is contained in:
Christopher Ferris 2015-05-06 23:07:55 +00:00 committed by Android Git Automerger
commit 84fcaea57c
3 changed files with 5 additions and 1 deletions

View file

@ -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;

View file

@ -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;

View file

@ -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;