X-Git-Url: https://git.siccegge.de//index.cgi?a=blobdiff_plain;ds=sidebyside;f=src%2Fdisassembler%2Fllvm%2FLLVMDisassembler.cxx;h=5652cfb8bb2e62f6bb04813606aa82397861f65d;hb=e75c3d69cb2ebf78e156932deb136c0346b10234;hp=cf40aaa7ec882fbcd76d09645ca88740a8071231;hpb=72a9a502691a01578c06165bfe79097daafa2b05;p=frida%2Ffrida.git

diff --git a/src/disassembler/llvm/LLVMDisassembler.cxx b/src/disassembler/llvm/LLVMDisassembler.cxx
index cf40aaa..5652cfb 100644
--- a/src/disassembler/llvm/LLVMDisassembler.cxx
+++ b/src/disassembler/llvm/LLVMDisassembler.cxx
@@ -18,24 +18,20 @@ Disassembler * createLLVMDisassembler(const std::string& filename, InformationMa
 
 	std::unique_ptr<Binary> o;
 	o.reset(createBinary(filename).get());
-	const Binary * op = o.get();
+	Binary * op = o.release();
 
 	// ELFType<endian, maxalign, 64bit>
-	if (const ELF32LEObjectFile * _ = dyn_cast<ELF32LEObjectFile>(op)) {
-#pragma unused(_)
-		return new LLVMDisassembler<ELFType<support::little, 2, false>>(filename, manager);
+	if (ELF32LEObjectFile * object = dyn_cast<ELF32LEObjectFile>(op)) {
+		return new LLVMDisassembler<ELFType<support::little, 2, false>>(filename, manager, object);
 	}
-	if (const ELF64LEObjectFile * _ = dyn_cast<ELF64LEObjectFile>(op)) {
-#pragma unused(_)
-		return new LLVMDisassembler<ELFType<support::little, 2, true>>(filename, manager);
+	if (ELF64LEObjectFile * object = dyn_cast<ELF64LEObjectFile>(op)) {
+		return new LLVMDisassembler<ELFType<support::little, 2, true>>(filename, manager, object);
 	}
-	if (const ELF32BEObjectFile * _ = dyn_cast<ELF32BEObjectFile>(op)) {
-#pragma unused(_)
-		return new LLVMDisassembler<ELFType<support::big, 2, false>>(filename, manager);
+	if (ELF32BEObjectFile * object = dyn_cast<ELF32BEObjectFile>(op)) {
+		return new LLVMDisassembler<ELFType<support::big, 2, false>>(filename, manager, object);
 	}
-	if (const ELF64BEObjectFile * _ = dyn_cast<ELF64BEObjectFile>(op)) {
-#pragma unused(_)
-		return new LLVMDisassembler<ELFType<support::big, 2, true>>(filename, manager);
+	if (ELF64BEObjectFile * object = dyn_cast<ELF64BEObjectFile>(op)) {
+		return new LLVMDisassembler<ELFType<support::big, 2, true>>(filename, manager, object);
 	}
 
 	return NULL;
@@ -48,25 +44,32 @@ Disassembler * createLLVMDisassembler(const std::string& filename, InformationMa
  */
 template <typename ELFT>
 LLVMDisassembler<ELFT>::LLVMDisassembler(const std::string& filename,
-                                   InformationManager* manager)
+                                         InformationManager* manager,
+                                         ELFObjectFile<ELFT>* file)
 	: Disassembler(filename, manager)
 	, logger(log4cxx::Logger::getLogger("LLVMDisassembler"))
 	, triple("unknown-unknown-unknown")
 	, manager(manager)
 {
 	LOG4CXX_DEBUG(logger, "Handling file" << filename);
-	auto result = createBinary(filename);
 
-	error_code ec;
-	if ((ec = result.getError())) {
-		LOG4CXX_ERROR(logger, "Failed to load Binary" << ec.message());
-		binary = NULL;
-		return;
-	}
+	if (!file) {
+		auto result = createBinary(filename);
+
+		error_code ec;
+		if ((ec = result.getError())) {
+			LOG4CXX_ERROR(logger, "Failed to load Binary" << ec.message());
+			binary = NULL;
+			return;
+		}
 
-	binary.reset(result.get());
+		binary.reset(result.get());
 
-	o = dyn_cast<ObjectFile>(binary.get());
+		o = dyn_cast<ELFObjectFile<ELFT>>(binary.get());
+	} else {
+		o = file;
+		binary.reset(file);
+	}
 
 	triple.setArch(Triple::ArchType(o->getArch()));
 	std::string tripleName(triple.getTriple());
@@ -153,6 +156,7 @@ void LLVMDisassembler<ELFT>::start() {
 	readSymbols();
 	readSections();
 	disassemble();
+	readDynamicSymbols();
 }
 
 template <typename ELFT>
@@ -317,16 +321,10 @@ void LLVMDisassembler<ELFT>::disassemble() {
 	}
 
 	if (binary->isELF()) {
-		bool is64bit = (binary->getData()[4] == 0x02);
+		const ELFO * elffile = o->getELFFile();
+		const typename ELFO::Elf_Ehdr * header = elffile->getHeader();
 
-		for (int i(0); i < (is64bit? 8 : 4); ++i) {
-			if (binary->isLittleEndian()) {
-				_entryAddress |= (unsigned int)((unsigned char)binary->getData()[0x18 + i]) << 8*i;
-			} else {
-				_entryAddress = _entryAddress << 8;
-				_entryAddress |= (unsigned char)binary->getData()[0x18 + i];
-			}
-		}
+		_entryAddress = header->e_entry;
 		LOG4CXX_DEBUG(logger, "Adding entryAddress at: " << std::hex << _entryAddress);
 		std::stringstream s;
 		s << "<_start 0x" << std::hex << _entryAddress << ">";
@@ -391,6 +389,25 @@ void LLVMDisassembler<ELFT>::splitBlocks(LLVMFunction* function) {
 	}
 }
 
+template <typename ELFT>
+void LLVMDisassembler<ELFT>::readDynamicSymbols() {
+	const ELFO * elffile = o->getELFFile();
+	for (typename ELFO::Elf_Sym_Iter
+		     it = elffile->begin_dynamic_symbols(),
+		     end = elffile->end_dynamic_symbols();
+	     it != end;
+	     ++it) {
+		if (it->getType() == 2) { // Function
+			bool is_default;
+			// TODO: Error handling
+			std::string symbolname = *(elffile->getSymbolName(it));
+			std::string symbolversion = *(elffile->getSymbolVersion(nullptr, &*it, is_default));
+			manager->signal_new_dyn_symbol(symbolname + (is_default? "@@" : "@") + symbolversion);
+			LOG4CXX_DEBUG(logger, "Adding dynamic Symbol " << symbolname << (is_default? "@@" : "@") << symbolversion);
+		}
+	}
+}
+
 template <typename ELFT>
 void LLVMDisassembler<ELFT>::readSymbols() {
 	error_code ec;