X-Git-Url: https://git.siccegge.de//index.cgi?p=frida%2Ffrida.git;a=blobdiff_plain;f=src%2Fdisassembler%2Fllvm%2FLLVMDisassembler.cxx;h=3023f9397d8f2339230c75c2d4e8169a91aa464d;hp=58d122ab4d51472715c5288c99e7e846080f429a;hb=4443ad3e38327c776dcc68538591456d37c9ed6f;hpb=293c2d1bb5fee3008630ab3fe6d0ac30d21b1d95

diff --git a/src/disassembler/llvm/LLVMDisassembler.cxx b/src/disassembler/llvm/LLVMDisassembler.cxx
index 58d122a..3023f93 100644
--- a/src/disassembler/llvm/LLVMDisassembler.cxx
+++ b/src/disassembler/llvm/LLVMDisassembler.cxx
@@ -1,3 +1,4 @@
+#include "disassembler/Instruction.hxx"
 #include "disassembler/llvm/LLVMDisassembler.hxx"
 #include "core/InformationManager.hxx"
 #include "core/Function.hxx"
@@ -524,6 +525,60 @@ void LLVMDisassembler<ELFT>::readSections() {
 // 	//               });
 // }
 
+template <typename ELFT>
+std::list<Instruction> LLVMDisassembler<ELFT>::getInstructions(const BasicBlock *block) {
+	std::list<Instruction> result;
+	SectionRef text_section = getTextSection();
+	uint64_t base_address;
+	text_section.getAddress(base_address);
+	uint64_t current_address = block->getStartAddress() - base_address;
+	uint64_t end_position = block->getEndAddress() - base_address;
+
+	StringRef bytes;
+	text_section.getContents(bytes);
+	StringRefMemoryObject ref(bytes);
+
+	while (current_address < end_position) {
+		uint64_t inst_size;
+		MCInst inst;
+		std::string buf;
+		llvm::raw_string_ostream s(buf);
+
+		if(llvm::MCDisassembler::Success ==
+		   DisAsm->getInstruction(inst, inst_size, ref, current_address, nulls(), nulls())) {
+
+			uint8_t bytes[inst_size+2];
+			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);
+				ref = stream.str();
+			}
+			result.push_back(Instruction(current_address + base_address, s.str(),
+			                             std::vector<uint8_t>(bytes, bytes+inst_size), ref));
+		} else {
+			LOG4CXX_WARN(logger, "Invalid byte at" << std::hex << current_address + base_address);
+			uint8_t bytes[1];
+			ref.readBytes(current_address, 1, bytes);
+			result.push_back(Instruction(current_address + base_address, "Invalid Instruction",
+			                             std::vector<uint8_t>(bytes, bytes+1), ""));
+			inst_size = 1;
+		}
+
+		current_address += inst_size;
+	}
+	return result;
+}
+
 template <typename ELFT>
 void LLVMDisassembler<ELFT>::printEachInstruction(uint64_t start, uint64_t end,
                                                   std::function<void (uint8_t*, size_t,