Hooked up ability to look up data symbols so they show up in disassembly

if the address comes from a data section. 

Fixed an issue that could occur when looking up a symbol that has a zero
byte size where no match would be returned even if there was an exact symbol
match.

Cleaned up the section dump output and added the section type into the output.

llvm-svn: 116017

1 files changed, 28 insertions, 0 deletions

diff --git a/lldb/source/Core/Address.cpp b/lldb/source/Core/Address.cpp
index c880d84b7c6..d8e1f2568a4 100644
--- a/lldb/source/Core/Address.cpp
+++ b/lldb/source/Core/Address.cpp
@@ -466,6 +466,34 @@ Address::Dump (Stream *s, ExecutionContextScope *exe_scope, DumpStyle style, Dum
                 SectionType sect_type = section->GetType();
                 switch (sect_type)
                 {
+                case eSectionTypeData:
+                    if (module)
+                    {
+                        ObjectFile *objfile = module->GetObjectFile();
+                        if (objfile)
+                        {
+                            Symtab *symtab = objfile->GetSymtab();
+                            if (symtab)
+                            {
+                                const addr_t file_Addr = GetFileAddress();
+                                Symbol *symbol = symtab->FindSymbolContainingFileAddress (file_Addr);
+                                if (symbol)
+                                {
+                                    const char *symbol_name = symbol->GetName().AsCString();
+                                    if (symbol_name)
+                                    {
+                                        s->PutCString(symbol_name);
+                                        addr_t delta = file_Addr - symbol->GetAddressRangePtr()->GetBaseAddress().GetFileAddress();
+                                        if (delta)
+                                            s->Printf(" + %llu", delta);
+                                        showed_info = true;
+                                    }
+                                }
+                            }
+                        }
+                    }
+                    break;
+
                 case eSectionTypeDataCString:
                     // Read the C string from memory and display it
                     showed_info = true;