Fix the behavior of ${current-pc-arrow} in the default disassembly

format for the not-current-stack-frame.  This was causing
test/functionalities/inferior-assert to fail.

Also document the new additions to the format specifications used
in the disassembly-format changes to formats.html.

<rdar://problem/19102757> 

llvm-svn: 223096

1 files changed, 8 insertions, 7 deletions

diff --git a/lldb/source/Core/Debugger.cpp b/lldb/source/Core/Debugger.cpp
index 6cb844f2928..3462fcdaf26 100644
--- a/lldb/source/Core/Debugger.cpp
+++ b/lldb/source/Core/Debugger.cpp
@@ -125,7 +125,7 @@ g_language_enumerators[] =
     FILE_AND_LINE\
     "\\n"
 
-#define DEFAULT_DISASSEMBLY_FORMAT "${current-pc-arrow} ${addr-file-or-load}{ <${function.name-without-args}${function.concrete-only-addr-offset-no-padding}>}: "
+#define DEFAULT_DISASSEMBLY_FORMAT "${current-pc-arrow}${addr-file-or-load}{ <${function.name-without-args}${function.concrete-only-addr-offset-no-padding}>}: "
 
 static PropertyDefinition
 g_properties[] =
@@ -2626,17 +2626,18 @@ FormatPromptRecurse
                                             pc.SetLoadAddress (pc_loadaddr, exe_ctx->GetTargetPtr());
                                             if (pc == *addr)
                                             {
-                                                s.Printf ("->");
-                                                var_success = true;
-                                            }
-                                            else
-                                            {
-                                                s.Printf("  ");
+                                                s.Printf ("-> ");
                                                 var_success = true;
                                             }
                                         }
                                     }
+                                    if (var_success == false)
+                                    {
+                                        s.Printf("   ");
+                                        var_success = true;
+                                    }
                                 }
+                                var_success = true;
                             }
                             break;
                         }