diff options
| author | Andreas Gampe <agampe@google.com> | 2015-07-24 21:24:38 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-07-24 21:24:38 +0000 |
| commit | 458a7c7aba37bf41e40862046846fa77046ac23c (patch) | |
| tree | 3c2ec75f35787920f11912c936d419edd0df0a74 /runtime/utils.cc | |
| parent | d021e166babaaf131e59caf5ad84772b73acb4c5 (diff) | |
| parent | 242ae94dc39be53e519a6163ea1db494ceb75954 (diff) | |
| download | art-458a7c7aba37bf41e40862046846fa77046ac23c.zip art-458a7c7aba37bf41e40862046846fa77046ac23c.tar.gz art-458a7c7aba37bf41e40862046846fa77046ac23c.tar.bz2 | |
Merge "ART: Change the stack dump format to be in line with debuggerd" into mnc-dev
Diffstat (limited to 'runtime/utils.cc')
| -rw-r--r-- | runtime/utils.cc | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/runtime/utils.cc b/runtime/utils.cc index 4923342..80938ce 100644 --- a/runtime/utils.cc +++ b/runtime/utils.cc @@ -1130,9 +1130,13 @@ void DumpNativeStack(std::ostream& os, pid_t tid, const char* prefix, os << prefix << StringPrintf("#%02zu pc ", it->num); bool try_addr2line = false; if (!BacktraceMap::IsValid(it->map)) { - os << StringPrintf("%08" PRIxPTR " ???", it->pc); + os << StringPrintf(Is64BitInstructionSet(kRuntimeISA) ? "%016" PRIxPTR " ???" + : "%08" PRIxPTR " ???", + it->pc); } else { - os << StringPrintf("%08" PRIxPTR " ", BacktraceMap::GetRelativePc(it->map, it->pc)); + os << StringPrintf(Is64BitInstructionSet(kRuntimeISA) ? "%016" PRIxPTR " " + : "%08" PRIxPTR " ", + BacktraceMap::GetRelativePc(it->map, it->pc)); os << it->map.name; os << " ("; if (!it->func_name.empty()) { |