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

diff --git a/src/disassembler/llvm/LLVMDisassembler.cxx b/src/disassembler/llvm/LLVMDisassembler.cxx
index 7d4da01..cf40aaa 100644
--- a/src/disassembler/llvm/LLVMDisassembler.cxx
+++ b/src/disassembler/llvm/LLVMDisassembler.cxx
@@ -13,6 +13,9 @@ using std::error_code;
  *
  */
 Disassembler * createLLVMDisassembler(const std::string& filename, InformationManager* manager) {
+	if (filename == "")
+		return NULL;
+
 	std::unique_ptr<Binary> o;
 	o.reset(createBinary(filename).get());
 	const Binary * op = o.get();
@@ -429,8 +432,9 @@ void LLVMDisassembler<ELFT>::forEachFunction(std::function<void (uint64_t, Funct
 
 template <typename ELFT>
 void LLVMDisassembler<ELFT>::printEachInstruction(uint64_t start, uint64_t end,
-                                            std::function<void (uint8_t*, size_t,
-                                                                const std::string&)> fun) {
+                                                  std::function<void (uint8_t*, size_t,
+	                                                                  const std::string&,
+	                                                                  const std::string&)> fun) {
 	SectionRef text_section = sections[".text"];
 	uint64_t base_address;
 	text_section.getAddress(base_address);
@@ -453,17 +457,24 @@ void LLVMDisassembler<ELFT>::printEachInstruction(uint64_t start, uint64_t end,
 			ref.readBytes(current_address, inst_size, bytes);
 
 			uint64_t jmptarget;
+			std::string ref("");
+			IP->printInst(&inst, s, "");
 			if (MIA->evaluateBranch(inst, current_address, inst_size, jmptarget)) {
 				std::stringstream stream;
+				if (MIA->isCall(inst))
+					stream << "function:";
+				else
+					stream << "block:";
+
 				stream << std::hex << (base_address + jmptarget);
-				IP->printInst(&inst, s, stream.str());
-			} else
-				IP->printInst(&inst, s, "");
+				ref = stream.str();
+			}
+
 
-			fun(bytes, inst_size, s.str());
+			fun(bytes, inst_size, s.str(), ref);
 		} else {
 			LOG4CXX_WARN(logger, "Invalid byte at" << std::hex << current_address + base_address);
-			fun(NULL, 0, "Invalid Byte");
+			fun(NULL, 0, "Invalid Byte", "");
 			inst_size = 1;
 		}