6 files changed, 23 insertions, 12 deletions
diff --git a/lldb/source/Core/Address.cpp b/lldb/source/Core/Address.cpp
index 034c8d83acc..f7e75001701 100644
--- a/lldb/source/Core/Address.cpp
+++ b/lldb/source/Core/Address.cpp
@@ -629,7 +629,10 @@ Address::Dump (Stream *s, ExecutionContextScope *exe_scope, DumpStyle style, Dum
                         {
                             // We have a function or a symbol from the same
                             // sections as this address.
+                            s->Indent("    Summary: ");
                             sc.DumpStopContext(s, process, *this, false);
+                            s->EOL();
+                            sc.GetDescription(s, eDescriptionLevelBrief, process);
                         }
                         else
                         {
diff --git a/lldb/source/Core/AddressResolverName.cpp b/lldb/source/Core/AddressResolverName.cpp
index 9e154c6e703..490fc464348 100644
--- a/lldb/source/Core/AddressResolverName.cpp
+++ b/lldb/source/Core/AddressResolverName.cpp
@@ -107,15 +107,24 @@ AddressResolverName::SearchCallback
       case AddressResolver::Exact:
         if (context.module_sp)
         {
-            context.module_sp->FindSymbolsWithNameAndType (m_func_name, eSymbolTypeCode, sym_list);
-            context.module_sp->FindFunctions (m_func_name, false, func_list);
+            context.module_sp->FindSymbolsWithNameAndType (m_func_name, 
+                                                           eSymbolTypeCode, 
+                                                           sym_list);
+            context.module_sp->FindFunctions (m_func_name, 
+                                              eFunctionNameTypeBase | eFunctionNameTypeFull | eFunctionNameTypeMethod | eFunctionNameTypeSelector,
+                                              false, 
+                                              func_list);
         }
         break;
       case AddressResolver::Regexp:
         if (context.module_sp)
         {
-            context.module_sp->FindSymbolsMatchingRegExAndType (m_regex, eSymbolTypeCode, sym_list);
-            context.module_sp->FindFunctions (m_regex, true, func_list);
+            context.module_sp->FindSymbolsMatchingRegExAndType (m_regex, 
+                                                                eSymbolTypeCode, 
+                                                                sym_list);
+            context.module_sp->FindFunctions (m_regex, 
+                                              true, 
+                                              func_list);
         }
         break;
       case AddressResolver::Glob:
diff --git a/lldb/source/Core/Module.cpp b/lldb/source/Core/Module.cpp
index c8e7d2f2c42..3d0b9820117 100644
--- a/lldb/source/Core/Module.cpp
+++ b/lldb/source/Core/Module.cpp
@@ -286,11 +286,11 @@ Module::FindGlobalVariables(const RegularExpression& regex, bool append, uint32_
 }
 
 uint32_t
-Module::FindFunctions(const ConstString &name, bool append, SymbolContextList& sc_list)
+Module::FindFunctions(const ConstString &name, uint32_t name_type_mask, bool append, SymbolContextList& sc_list)
 {
     SymbolVendor *symbols = GetSymbolVendor ();
     if (symbols)
-        return symbols->FindFunctions(name, append, sc_list);
+        return symbols->FindFunctions(name, name_type_mask, append, sc_list);
     return 0;
 }
 
diff --git a/lldb/source/Core/ModuleList.cpp b/lldb/source/Core/ModuleList.cpp
index ae6e27b1dd2..c928508b340 100644
--- a/lldb/source/Core/ModuleList.cpp
+++ b/lldb/source/Core/ModuleList.cpp
@@ -126,14 +126,14 @@ ModuleList::GetModuleAtIndex(uint32_t idx)
 }
 
 size_t
-ModuleList::FindFunctions (const ConstString &name, SymbolContextList &sc_list)
+ModuleList::FindFunctions (const ConstString &name, uint32_t name_type_mask, SymbolContextList &sc_list)
 {
     sc_list.Clear();
     Mutex::Locker locker(m_modules_mutex);
     collection::const_iterator pos, end = m_modules.end();
     for (pos = m_modules.begin(); pos != end; ++pos)
     {
-        (*pos)->FindFunctions (name, true, sc_list);
+        (*pos)->FindFunctions (name, name_type_mask, true, sc_list);
     }
     return sc_list.GetSize();
 }
diff --git a/lldb/source/Core/SearchFilter.cpp b/lldb/source/Core/SearchFilter.cpp
index 4c54a912801..b08f4d80d5e 100644
--- a/lldb/source/Core/SearchFilter.cpp
+++ b/lldb/source/Core/SearchFilter.cpp
@@ -113,7 +113,6 @@ SearchFilter::CompUnitPasses (CompileUnit &compUnit)
 void
 SearchFilter::GetDescription (Stream *s)
 {
-    s->PutCString("No Filter");
 }
 
 void
@@ -415,7 +414,7 @@ SearchFilterByModule::Search (Searcher &searcher)
 void
 SearchFilterByModule::GetDescription (Stream *s)
 {
-    s->PutCString("In module ");
+    s->PutCString(", module = ");
     if (s->GetVerbose())
     {
         char buffer[2048];
diff --git a/lldb/source/Core/VMRange.cpp b/lldb/source/Core/VMRange.cpp
index 29a699d6569..44b9975a810 100644
--- a/lldb/source/Core/VMRange.cpp
+++ b/lldb/source/Core/VMRange.cpp
@@ -42,9 +42,9 @@ VMRange::ContainsRange(const VMRange::collection& coll, const VMRange& range)
 
 
 void
-VMRange::Dump(Stream *s, lldb::addr_t offset) const
+VMRange::Dump(Stream *s, lldb::addr_t offset, uint32_t addr_width) const
 {
-    s->AddressRange(offset + GetBaseAddress(), offset + GetEndAddress(), sizeof (addr_t));
+    s->AddressRange(offset + GetBaseAddress(), offset + GetEndAddress(), addr_width);
 }
 
 bool