Debugger: Add symbol listing to LLDB frontend

Change-Id: I10f22f54334c21fc48e634530ec79f9cc8ab56f4
Reviewed-by: hjk <hjk121@nokiamail.com>

share/qtcreator/dumper/lbridge.py

@@ -589,24 +589,47 @@ class Debugger(cmd.Cmd):
         result += "]"
         self.report(result)
 
-
-    def listModules(self):
+    def do_listModules(self, args):
         result = 'modules=['
         for module in self.target.modules:
             result += '{file="%s"' % module.file.fullpath
             result += ',name="%s"' % module.file.basename
-            #result += ',addrsize="%s"' % module.addr_size
-            #result += ',triple="%s"' % module.triple
-            #result += ',sections={"
+            result += ',addrsize="%s"' % module.addr_size
+            result += ',triple="%s"' % module.triple
+            #result += ',sections={'
             #for section in module.sections:
             #    result += '[name="%s"' % section.name
             #    result += ',addr="%s"' % section.addr
-            #    result += ',size="%s"]," % section.size
+            #    result += ',size="%s"],' % section.size
             #result += '}'
             result += '},'
         result += ']'
         self.report(result)
 
+    def do_listSymbols(self, args):
+        options = eval(args)
+        moduleName = options['module']
+        #file = lldb.SBFileSpec(moduleName)
+        #module = self.target.FindModule(file)
+        for module in self.target.modules:
+            if module.file.fullpath == moduleName:
+                break
+        result = 'symbols={module="%s"' % moduleName
+        result += ',valid="%s"' % module.IsValid()
+        result += ',sections="%s"' % module.GetNumSections()
+        result += ',symbols=['
+        for symbol in module.symbols:
+            startAddress = symbol.GetStartAddress().GetLoadAddress(self.target)
+            endAddress = symbol.GetEndAddress().GetLoadAddress(self.target)
+            result += '{type="%s"' % symbol.GetType()
+            result += ',name="%s"' % symbol.GetName()
+            result += ',address="0x%x"' % startAddress
+            result += ',demangled="%s"' % symbol.GetMangledName()
+            result += ',size="%s"' % (endAddress - startAddress)
+            result += '},'
+        result += ']}'
+        self.report(result)
+
     def executeNext(self):
         self.currentThread().StepOver()
 

src/plugins/debugger/lldb/lldbengine.cpp

@@ -253,6 +253,8 @@ void LldbEngine::handleResponse(const QByteArray &response)
             refreshLocation(item);
         else if (name == "modules")
             refreshModules(item);
+        else if (name == "symbols")
+            refreshSymbols(item);
         else if (name == "bkpts")
             refreshBreakpoints(item);
         else if (name == "disassembly")
@@ -533,10 +535,8 @@ void LldbEngine::refreshModules(const GdbMi &modules)
         module.modulePath = QString::fromUtf8(item["file"].data());
         module.moduleName = QString::fromUtf8(item["name"].data());
         module.symbolsRead = Module::UnknownReadState;
-        module.startAddress = 0;
-        //    item.findChild("loaded_addr").data().toULongLong(0, 0);
+        module.startAddress = item["loaded_addr"].toAddress();
         module.endAddress = 0; // FIXME: End address not easily available.
-        //modulesHandler()->updateModule(module);
         mods.append(module);
     }
     modulesHandler()->setModules(mods);
@@ -544,22 +544,23 @@ void LldbEngine::refreshModules(const GdbMi &modules)
 
 void LldbEngine::requestModuleSymbols(const QString &moduleName)
 {
-    runCommand(Command("requestModuleSymbols").arg("module", moduleName.toUtf8()));
+    runCommand(Command("listSymbols").arg("module", moduleName));
 }
 
-void LldbEngine::handleListSymbols(const QByteArray &response)
+void LldbEngine::refreshSymbols(const GdbMi &symbols)
 {
-    Q_UNUSED(response);
-//    GdbMi out;
-//    out.fromString(response.trimmed());
-//    Symbols symbols;
-//    QString moduleName = response.cookie.toString();
-//    foreach (const GdbMi &item, out.children()) {
-//        Symbol symbol;
-//        symbol.name = _(item.findChild("name").data());
-//        symbols.append(symbol);
-//    }
-//   debuggerCore()->showModuleSymbols(moduleName, symbols);
+    QString moduleName = QString::fromUtf8(symbols["module"].data());
+    Symbols syms;
+    foreach (const GdbMi &item, symbols["symbols"].children()) {
+        Symbol symbol;
+        symbol.address = _(item["address"].data());
+        symbol.name = _(item["name"].data());
+        symbol.state = _(item["state"].data());
+        symbol.section = _(item["section"].data());
+        symbol.demangled = _(item["demangled"].data());
+        syms.append(symbol);
+    }
+   debuggerCore()->showModuleSymbols(moduleName, syms);
 }
 
 
@@ -872,7 +873,7 @@ void LldbEngine::refreshRegisters(const GdbMi &registers)
         Register reg;
         reg.name = item["name"].data();
         reg.value = item["value"].data();
-        //reg.type = item.findChild("type").data();
+        //reg.type = item["type"].data();
         regs.append(reg);
     }
     //handler->setRegisters(registers);
@@ -895,8 +896,8 @@ void LldbEngine::refreshTypeInfo(const GdbMi &typeInfo)
 {
     if (typeInfo.type() == GdbMi::List) {
 //        foreach (const GdbMi &s, typeInfo.children()) {
-//            const GdbMi name = s.findChild("name");
-//            const GdbMi size = s.findChild("size");
+//            const GdbMi name = s["name"];
+//            const GdbMi size = s["size"];
 //            if (name.isValid() && size.isValid())
 //                m_typeInfoCache.insert(QByteArray::fromBase64(name.data()),
 //                                       TypeInfo(size.data().toUInt()));

src/plugins/debugger/lldb/lldbengine.h

@@ -155,6 +155,7 @@ private:
     void refreshState(const GdbMi &state);
     void refreshLocation(const GdbMi &location);
     void refreshModules(const GdbMi &modules);
+    void refreshSymbols(const GdbMi &symbols);
     void refreshBreakpoints(const GdbMi &bkpts);
     void runContinuation(const GdbMi &data);