diff options
| author | Elliott Hughes <enh@google.com> | 2014-07-17 12:59:04 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-07-17 12:59:04 +0000 |
| commit | 818b45f4948776f1ff23c404c524dc483333958b (patch) | |
| tree | 38287a379e38edbfc18c01c9bdbad8d0da6c3513 /scripts | |
| parent | 32ff33bde38b631d6e70353efd2f859acc66a584 (diff) | |
| parent | 14a67c7e703553eaf722514f7e2e6eda48922819 (diff) | |
| download | android_development-818b45f4948776f1ff23c404c524dc483333958b.tar.gz android_development-818b45f4948776f1ff23c404c524dc483333958b.tar.bz2 android_development-818b45f4948776f1ff23c404c524dc483333958b.zip | |
am 14a67c7e: am be5e8f72: Merge "Stack tool 32/64 bit compatibility fixes."
* commit '14a67c7e703553eaf722514f7e2e6eda48922819':
Stack tool 32/64 bit compatibility fixes.
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/stack_core.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/scripts/stack_core.py b/scripts/stack_core.py index 6b1e11eea..1eb0c29d5 100755 --- a/scripts/stack_core.py +++ b/scripts/stack_core.py @@ -45,7 +45,8 @@ class TraceConverter: last_frame = -1 width = "{8}" - def __init__(self): pass + def __init__(self): + self.UpdateAbiRegexes() register_names = { "arm": "r0|r1|r2|r3|r4|r5|r6|r7|r8|r9|sl|fp|ip|sp|lr|pc|cpsr", @@ -58,6 +59,8 @@ class TraceConverter: def UpdateAbiRegexes(self): if symbol.ARCH == "arm64" or symbol.ARCH == "mips64" or symbol.ARCH == "x86_64": self.width = "{16}" + else: + self.width = "{8}" self.register_line = re.compile("(([ ]*\\b(" + self.register_names[symbol.ARCH] + ")\\b +[0-9a-f]" + self.width + "){2,5})") |