[lldb] Ignore binary data in crashlog

[JDevlieghere]

Summary

Skip the instruction stream section in the crashlog section.

[JDevlieghere]

Fix indentation that got screwed up when staging only non-whitespace changes.

[aprantl]

Just FYI, we do have unit tests for the crashlog parser now, but I don't know how well this fits in there.

[JDevlieghere]

In D90414#2364816, @aprantl wrote:

Just FYI, we do have unit tests for the crashlog parser now, but I don't know how well this fits in there.

I see a test that generates one and that checks some regexes, but no test that parses a text file?

lldb/examples/python/crashlog.py

 
 from lldb.utils import symbolication
 
 PARSE_MODE_NORMAL = 0
 PARSE_MODE_THREAD = 1
 PARSE_MODE_IMAGES = 2
 PARSE_MODE_THREGS = 3
 PARSE_MODE_SYSTEM = 4
+PARSE_MODE_INSTRS = 5
 
 
 class CrashLog(symbolication.Symbolicator):
     """Class that does parses darwin crash logs"""
     parent_process_regex = re.compile('^Parent Process:\s*(.*)\[(\d+)\]')
     thread_state_regex = re.compile('^Thread ([0-9]+) crashed with')
+    thread_instrs_regex = re.compile('^Thread ([0-9]+) instruction stream')
     thread_regex = re.compile('^Thread ([0-9]+)([^:]*):(.*)')
     app_backtrace_regex = re.compile(
         '^Application Specific Backtrace ([0-9]+)([^:]*):(.*)')
     version = r'(\(.+\)|(arm|x86_)[0-9a-z]+)\s+'
     frame_regex = re.compile(r'^([0-9]+)' r'\s'                # id
                              r'+(.+?)'    r'\s+'               # img_name
                              r'(' +version+ r')?'              # img_version
                              r'(0x[0-9a-fA-F]{7}[0-9a-fA-F]+)' # addr
def __init__(self, path, verbose):
                 elif line.startswith('Thread'):
                     thread_state_match = self.thread_state_regex.search(line)
                     if thread_state_match:
                         app_specific_backtrace = False
                         thread_state_match = self.thread_regex.search(line)
                         thread_idx = int(thread_state_match.group(1))
                         parse_mode = PARSE_MODE_THREGS
                         thread = self.threads[thread_idx]
-                    else:
+                        continue
+                    thread_insts_match  = self.thread_instrs_regex.search(line)
+                    if thread_insts_match:
+                        parse_mode = PARSE_MODE_INSTRS
+                        continue
                         thread_match = self.thread_regex.search(line)
-                        if thread_match:
-                            app_specific_backtrace = False
-                            parse_mode = PARSE_MODE_THREAD
-                            thread_idx = int(thread_match.group(1))
-                            thread = CrashLog.Thread(thread_idx, False)
                         continue
+                    continue
                 elif line.startswith('Binary Images:'):
                     parse_mode = PARSE_MODE_IMAGES
                     continue
                 elif line.startswith('Application Specific Backtrace'):
                     app_backtrace_match = self.app_backtrace_regex.search(line)
                     if app_backtrace_match:
                         parse_mode = PARSE_MODE_THREAD
                         app_specific_backtrace = True
def __init__(self, path, verbose):
                 for reg_value in reg_values:
                     # print 'reg_value = "%s"' % reg_value
                     (reg, value) = reg_value.split(': ')
                     # print 'reg = "%s"' % reg
                     # print 'value = "%s"' % value
                     thread.registers[reg.strip()] = int(value, 0)
             elif parse_mode == PARSE_MODE_SYSTEM:
                 self.system_profile.append(line)
+            elif parse_mode == PARSE_MODE_INSTRS:
+                pass
         f.close()
 
     def dump(self):
         print("Crash Log File: %s" % (self.path))
         if self.backtraces:
             print("\nApplication Specific Backtraces:")
             for thread in self.backtraces:
                 thread.dump('  ')