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

Made the MC disassembler check before accessing 

MCInst operands for ARM.  This allows it to be
more tolerant of malformed MCInsts or incorrect
instruction metadata.

llvm-svn: 129840
This commit is contained in:
Sean Callanan 2011-04-20 00:43:34 +00:00
parent 49f754f423
commit d897f39797
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
llvm/lib/MC/MCDisassembler/EDOperand.cpp
View File

@ -198,15 +198,24 @@ int EDOperand::evaluate(uint64_t &result,
default:
return -1;
case kOperandTypeImmediate:
if (!Inst.Inst->getOperand(MCOpIndex).isImm())
return -1;
result = Inst.Inst->getOperand(MCOpIndex).getImm();
return 0;
case kOperandTypeRegister:
{
if (!Inst.Inst->getOperand(MCOpIndex).isReg())
return -1;
unsigned reg = Inst.Inst->getOperand(MCOpIndex).getReg();
return callback(&result, reg, arg);
}
case kOperandTypeARMBranchTarget:
{
if (!Inst.Inst->getOperand(MCOpIndex).isImm())
return -1;
int64_t displacement = Inst.Inst->getOperand(MCOpIndex).getImm();
uint64_t pcVal;