2 files changed, 55 insertions, 7 deletions

diff --git a/lldb/source/Target/Target.cpp b/lldb/source/Target/Target.cpp
index 488c6b82f20..17e2c875bae 100644
--- a/lldb/source/Target/Target.cpp
+++ b/lldb/source/Target/Target.cpp
@@ -64,15 +64,27 @@ Target::~Target()
 }
 
 void
-Target::Dump (Stream *s)
+Target::Dump (Stream *s, lldb::DescriptionLevel description_level)
 {
 //    s->Printf("%.*p: ", (int)sizeof(void*) * 2, this);
-    s->Indent();
-    s->PutCString("Target\n");
-    s->IndentMore();
-    m_images.Dump(s);
-    m_breakpoint_list.Dump(s);
-    m_internal_breakpoint_list.Dump(s);
+    if (description_level != lldb::eDescriptionLevelBrief)
+    {
+        s->Indent();
+        s->PutCString("Target\n");
+        s->IndentMore();
+        m_images.Dump(s);
+        m_breakpoint_list.Dump(s);
+        m_internal_breakpoint_list.Dump(s);
+    }
+    else
+    {
+        char path[PATH_MAX];
+        int path_len = PATH_MAX;
+        if (GetExecutableModule()->GetFileSpec().GetPath (path, path_len))
+            s->Printf ("Target: %s\n", path);
+        else
+            s->Printf ("Target: <unknown>\n");
+    }
 //  if (m_process_sp.get())
 //      m_process_sp->Dump(s);
     s->IndentLess();
diff --git a/lldb/source/Target/Thread.cpp b/lldb/source/Target/Thread.cpp
index 2df4e8f883e..9bd7e76b8e0 100644
--- a/lldb/source/Target/Thread.cpp
+++ b/lldb/source/Target/Thread.cpp
@@ -1097,3 +1097,39 @@ Thread::GetStackFrameSPForStackFramePtr (StackFrame *stack_frame_ptr)
 {
     return GetStackFrameList().GetStackFrameSPForStackFramePtr (stack_frame_ptr);
 }
+
+const char *
+Thread::StopReasonAsCString (lldb::StopReason reason)
+{
+    switch (reason)
+    {
+    case eStopReasonInvalid:      return "invalid";
+    case eStopReasonNone:         return "none";
+    case eStopReasonTrace:        return "trace";
+    case eStopReasonBreakpoint:   return "breakpoint";
+    case eStopReasonWatchpoint:   return "watchpoint";
+    case eStopReasonSignal:       return "signal";
+    case eStopReasonException:    return "exception";
+    case eStopReasonPlanComplete: return "plan complete";
+    }
+
+
+    static char unknown_state_string[64];
+    snprintf(unknown_state_string, sizeof (unknown_state_string), "StopReason = %i", reason);
+    return unknown_state_string;
+}
+
+const char *
+Thread::RunModeAsCString (lldb::RunMode mode)
+{
+    switch (mode)
+    {
+    case eOnlyThisThread:     return "only this thread";
+    case eAllThreads:         return "all threads";
+    case eOnlyDuringStepping: return "only during stepping";
+    }
+
+    static char unknown_state_string[64];
+    snprintf(unknown_state_string, sizeof (unknown_state_string), "RunMode = %i", mode);
+    return unknown_state_string;
+}