wangtao
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MC CFG: When disassembly is impossible, fallback to data bytes. 

This is the behavior of sequential disassemblers (llvm-objdump, ...),
when there is no instruction size hint (fixed-length, ...)

While there, also do some minor cleanup.

llvm-svn: 188883
This commit is contained in:
Ahmed Bougacha 2013-08-21 07:28:32 +00:00
parent a376353346
commit 57bc9677cd
1 changed files with 30 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
llvm/lib/MC/MCObjectDisassembler.cpp
View File

@ -102,19 +102,29 @@ void MCObjectDisassembler::buildSectionAtoms(MCModule *Module) {
StringRef SecName; SI->getName(SecName);
if (isText) {
MCTextAtom *Text = Module->createTextAtom(StartAddr, EndAddr);
Text->setName(SecName);
MCTextAtom *Text = 0;
MCDataAtom *InvalidData = 0;
uint64_t InstSize;
for (uint64_t Index = 0; Index < SecSize; Index += InstSize) {
const uint64_t CurAddr = StartAddr + Index;
MCInst Inst;
if (Dis.getInstruction(Inst, InstSize, memoryObject, Index,
nulls(), nulls()))
Text->addInst(Inst, InstSize);
else
// We don't care about splitting mixed atoms either.
llvm_unreachable("Couldn't disassemble instruction in atom.");
if (Dis.getInstruction(Inst, InstSize, memoryObject, CurAddr, nulls(),
nulls())) {
if (!Text) {
Text = Module->createTextAtom(CurAddr, CurAddr);
Text->setName(SecName);
}
Text->addInst(Inst, InstSize);
InvalidData = 0;
} else {
if (!InvalidData) {
Text = 0;
InvalidData = Module->createDataAtom(CurAddr, EndAddr);
}
InvalidData->addData(Contents[Index]);
}
}
} else {
MCDataAtom *Data = Module->createDataAtom(StartAddr, EndAddr);
Data->setName(SecName);
@ -134,6 +144,8 @@ namespace {
BBInfoSetTy Succs;
BBInfoSetTy Preds;
BBInfo() : Atom(0), BB(0) {}
void addSucc(BBInfo &Succ) {
Succs.insert(&Succ);
Succ.Preds.insert(this);
@ -232,8 +244,8 @@ void MCObjectDisassembler::buildCFG(MCModule *Module) {
// Create MCBBs.
SmallSetVector<BBInfo*, 16> Worklist;
Worklist.insert(&BBI);
for (size_t WI = 0; WI < Worklist.size(); ++WI) {
BBInfo *BBI = Worklist[WI];
for (size_t wi = 0; wi < Worklist.size(); ++wi) {
BBInfo *BBI = Worklist[wi];
if (!BBI->Atom)
continue;
BBI->BB = &MCFN.createBlock(*BBI->Atom);
@ -247,16 +259,18 @@ void MCObjectDisassembler::buildCFG(MCModule *Module) {
}
// Set preds/succs.
for (size_t WI = 0; WI < Worklist.size(); ++WI) {
BBInfo *BBI = Worklist[WI];
for (size_t wi = 0; wi < Worklist.size(); ++wi) {
BBInfo *BBI = Worklist[wi];
MCBasicBlock *MCBB = BBI->BB;
if (!MCBB)
continue;
for (BBInfoSetTy::iterator SI = BBI->Succs.begin(), SE = BBI->Succs.end();
SI != SE; ++SI)
if ((*SI)->BB)
MCBB->addSuccessor((*SI)->BB);
for (BBInfoSetTy::iterator PI = BBI->Preds.begin(), PE = BBI->Preds.end();
PI != PE; ++PI)
if ((*PI)->BB)
MCBB->addPredecessor((*PI)->BB);
}
}