Add a new disassembly-format specification so that the disassembler

output style can be customized.  Change the built-in default to be
more similar to gdb's disassembly formatting.

The disassembly-format for a gdb-like output is

${addr-file-or-load} <${function.name-without-args}${function.concrete-only-addr-offset-no-padding}>: 

The disassembly-format for the lldb style output is

{${function.initial-function}{${module.file.basename}`}{${function.name-without-args}}:\n}{${function.changed}\n{${module.file.basename}`}{${function.name-without-args}}:\n}{${current-pc-arrow} }{${addr-file-or-load}}: 

The two backticks in the lldb style formatter triggers the sub-expression evaluation in
CommandInterpreter::PreprocessCommand() so you can't use that one as-is ... changing to
use ' characters instead of ` would work around that.

<rdar://problem/9885398> 

llvm-svn: 219544

1 files changed, 5 insertions, 2 deletions

diff --git a/lldb/test/functionalities/inferior-assert/TestInferiorAssert.py b/lldb/test/functionalities/inferior-assert/TestInferiorAssert.py
index 8f17a4e30d1..f8ed37249b9 100644
--- a/lldb/test/functionalities/inferior-assert/TestInferiorAssert.py
+++ b/lldb/test/functionalities/inferior-assert/TestInferiorAssert.py
@@ -176,8 +176,11 @@ class AssertingInferiorTestCase(TestBase):
             # of the function and in the next function. We also can't back the PC up
             # because we don't know how much to back it up by on targets with opcodes
             # that have differing sizes
-            self.expect("disassemble -a %s" % frame.GetPC(),
-                substrs = ['->'])
+            pc_backup_offset = 1
+            if frame.GetFrameID() == 0:
+                pc_backup_offset = 0
+            self.expect("disassemble -a %s" % (frame.GetPC() - pc_backup_offset),
+                    substrs = ['<%s>:' % frame.GetFunctionName()])
 
     def check_expr_in_main(self, thread):
         depth = thread.GetNumFrames()