From 59181afa72eb08a7716d5bebd83b0be6a972e5f1 Mon Sep 17 00:00:00 2001 From: Christoph Egger Date: Tue, 27 May 2014 13:20:13 +0200 Subject: [PATCH] Remove old leftovers --- src/Binary.cxx | 668 ++++++++++----------- src/Binary.hxx | 76 ++- src/disassembler.old/BasicBlock.hxx | 8 - src/disassembler.old/Disassembler.cxx | 12 - src/disassembler.old/Disassembler.hxx | 15 - src/disassembler.old/Instruction.hxx | 6 - src/disassembler.old/InstructionReader.cxx | 27 - src/disassembler.old/InstructionReader.hxx | 18 - src/disassembler.old/Target.cxx | 28 - src/disassembler.old/Target.hxx | 31 - 10 files changed, 370 insertions(+), 519 deletions(-) delete mode 100644 src/disassembler.old/BasicBlock.hxx delete mode 100644 src/disassembler.old/Disassembler.cxx delete mode 100644 src/disassembler.old/Disassembler.hxx delete mode 100644 src/disassembler.old/Instruction.hxx delete mode 100644 src/disassembler.old/InstructionReader.cxx delete mode 100644 src/disassembler.old/InstructionReader.hxx delete mode 100644 src/disassembler.old/Target.cxx delete mode 100644 src/disassembler.old/Target.hxx diff --git a/src/Binary.cxx b/src/Binary.cxx index a659d5c..f877685 100644 --- a/src/Binary.cxx +++ b/src/Binary.cxx @@ -80,396 +80,394 @@ namespace { } } -namespace qtlldb { +::Binary::Binary(const std::string& filename) + : triple(llvm::Twine("unkown-unknown-unknown")) +{ + ::Disassembler d(filename); + std::string error; + + binary = createBinary(filename).get(); + if (Archive *a = dyn_cast(binary)) { + std::cerr << "Got an archive!" << std::endl; + return; + } - Binary::Binary(const std::string& filename) - : triple("unkown-unknown-unknown") - { - ::Disassembler d(filename); - std::string error; + o = dyn_cast(binary); - binary = createBinary(filename).get(); - if (Archive *a = dyn_cast(binary)) { - std::cerr << "Got an archive!" << std::endl; - return; - } + triple.setArch(Triple::ArchType(o->getArch())); + std::string tripleName(triple.getTriple()); - o = dyn_cast(binary); + outs() << tripleName << "\n"; - triple.setArch(Triple::ArchType(o->getArch())); - std::string tripleName(triple.getTriple()); + target = TargetRegistry::lookupTarget("", triple, error); + if (!target) { + std::cerr << error; + return; + } - outs() << tripleName << "\n"; + outs() << target->getName() << "\n"; - target = TargetRegistry::lookupTarget("", triple, error); - if (!target) { - std::cerr << error; - return; - } + MRI.reset(target->createMCRegInfo(tripleName)); + if (!MRI) { + std::cerr << "error: no register info for target " << tripleName << "\n"; + return; + } - outs() << target->getName() << "\n"; + // Set up disassembler. + AsmInfo.reset(target->createMCAsmInfo(*MRI, tripleName)); + if (!AsmInfo) { + std::cerr << "error: no assembly info for target " << tripleName << "\n"; + return; + } - MRI.reset(target->createMCRegInfo(tripleName)); - if (!MRI) { - std::cerr << "error: no register info for target " << tripleName << "\n"; - return; - } + STI.reset(target->createMCSubtargetInfo(tripleName, "", "")); + if (!STI) { + errs() << "error: no subtarget info for target " << tripleName << "\n"; + return; + } - // Set up disassembler. - AsmInfo.reset(target->createMCAsmInfo(*MRI, tripleName)); - if (!AsmInfo) { - std::cerr << "error: no assembly info for target " << tripleName << "\n"; - return; - } + MII.reset(target->createMCInstrInfo()); + if (!MII) { + std::cerr << "error: no instruction info for target " << tripleName << "\n"; + return; + } - STI.reset(target->createMCSubtargetInfo(tripleName, "", "")); - if (!STI) { - errs() << "error: no subtarget info for target " << tripleName << "\n"; - return; - } + DisAsm.reset(target->createMCDisassembler(*STI)); + if (!DisAsm) { + std::cerr << "error: no disassembler for target " << tripleName << "\n"; + return; + } - MII.reset(target->createMCInstrInfo()); - if (!MII) { - std::cerr << "error: no instruction info for target " << tripleName << "\n"; - return; - } + MOFI.reset(new MCObjectFileInfo); + Ctx.reset(new MCContext(AsmInfo.get(), MRI.get(), MOFI.get())); + RelInfo.reset( + target->createMCRelocationInfo(tripleName, *Ctx.get())); + if (RelInfo) { + Symzer.reset( + MCObjectSymbolizer::createObjectSymbolizer(*Ctx.get(), RelInfo, o)); + if (Symzer) + DisAsm->setSymbolizer(Symzer); + } - DisAsm.reset(target->createMCDisassembler(*STI)); - if (!DisAsm) { - std::cerr << "error: no disassembler for target " << tripleName << "\n"; - return; - } + MIA.reset(target->createMCInstrAnalysis(MII.get())); - MOFI.reset(new MCObjectFileInfo); - Ctx.reset(new MCContext(AsmInfo.get(), MRI.get(), MOFI.get())); - RelInfo.reset( - target->createMCRelocationInfo(tripleName, *Ctx.get())); - if (RelInfo) { - Symzer.reset( - MCObjectSymbolizer::createObjectSymbolizer(*Ctx.get(), RelInfo, o)); - if (Symzer) - DisAsm->setSymbolizer(Symzer); - } + int AsmPrinterVariant = AsmInfo->getAssemblerDialect(); + IP.reset(target->createMCInstPrinter(AsmPrinterVariant, *AsmInfo, *MII, *MRI, *STI)); + if (!IP) { + std::cerr << "error: no instruction printer for target " << tripleName + << '\n'; + return; + } - MIA.reset(target->createMCInstrAnalysis(MII.get())); + OwningPtr OD( + new MCObjectDisassembler(*o, *DisAsm, *MIA)); + Mod.reset(OD->buildModule(/* withCFG */ false)); - int AsmPrinterVariant = AsmInfo->getAssemblerDialect(); - IP.reset(target->createMCInstPrinter(AsmPrinterVariant, *AsmInfo, *MII, *MRI, *STI)); - if (!IP) { - std::cerr << "error: no instruction printer for target " << tripleName - << '\n'; - return; - } + symbols = readSymbols(*o); + sections = readSections(*o); - OwningPtr OD( - new MCObjectDisassembler(*o, *DisAsm, *MIA)); - Mod.reset(OD->buildModule(/* withCFG */ false)); + // for_each(sections.begin(), sections.end(), [](const std::pair& i){ + // std::cout << "Section: " << i.first << std::endl; + // }); +} - symbols = readSymbols(*o); - sections = readSections(*o); - // for_each(sections.begin(), sections.end(), [](const std::pair& i){ - // std::cout << "Section: " << i.first << std::endl; - // }); - } +std::vector +::Binary::getSymbols() { + error_code ec; + SectionRef r = sections[".text"]; + std::vector result; + for_each(symbols.begin(), symbols.end(), [&](const std::pair& i) { + bool contains; + SymbolRef::Type t; + if (!error(r.containsSymbol(i.second, contains)) && contains) { + i.second.getType(t); + if (SymbolRef::ST_Function == t) + result.push_back(i.first); + } + }); + return result; +} +void ::Binary::for_each_instruction(const std::string& function, + std::function callback) { + StringRef bytes; + uint64_t base_address, address, ssize, size(0), index, end; + StringRefMemoryObject memoryObject(""); + + if (symbols.end() != symbols.find(function)) { + SymbolRef ref; + section_iterator sec(o->section_begin()); + + ref = symbols.at(function); + if (error(ref.getSection(sec))) return; + if (error(ref.getAddress(address))) return; + if (address == UnknownAddressOrSize) return; + if (error(ref.getSize(ssize))) return; + if (error(sec->getAddress(base_address))) return; + if (error(sec->getContents(bytes))) return; + memoryObject = bytes; - std::vector Binary::getSymbols() { - error_code ec; - SectionRef r = sections[".text"]; - std::vector result; - for_each(symbols.begin(), symbols.end(), [&](const std::pair& i) { - bool contains; - SymbolRef::Type t; - if (!error(r.containsSymbol(i.second, contains)) && contains) { - i.second.getType(t); - if (SymbolRef::ST_Function == t) - result.push_back(i.first); - } - }); - return result; + } + else if (sections.end() != sections.find(function)) { + SectionRef sref = sections.at(function); + if (error(sref.getAddress(address))) return; + if (address == UnknownAddressOrSize) return; + if (error(sref.getSize(ssize))) return; + if (error(sref.getContents(bytes))) return; + base_address = address; + memoryObject = bytes; } - void Binary::for_each_instruction(const std::string& function, - std::function callback) { - StringRef bytes; - uint64_t base_address, address, ssize, size(0), index, end; - StringRefMemoryObject memoryObject(""); - - if (symbols.end() != symbols.find(function)) { - SymbolRef ref; - section_iterator sec(o->section_begin()); - - ref = symbols.at(function); - if (error(ref.getSection(sec))) return; - if (error(ref.getAddress(address))) return; - if (address == UnknownAddressOrSize) return; - if (error(ref.getSize(ssize))) return; - if (error(sec->getAddress(base_address))) return; - if (error(sec->getContents(bytes))) return; - memoryObject = bytes; - } - else if (sections.end() != sections.find(function)) { - SectionRef sref = sections.at(function); - if (error(sref.getAddress(address))) return; - if (address == UnknownAddressOrSize) return; - if (error(sref.getSize(ssize))) return; - if (error(sref.getContents(bytes))) return; - base_address = address; - memoryObject = bytes; - } + // outs() << "Start for_each_instruction " << function << "\n"; - // outs() << "Start for_each_instruction " << function << "\n"; + for (end = address + ssize - base_address, index = address - base_address; index < end; index += size) { + MCInst Inst; - - for (end = address + ssize - base_address, index = address - base_address; index < end; index += size) { - MCInst Inst; - - if (DisAsm->getInstruction(Inst, size, memoryObject, index, - nulls(), nulls())) { - std::string buf; - llvm::raw_string_ostream s(buf); - IP->printInst(&Inst, s, ""); + if (DisAsm->getInstruction(Inst, size, memoryObject, index, + nulls(), nulls())) { + std::string buf; + llvm::raw_string_ostream s(buf); + IP->printInst(&Inst, s, ""); - if (index + size < bytes.str().length()) - callback(base_address + index, bytes.str().substr(index, size), s.str()); + if (index + size < bytes.str().length()) + callback(base_address + index, bytes.str().substr(index, size), s.str()); - } else { - errs() << "warning: invalid instruction encoding\n"; - if (size == 0) - size = 1; // skip illegible bytes - } + } else { + errs() << "warning: invalid instruction encoding\n"; + if (size == 0) + size = 1; // skip illegible bytes } - // outs() << "End for_each_instruction\n"; - } + // outs() << "End for_each_instruction\n"; - void Binary::disassemble() { - for (MCModule::const_atom_iterator AI = Mod->atom_begin(), - AE = Mod->atom_end(); - AI != AE; ++AI) { +} - if ((*AI)->getKind() != llvm::MCAtom::TextAtom) - continue; +void ::Binary::disassemble() { + for (MCModule::const_atom_iterator AI = Mod->atom_begin(), + AE = Mod->atom_end(); + AI != AE; ++AI) { - outs() << "\n\nAtom " << (*AI)->getName() << ": \n"; - if (const MCTextAtom *TA = dyn_cast(*AI)) { - for (MCTextAtom::const_iterator II = TA->begin(), IE = TA->end(); - II != IE; - ++II) { + if ((*AI)->getKind() != llvm::MCAtom::TextAtom) + continue; + + outs() << "\n\nAtom " << (*AI)->getName() << ": \n"; + if (const MCTextAtom *TA = dyn_cast(*AI)) { + for (MCTextAtom::const_iterator II = TA->begin(), IE = TA->end(); + II != IE; + ++II) { // II->Inst.dump(); - IP->printInst(&II->Inst, outs(), ""); - outs() << "\n"; - } + IP->printInst(&II->Inst, outs(), ""); + outs() << "\n"; } } - - outs() << "binary " << triple.getArchName() << "\n"; } - void Binary::disassemble_functions() { - error_code ec; - for (section_iterator i = o->section_begin(), - e = o->section_end(); - i != e; ++i) { - if (error(ec)) break; - bool text; - if (error(i->isText(text))) break; - if (!text) continue; - - uint64_t SectionAddr; - if (error(i->getAddress(SectionAddr))) break; - - // Make a list of all the symbols in this section. - std::vector > Symbols; - for (symbol_iterator si = o->symbol_begin(), - se = o->symbol_end(); - si != se; ++si) { - bool contains; - if (!error(i->containsSymbol(*si, contains)) && contains) { - uint64_t Address; - if (error(si->getAddress(Address))) break; - if (Address == UnknownAddressOrSize) continue; - Address -= SectionAddr; - - StringRef Name; - if (error(si->getName(Name))) break; - - outs() << "\nXXX " << Name << "\n"; - - Symbols.push_back(std::make_pair(Address, Name)); - } + outs() << "binary " << triple.getArchName() << "\n"; +} + +void ::Binary::disassemble_functions() { + error_code ec; + for (section_iterator i = o->section_begin(), + e = o->section_end(); + i != e; ++i) { + if (error(ec)) break; + bool text; + if (error(i->isText(text))) break; + if (!text) continue; + + uint64_t SectionAddr; + if (error(i->getAddress(SectionAddr))) break; + + // Make a list of all the symbols in this section. + std::vector > Symbols; + for (symbol_iterator si = o->symbol_begin(), + se = o->symbol_end(); + si != se; ++si) { + bool contains; + if (!error(i->containsSymbol(*si, contains)) && contains) { + uint64_t Address; + if (error(si->getAddress(Address))) break; + if (Address == UnknownAddressOrSize) continue; + Address -= SectionAddr; + + StringRef Name; + if (error(si->getName(Name))) break; + + outs() << "\nXXX " << Name << "\n"; + + Symbols.push_back(std::make_pair(Address, Name)); } + } - // Sort the symbols by address, just in case they didn't come in that way. - array_pod_sort(Symbols.begin(), Symbols.end()); - - // Make a list of all the relocations for this section. - std::vector Rels; - // if (InlineRelocs) { - // for (relocation_iterator ri = i->begin_relocations(), - // re = i->end_relocations(); - // ri != re; ri.increment(ec)) { - // if (error(ec)) break; - // Rels.push_back(*ri); - // } - // } - - // Sort relocations by address. - std::sort(Rels.begin(), Rels.end(), RelocAddressLess); - - StringRef SegmentName = ""; - // if (const MachOObjectFile *MachO = - // dyn_cast(o)) { - // DataRefImpl DR = i->getRawDataRefImpl(); - // SegmentName = MachO->getSectionFinalSegmentName(DR); - // } - StringRef name; - if (error(i->getName(name))) break; - outs() << "Disassembly of section "; - if (!SegmentName.empty()) - outs() << SegmentName << ","; - outs() << name << ':'; - - // If the section has no symbols just insert a dummy one and disassemble - // the whole section. - if (Symbols.empty()) - Symbols.push_back(std::make_pair(0, name)); - - - StringRef Bytes; - if (error(i->getContents(Bytes))) break; - StringRefMemoryObject memoryObject(Bytes); - uint64_t Size; - uint64_t Index; - uint64_t SectSize; - if (error(i->getSize(SectSize))) break; - - std::vector::const_iterator rel_cur = Rels.begin(); - std::vector::const_iterator rel_end = Rels.end(); - // Disassemble symbol by symbol. - for (unsigned si = 0, se = Symbols.size(); si != se; ++si) { - uint64_t Start = Symbols[si].first; - uint64_t End; - // The end is either the size of the section or the beginning of the next - // symbol. - if (si == se - 1) - End = SectSize; - // Make sure this symbol takes up space. - else if (Symbols[si + 1].first != Start) - End = Symbols[si + 1].first - 1; - else - // This symbol has the same address as the next symbol. Skip it. - continue; - - outs() << '\n' << Symbols[si].second << ":\n"; + // Sort the symbols by address, just in case they didn't come in that way. + array_pod_sort(Symbols.begin(), Symbols.end()); + + // Make a list of all the relocations for this section. + std::vector Rels; + // if (InlineRelocs) { + // for (relocation_iterator ri = i->begin_relocations(), + // re = i->end_relocations(); + // ri != re; ri.increment(ec)) { + // if (error(ec)) break; + // Rels.push_back(*ri); + // } + // } + + // Sort relocations by address. + std::sort(Rels.begin(), Rels.end(), RelocAddressLess); + + StringRef SegmentName = ""; + // if (const MachOObjectFile *MachO = + // dyn_cast(o)) { + // DataRefImpl DR = i->getRawDataRefImpl(); + // SegmentName = MachO->getSectionFinalSegmentName(DR); + // } + StringRef name; + if (error(i->getName(name))) break; + outs() << "Disassembly of section "; + if (!SegmentName.empty()) + outs() << SegmentName << ","; + outs() << name << ':'; + + // If the section has no symbols just insert a dummy one and disassemble + // the whole section. + if (Symbols.empty()) + Symbols.push_back(std::make_pair(0, name)); + + + StringRef Bytes; + if (error(i->getContents(Bytes))) break; + StringRefMemoryObject memoryObject(Bytes); + uint64_t Size; + uint64_t Index; + uint64_t SectSize; + if (error(i->getSize(SectSize))) break; + + std::vector::const_iterator rel_cur = Rels.begin(); + std::vector::const_iterator rel_end = Rels.end(); + // Disassemble symbol by symbol. + for (unsigned si = 0, se = Symbols.size(); si != se; ++si) { + uint64_t Start = Symbols[si].first; + uint64_t End; + // The end is either the size of the section or the beginning of the next + // symbol. + if (si == se - 1) + End = SectSize; + // Make sure this symbol takes up space. + else if (Symbols[si + 1].first != Start) + End = Symbols[si + 1].first - 1; + else + // This symbol has the same address as the next symbol. Skip it. + continue; + + outs() << '\n' << Symbols[si].second << ":\n"; #ifndef NDEBUG - raw_ostream &DebugOut = nulls(); //DebugFlag ? dbgs() : nulls(); + raw_ostream &DebugOut = nulls(); //DebugFlag ? dbgs() : nulls(); #else - raw_ostream &DebugOut = nulls(); + raw_ostream &DebugOut = nulls(); #endif - for (Index = Start; Index < End; Index += Size) { - MCInst Inst; - - if (DisAsm->getInstruction(Inst, Size, memoryObject, Index, - DebugOut, nulls())) { - outs() << format("%8" PRIx64 ":", SectionAddr + Index); - outs() << "\t"; - DumpBytes(StringRef(Bytes.data() + Index, Size)); - - IP->printInst(&Inst, outs(), ""); - outs() << "\n"; - } else { - errs() << "warning: invalid instruction encoding\n"; - if (Size == 0) - Size = 1; // skip illegible bytes - } - - // Print relocation for instruction. - while (rel_cur != rel_end) { - bool hidden = false; - uint64_t addr; - SmallString<16> name; - SmallString<32> val; - - // If this relocation is hidden, skip it. - if (error(rel_cur->getHidden(hidden))) goto skip_print_rel; - if (hidden) goto skip_print_rel; - - if (error(rel_cur->getOffset(addr))) goto skip_print_rel; - // Stop when rel_cur's address is past the current instruction. - if (addr >= Index + Size) break; - if (error(rel_cur->getTypeName(name))) goto skip_print_rel; - if (error(rel_cur->getValueString(val))) goto skip_print_rel; - - outs() << format("\t\t\t%8" PRIx64 ": ", SectionAddr + addr) << name - << "\t" << val << "\n"; - - skip_print_rel: - ++rel_cur; - } + for (Index = Start; Index < End; Index += Size) { + MCInst Inst; + + if (DisAsm->getInstruction(Inst, Size, memoryObject, Index, + DebugOut, nulls())) { + outs() << format("%8" PRIx64 ":", SectionAddr + Index); + outs() << "\t"; + DumpBytes(StringRef(Bytes.data() + Index, Size)); + + IP->printInst(&Inst, outs(), ""); + outs() << "\n"; + } else { + errs() << "warning: invalid instruction encoding\n"; + if (Size == 0) + Size = 1; // skip illegible bytes + } + + // Print relocation for instruction. + while (rel_cur != rel_end) { + bool hidden = false; + uint64_t addr; + SmallString<16> name; + SmallString<32> val; + + // If this relocation is hidden, skip it. + if (error(rel_cur->getHidden(hidden))) goto skip_print_rel; + if (hidden) goto skip_print_rel; + + if (error(rel_cur->getOffset(addr))) goto skip_print_rel; + // Stop when rel_cur's address is past the current instruction. + if (addr >= Index + Size) break; + if (error(rel_cur->getTypeName(name))) goto skip_print_rel; + if (error(rel_cur->getValueString(val))) goto skip_print_rel; + + outs() << format("\t\t\t%8" PRIx64 ": ", SectionAddr + addr) << name + << "\t" << val << "\n"; + + skip_print_rel: + ++rel_cur; } } } } +} - void Binary::disassemble_cfg() { - for (MCModule::const_func_iterator FI = Mod->func_begin(), - FE = Mod->func_end(); - FI != FE; ++FI) { - static int filenum = 0; - std::string FileName = std::string("dot/") + (Twine((*FI)->getName()) + "_" + utostr(filenum) + ".dot").str(); - - std::cerr << FileName << std::endl; - - // Start a new dot file. - std::string Error; - raw_fd_ostream Out(FileName.c_str(), Error); - if (!Error.empty()) { - errs() << "llvm-objdump: warning: " << Error << '\n'; - return; - } +void ::Binary::disassemble_cfg() { + for (MCModule::const_func_iterator FI = Mod->func_begin(), + FE = Mod->func_end(); + FI != FE; ++FI) { + static int filenum = 0; + std::string FileName = std::string("dot/") + (Twine((*FI)->getName()) + "_" + utostr(filenum) + ".dot").str(); - Out << "digraph \"" << (*FI)->getName() << "\" {\n"; - Out << "graph [ rankdir = \"LR\" ];\n"; - for (MCFunction::const_iterator i = (*FI)->begin(), e = (*FI)->end(); i != e; ++i) { - // Only print blocks that have predecessors. - bool hasPreds = (*i)->pred_begin() != (*i)->pred_end(); - - if (!hasPreds && i != (*FI)->begin()) - continue; - - Out << '"' << (*i)->getInsts()->getBeginAddr() << "\" [ label=\""; - // Print instructions. - for (unsigned ii = 0, ie = (*i)->getInsts()->size(); ii != ie; - ++ii) { - if (ii != 0) // Not the first line, start a new row. - Out << '|'; - if (ii + 1 == ie) // Last line, add an end id. - Out << ""; - - // Escape special chars and print the instruction in mnemonic form. - std::string Str; - raw_string_ostream OS(Str); - IP->printInst(&(*i)->getInsts()->at(ii).Inst, OS, ""); - Out << DOT::EscapeString(OS.str()); - } - Out << "\" shape=\"record\" ];\n"; + std::cerr << FileName << std::endl; + + // Start a new dot file. + std::string Error; + raw_fd_ostream Out(FileName.c_str(), Error); + if (!Error.empty()) { + errs() << "llvm-objdump: warning: " << Error << '\n'; + return; + } - // Add edges. - for (MCBasicBlock::succ_const_iterator si = (*i)->succ_begin(), - se = (*i)->succ_end(); si != se; ++si) - Out << (*i)->getInsts()->getBeginAddr() << ":o -> " - << (*si)->getInsts()->getBeginAddr() << ":a\n"; + Out << "digraph \"" << (*FI)->getName() << "\" {\n"; + Out << "graph [ rankdir = \"LR\" ];\n"; + for (MCFunction::const_iterator i = (*FI)->begin(), e = (*FI)->end(); i != e; ++i) { + // Only print blocks that have predecessors. + bool hasPreds = (*i)->pred_begin() != (*i)->pred_end(); + + if (!hasPreds && i != (*FI)->begin()) + continue; + + Out << '"' << (*i)->getInsts()->getBeginAddr() << "\" [ label=\""; + // Print instructions. + for (unsigned ii = 0, ie = (*i)->getInsts()->size(); ii != ie; + ++ii) { + if (ii != 0) // Not the first line, start a new row. + Out << '|'; + if (ii + 1 == ie) // Last line, add an end id. + Out << ""; + + // Escape special chars and print the instruction in mnemonic form. + std::string Str; + raw_string_ostream OS(Str); + IP->printInst(&(*i)->getInsts()->at(ii).Inst, OS, ""); + Out << DOT::EscapeString(OS.str()); } - Out << "}\n"; + Out << "\" shape=\"record\" ];\n"; - ++filenum; + // Add edges. + for (MCBasicBlock::succ_const_iterator si = (*i)->succ_begin(), + se = (*i)->succ_end(); si != se; ++si) + Out << (*i)->getInsts()->getBeginAddr() << ":o -> " + << (*si)->getInsts()->getBeginAddr() << ":a\n"; } + Out << "}\n"; + + ++filenum; } } diff --git a/src/Binary.hxx b/src/Binary.hxx index 725c6a1..1a86578 100644 --- a/src/Binary.hxx +++ b/src/Binary.hxx @@ -10,43 +10,41 @@ using llvm::OwningPtr; -namespace qtlldb { - class Binary { - public: - Binary(const std::string& filename); - - void disassemble(); - - void disassemble_functions(); - - void disassemble_cfg(); - - std::vector getSymbols(); - - std::vector getFunctions(); - void for_each_instruction(const std::string& function, std::function callback); - - private: - llvm::Triple triple; - const llvm::Target * target; - llvm::object::ObjectFile * o; - - llvm::object::Binary* binary; - OwningPtr MRI; - OwningPtr AsmInfo; - OwningPtr Mod; - OwningPtr IP; - OwningPtr DisAsm; - OwningPtr MOFI; - OwningPtr Ctx; - OwningPtr MIA; - OwningPtr STI; - OwningPtr MII; - OwningPtr RelInfo; - OwningPtr Symzer; - - std::map sections; - std::map symbols; - }; -} +class Binary { +public: + Binary(const std::string& filename); + + void disassemble(); + + void disassemble_functions(); + + void disassemble_cfg(); + + std::vector getSymbols(); + + std::vector getFunctions(); + void for_each_instruction(const std::string& function, std::function callback); + +private: + llvm::Triple triple; + const llvm::Target * target; + llvm::object::ObjectFile * o; + + llvm::object::Binary* binary; + OwningPtr MRI; + OwningPtr AsmInfo; + OwningPtr Mod; + OwningPtr IP; + OwningPtr DisAsm; + OwningPtr MOFI; + OwningPtr Ctx; + OwningPtr MIA; + OwningPtr STI; + OwningPtr MII; + OwningPtr RelInfo; + OwningPtr Symzer; + + std::map sections; + std::map symbols; +}; #endif diff --git a/src/disassembler.old/BasicBlock.hxx b/src/disassembler.old/BasicBlock.hxx deleted file mode 100644 index 22a31e0..0000000 --- a/src/disassembler.old/BasicBlock.hxx +++ /dev/null @@ -1,8 +0,0 @@ - - -class BasicBlock { -public: - -private: - -}; diff --git a/src/disassembler.old/Disassembler.cxx b/src/disassembler.old/Disassembler.cxx deleted file mode 100644 index 7422df5..0000000 --- a/src/disassembler.old/Disassembler.cxx +++ /dev/null @@ -1,12 +0,0 @@ -#include "Disassembler.hxx" - -using namespace llvm; -using namespace llvm::object; - -Disassembler::Disassembler(const std::string& filename) - : _binary(createBinary(filename).get()) - , _target(_binary) -{ - -} - diff --git a/src/disassembler.old/Disassembler.hxx b/src/disassembler.old/Disassembler.hxx deleted file mode 100644 index 3effa25..0000000 --- a/src/disassembler.old/Disassembler.hxx +++ /dev/null @@ -1,15 +0,0 @@ -#ifndef INCLUDE__Disassembler_hxx -#define INCLUDE__Disassembler_hxx - -#include "Target.hxx" -#include "include_llvm.hxx" - -class Disassembler { -public: - Disassembler(const std::string& filename); -private: - llvm::object::Binary* _binary; - Target _target; -}; - -#endif diff --git a/src/disassembler.old/Instruction.hxx b/src/disassembler.old/Instruction.hxx deleted file mode 100644 index afb5193..0000000 --- a/src/disassembler.old/Instruction.hxx +++ /dev/null @@ -1,6 +0,0 @@ - - -class Instruction { -public: -private: -}; diff --git a/src/disassembler.old/InstructionReader.cxx b/src/disassembler.old/InstructionReader.cxx deleted file mode 100644 index 8f8df91..0000000 --- a/src/disassembler.old/InstructionReader.cxx +++ /dev/null @@ -1,27 +0,0 @@ -#include "InstructionReader.hxx" - -InstructionReader::InstructionReader(const Target& target) - : _logger(log4cxx::Logger::getLogger("disassembler.Target")) - , _target(target) -{ - DisAsm.reset(_target.getTarget().createMCDisassembler(_target.getSubTargetInfo())); - if (!DisAsm) { - LOG4CXX_ERROR(_logger, "error: no disassembler for target " << _target.getTripleName()) - return; - } -} - -void InstructionReader::readInstruction(std::string& data, size_t& offset, Instruction& inst) { - llvm::MCInst instr; - llvm::StringRefMemoryObject memoryObject(data); - uint64_t size; - - if (DisAsm->getInstruction(instr, size, memoryObject, offset, - llvm::nulls(), llvm::nulls())) { - - } else { - LOG4CXX_WARN(_logger, "warning: invalid instruction encoding"); - if (size == 0) - size = 1; // skip illegible bytes - } -} diff --git a/src/disassembler.old/InstructionReader.hxx b/src/disassembler.old/InstructionReader.hxx deleted file mode 100644 index 092e73c..0000000 --- a/src/disassembler.old/InstructionReader.hxx +++ /dev/null @@ -1,18 +0,0 @@ -#include "include_llvm.hxx" -#include "Instruction.hxx" -#include "Target.hxx" - -#include - -#include - - -class InstructionReader { -public: - InstructionReader(const Target& target); - void readInstruction(std::string& data, size_t& offset, Instruction& inst); -private: - log4cxx::LoggerPtr _logger; - const Target& _target; - llvm::OwningPtr DisAsm; -}; diff --git a/src/disassembler.old/Target.cxx b/src/disassembler.old/Target.cxx deleted file mode 100644 index 79d590a..0000000 --- a/src/disassembler.old/Target.cxx +++ /dev/null @@ -1,28 +0,0 @@ -#include "Target.hxx" - -#include - -Target::Target(llvm::object::Binary* binary) - : _logger(log4cxx::Logger::getLogger("disassembler.Target")) - , triple("unknown-unknown-unknown") -{ - std::string error; - llvm::object::ObjectFile * o = llvm::dyn_cast(binary); - - triple.setArch(llvm::Triple::ArchType(o->getArch())); - std::string tripleName(triple.getTriple()); - LOG4CXX_INFO(_logger, "Detected triple " << tripleName); - - target = llvm::TargetRegistry::lookupTarget("", triple, error); - if (!target) { - LOG4CXX_ERROR(_logger, "Couldn't create Target: " << error); - return; - } - LOG4CXX_INFO(_logger, "Target: " << target->getName()); - - STI.reset(target->createMCSubtargetInfo(tripleName, "", "")); - if (!STI) { - LOG4CXX_ERROR(_logger, "No subtarget for target " << tripleName); - return; - } -} diff --git a/src/disassembler.old/Target.hxx b/src/disassembler.old/Target.hxx deleted file mode 100644 index f72af7c..0000000 --- a/src/disassembler.old/Target.hxx +++ /dev/null @@ -1,31 +0,0 @@ -#ifndef INCLUDE__Target_hxx -#define INCLUDE__Target_hxx - -#include - -#include "include_llvm.hxx" - -class Target { -public: - Target(llvm::object::Binary* binary); - - const llvm::Target& getTarget() const { - return *target; - } - - const llvm::MCSubtargetInfo& getSubTargetInfo() const { - return *STI; - } - - std::string getTripleName() const { - return triple.getTriple(); - } -private: - log4cxx::LoggerPtr _logger; - llvm::Triple triple; - - const llvm::Target * target; - llvm::OwningPtr STI; -}; - -#endif -- 2.39.2