X-Git-Url: https://git.siccegge.de//index.cgi?p=frida%2Ffrida.git;a=blobdiff_plain;f=src%2Fdisassembler%2Fllvm%2FLLVMDisassembler.cxx;h=049f1fc90477b82d1a30427bbd7352a9d7a98cf3;hp=831a1a9da7a09f0e34ca055e49e8c4bb640fcc3d;hb=5d65588185f3d19fc6fa311f642cc5fd78966087;hpb=937eb556b5c04d6379e0ffde2e13c3065e053a3a diff --git a/src/disassembler/llvm/LLVMDisassembler.cxx b/src/disassembler/llvm/LLVMDisassembler.cxx index 831a1a9..049f1fc 100644 --- a/src/disassembler/llvm/LLVMDisassembler.cxx +++ b/src/disassembler/llvm/LLVMDisassembler.cxx @@ -694,83 +694,6 @@ std::vector LLVMDisassembler::getInstructions(const BasicBloc return result; } -template -void LLVMDisassembler::printEachInstruction(uint64_t start, uint64_t end, - std::function fun) { - SectionRef text_section = getTextSection(); - uint64_t base_address; -#if defined(LLVM_35) - text_section.getAddress(base_address); -#elif defined(LLVM_36) - base_address = text_section.getAddress(); -#endif - - uint64_t current_address = start - base_address; - - StringRef bytes; - text_section.getContents(bytes); -#if defined(LLVM_35) - StringRefMemoryObject ref(bytes); -#elif defined(LLVM_36) - ArrayRef bytearray(reinterpret_cast(bytes.data()), - bytes.size()); -#endif - - - while (current_address < end - base_address) { - uint64_t inst_size; - MCInst inst; - std::string buf; - llvm::raw_string_ostream s(buf); - - if(llvm::MCDisassembler::Success == -#if defined(LLVM_35) - DisAsm->getInstruction(inst, inst_size, ref, current_address, nulls(), nulls())) { -#elif defined(LLVM_36) - DisAsm->getInstruction(inst, inst_size, - bytearray.slice(current_address), - base_address + current_address, - nulls(), nulls())) { -#endif - - uint8_t bytes[inst_size+2]; -#if defined(LLVM_35) - ref.readBytes(current_address, inst_size, bytes); -#elif defined(LLVM_36) - size_t bytesindex(0); - for (uint8_t byte : bytearray.slice(current_address, inst_size)) { - bytes[bytesindex++] = byte; - } -#endif - - 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(); - } - - - 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", ""); - inst_size = 1; - } - - current_address += inst_size; - } -} - template SectionRef LLVMDisassembler::getTextSection() { return sections[".text"];