tequilaOS/platform_system_core
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

am d3ef8f41: am 2520f1eb: am 37d7fdbb: Merge "Maps output now marks the fault address location."

Browse source 
* commit 'd3ef8f416b9cd9609a0002e186fb2ab45a0a312d':
  Maps output now marks the fault address location.
This commit is contained in:
Elliott Hughes 2014-06-20 18:19:44 +00:00 committed by Android Git Automerger
commit 545b127a78
1 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
debuggerd/tombstone.cpp
View file

@ -343,8 +343,9 @@ static void dump_backtrace_and_stack(Backtrace* backtrace, log_t* log) {
}
}
static void dump_map(log_t* log, const backtrace_map_t* map) {
_LOG(log, logtype::MAPS, " %" PRIPTR "-%" PRIPTR " %c%c%c %s\n", map->start, map->end,
static void dump_map(log_t* log, const backtrace_map_t* map, bool fault_addr) {
_LOG(log, logtype::MAPS, "%s%" PRIPTR "-%" PRIPTR " %c%c%c %s\n",
(fault_addr? "--->" : " "), map->start, map->end,
(map->flags & PROT_READ) ? 'r' : '-', (map->flags & PROT_WRITE) ? 'w' : '-',
(map->flags & PROT_EXEC) ? 'x' : '-', map->name.c_str());
}
@ -366,10 +367,18 @@ static void dump_nearby_maps(BacktraceMap* map, log_t* log, pid_t tid) {
return;
}
_LOG(log, logtype::MAPS, "\nmemory map:\n");
_LOG(log, logtype::MAPS, "\nmemory map: (fault address prefixed with --->)\n");
bool found_map = false;
for (BacktraceMap::const_iterator it = map->begin(); it != map->end(); ++it) {
dump_map(log, &*it);
bool in_map = addr >= (*it).start && addr < (*it).end;
dump_map(log, &*it, in_map);
if(in_map) {
found_map = true;
}
}
if(!found_map) {
_LOG(log, logtype::ERROR, "\nFault address was not in any map!");
}
}