X-Git-Url: https://git.siccegge.de//index.cgi?p=frida%2Ffrida.git;a=blobdiff_plain;f=src%2Fdisassembler%2Fllvm%2FLLVMDisassembler.cxx;h=1ae024a5aea39f9ef6dd786e3933768e8cc6cf5c;hp=c2b0527f1f33b2a158c8505776d034e6cbad4e20;hb=70d986e452c08aea59d947bfd5700f6c60b3f820;hpb=181d12ec9311d9bb216f18b7774ed1d621fdc4ed

diff --git a/src/disassembler/llvm/LLVMDisassembler.cxx b/src/disassembler/llvm/LLVMDisassembler.cxx
index c2b0527..1ae024a 100644
--- a/src/disassembler/llvm/LLVMDisassembler.cxx
+++ b/src/disassembler/llvm/LLVMDisassembler.cxx
@@ -92,8 +92,11 @@ LLVMDisassembler::LLVMDisassembler(const std::string& filename)
     RelInfo.release();
     Symzer.release();
 
-
     MIA.reset(target->createMCInstrAnalysis(MII.get()));
+    if (!MIA) {
+        LOG4CXX_ERROR(logger, "no instruction analysis for target " << tripleName);
+        return;
+    }
 
     int AsmPrinterVariant = AsmInfo->getAssemblerDialect();
     IP.reset(target->createMCInstPrinter(AsmPrinterVariant, *AsmInfo, *MII, *MRI, *STI));
@@ -152,6 +155,40 @@ void LLVMDisassembler::disassemble() {
         }
     }
 
+    if (binary->isELF()) {
+        bool is64bit = (binary->getData()[4] == 0x02);
+
+        uint64_t entry(0);
+        for (int i(0); i < (is64bit? 8 : 4); ++i) {
+            if (binary->isLittleEndian()) {
+                entry |= (unsigned int)((unsigned char)binary->getData()[0x18 + i]) << 8*i;
+            } else {
+                entry = entry << 8;
+                entry |= (unsigned char)binary->getData()[0x18 + i];
+            }
+        }
+        if (functions.find(entry) == functions.end()) {
+            LOG4CXX_DEBUG(logger, "Adding entry at: " << std::hex << entry);
+            std::stringstream s;
+            s << "<_start 0x" << std::hex << entry << ">";
+            LLVMFunction * fun = new LLVMFunction(s.str(), entry);
+            functions.insert(std::make_pair(entry, fun));
+            remaining_functions.push(fun);
+        }
+    }
+
+    if (functions.empty()) {
+        uint64_t text_entry;
+        text_section.getAddress(text_entry);
+        LOG4CXX_INFO(logger, "No Symbols found, starting at the beginning of the text segment");
+
+        std::stringstream s;
+        s << "<Unnamed 0x" << std::hex << text_entry << ">";
+        LLVMFunction * fun = new LLVMFunction(s.str(), text_entry);
+        functions.insert(std::make_pair(text_entry, fun));
+        remaining_functions.push(fun);
+    }
+
     StringRef bytes;
     text_section.getContents(bytes);
     StringRefMemoryObject ref(bytes);