am be5e8f72: Merge "Stack tool 32/64 bit compatibility fixes."

* commit 'be5e8f728a7daa64049a20a61a65d83570f2448d':
  Stack tool 32/64 bit compatibility fixes.
This commit is contained in:
Elliott Hughes
2014-07-17 00:21:02 +00:00
committed by Android Git Automerger

View File

@@ -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})")