[Lldb-commits] [lldb] 3be8643 - [lldb/crashlog] Add support for 32bit frame addresses

[Med Ismail Bennani via lldb-commits]

Author: Med Ismail Bennani
Date: 2022-11-03T14:44:52-07:00
New Revision: 3be864333a8843534465bcbf3d355fcd12b42369

URL: https://github.com/llvm/llvm-project/commit/3be864333a8843534465bcbf3d355fcd12b42369
DIFF: https://github.com/llvm/llvm-project/commit/3be864333a8843534465bcbf3d355fcd12b42369.diff

LOG: [lldb/crashlog] Add support for 32bit frame addresses

This patch adds support for 32bit stack frame addresses in the `crashlog`
command.

For crash reports that are generated from a arm64_32 process, `PAGEZERO`
is loaded at 0x00004000 so no code address will be less than 0x4000.

This patch changes the crashlog frame address regex group to match
addresses as small as 4 hex characters.

rdar://100805026

Differential Revision: https://reviews.llvm.org/D135310

Signed-off-by: Med Ismail Bennani <medismail.bennani at gmail.com>

Added: 
    

Modified: 
    lldb/examples/python/crashlog.py

Removed: 
    


################################################################################
diff  --git a/lldb/examples/python/crashlog.py b/lldb/examples/python/crashlog.py
index e80ecd91579ad..77d54ce303868 100755
--- a/lldb/examples/python/crashlog.py
+++ b/lldb/examples/python/crashlog.py
@@ -613,10 +613,10 @@ class TextCrashLogParser(CrashLogParser):
     frame_regex = re.compile(r'^(\d+)\s+'              # id
                              r'(.+?)\s+'               # img_name
                              r'(?:' +version+ r'\s+)?' # img_version
-                             r'(0x[0-9a-fA-F]{7,})'    # addr (7 chars or more)
+                             r'(0x[0-9a-fA-F]{4,})'    # addr (4 chars or more)
                              r' +(.*)'                 # offs
                             )
-    null_frame_regex = re.compile(r'^\d+\s+\?\?\?\s+0{7,} +')
+    null_frame_regex = re.compile(r'^\d+\s+\?\?\?\s+0{4,} +')
     image_regex_uuid = re.compile(r'(0x[0-9a-fA-F]+)'          # img_lo
                                   r'\s+-\s+'                   #   -
                                   r'(0x[0-9a-fA-F]+)\s+'       # img_hi