diff options
author | Dmitriy Ivanov <dimitry@google.com> | 2014-08-08 16:30:13 -0700 |
---|---|---|
committer | Dmitriy Ivanov <dimitry@google.com> | 2014-08-09 12:07:51 -0700 |
commit | f10aa3ae9d58269465c579e4c286ccef6be4c2d0 (patch) | |
tree | 2a3c07dbebe3d992a7bdd3c4506440e1745d094a /debuggerd | |
parent | 56b28f6b2c4722c75dbc7f041f36552221e51133 (diff) | |
download | system_core-f10aa3ae9d58269465c579e4c286ccef6be4c2d0.zip system_core-f10aa3ae9d58269465c579e4c286ccef6be4c2d0.tar.gz system_core-f10aa3ae9d58269465c579e4c286ccef6be4c2d0.tar.bz2 |
Do not suppress maps dump when si_addr<PAGE_SIZE
Also remove alignment of si_addr.
Change-Id: Ie5445bf8a5baa49e04e37c643c25ebd0f1dc9d22
Diffstat (limited to 'debuggerd')
-rwxr-xr-x | debuggerd/tombstone.cpp | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/debuggerd/tombstone.cpp b/debuggerd/tombstone.cpp index 2b9d093..32f0eca 100755 --- a/debuggerd/tombstone.cpp +++ b/debuggerd/tombstone.cpp @@ -64,6 +64,7 @@ static bool signal_has_si_addr(int sig) { case SIGFPE: case SIGILL: case SIGSEGV: + case SIGTRAP: return true; default: return false; @@ -350,16 +351,12 @@ static void dump_nearby_maps(BacktraceMap* map, log_t* log, pid_t tid) { return; } - bool is_running = (si.si_code == SI_USER); + bool has_fault_address = signal_has_si_addr(si.si_signo); uintptr_t addr = reinterpret_cast<uintptr_t>(si.si_addr); - addr &= ~0xfff; // round to 4K page boundary - if (!is_running && addr == 0) { // null-pointer deref - return; - } - _LOG(log, logtype::MAPS, "\nmemory map: %s\n", is_running? "" : "(fault address prefixed with --->)"); + _LOG(log, logtype::MAPS, "\nmemory map: %s\n", has_fault_address ? "(fault address prefixed with --->)" : ""); - if(!is_running && (addr < map->begin()->start)) { + if (has_fault_address && (addr < map->begin()->start)) { _LOG(log, logtype::MAPS, "--->Fault address falls at %" PRIPTR " before any mapped regions\n", addr); } @@ -369,10 +366,10 @@ static void dump_nearby_maps(BacktraceMap* map, log_t* log, pid_t tid) { _LOG(log, logtype::MAPS, "--->Fault address falls at %" PRIPTR " between mapped regions\n", addr); } prev = it; - bool in_map = !is_running && (addr >= (*it).start) && (addr < (*it).end); + bool in_map = has_fault_address && (addr >= (*it).start) && (addr < (*it).end); dump_map(log, &*it, in_map); } - if (!is_running && (addr >= (*prev).end)) { + if (has_fault_address && (addr >= (*prev).end)) { _LOG(log, logtype::MAPS, "--->Fault address falls at %" PRIPTR " after any mapped regions\n", addr); } } |