diff options
| author | Elliott Hughes <enh@google.com> | 2014-02-03 16:59:59 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-02-03 16:59:59 +0000 |
| commit | 32b36979465c51329b60f8cbc4ad7944e96f70e8 (patch) | |
| tree | 2d0e2527780a43ec989b28123a1d28048d889262 /debuggerd | |
| parent | 6cfb31d65255eacd7965295a561cafa1218dc842 (diff) | |
| parent | f51bee45b015730b5f2759e89882c0cb457c22a3 (diff) | |
| download | system_core-32b36979465c51329b60f8cbc4ad7944e96f70e8.zip system_core-32b36979465c51329b60f8cbc4ad7944e96f70e8.tar.gz system_core-32b36979465c51329b60f8cbc4ad7944e96f70e8.tar.bz2 | |
am f51bee45: am 784b6181: am cf53e5db: Merge "Fix debuggerd\'s symbol offset output."
* commit 'f51bee45b015730b5f2759e89882c0cb457c22a3':
Fix debuggerd's symbol offset output.
Diffstat (limited to 'debuggerd')
| -rwxr-xr-x | debuggerd/tombstone.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/debuggerd/tombstone.cpp b/debuggerd/tombstone.cpp index a111db0..5e3d729 100755 --- a/debuggerd/tombstone.cpp +++ b/debuggerd/tombstone.cpp @@ -243,7 +243,7 @@ static void dump_stack_segment( if (!func_name.empty()) { if (!i && label >= 0) { if (offset) { - _LOG(log, scope_flags, " #%02d %" PRIPTR " %" PRIPTR " %s (%s+%" PRIxPTR "u)\n", + _LOG(log, scope_flags, " #%02d %" PRIPTR " %" PRIPTR " %s (%s+%" PRIuPTR ")\n", label, *sp, stack_content, map_name, func_name.c_str(), offset); } else { _LOG(log, scope_flags, " #%02d %" PRIPTR " %" PRIPTR " %s (%s)\n", @@ -251,7 +251,7 @@ static void dump_stack_segment( } } else { if (offset) { - _LOG(log, scope_flags, " %" PRIPTR " %" PRIPTR " %s (%s+%" PRIxPTR "u)\n", + _LOG(log, scope_flags, " %" PRIPTR " %" PRIPTR " %s (%s+%" PRIuPTR ")\n", *sp, stack_content, map_name, func_name.c_str(), offset); } else { _LOG(log, scope_flags, " %" PRIPTR " %" PRIPTR " %s (%s)\n", |