RPCS3/llvm-mirror
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2024-11-24 11:42:57 +01:00
Code Issues Projects Releases Wiki Activity

More IT instruction error-handling improvements from fuzzing.

Browse Source 
llvm-svn: 101839
This commit is contained in:
Johnny Chen 2010-04-20 00:15:41 +00:00
parent 744e2b34b0
commit 1b36569ba8
1 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
lib/Target/ARM/Disassembler/ARMDisassembler.cpp
View File

@ -513,7 +513,7 @@ static unsigned short CountITSize(unsigned ITMask) {
// First count the trailing zeros of the IT mask.
unsigned TZ = CountTrailingZeros_32(ITMask);
if (TZ > 3) {
DEBUG(errs() << "Encoding error of IT mask");
DEBUG(errs() << "Encoding error: IT Mask '0000'");
return 0;
}
return (4 - TZ);
@ -522,9 +522,23 @@ static unsigned short CountITSize(unsigned ITMask) {
/// Init ITState. Note that at least one bit is always 1 in mask.
bool Session::InitIT(unsigned short bits7_0) {
ITCounter = CountITSize(slice(bits7_0, 3, 0));
if (ITCounter == 0)
return false;
// A8.6.50 IT
unsigned short FirstCond = slice(bits7_0, 7, 4);
if (FirstCond == 0xF) {
DEBUG(errs() << "Encoding error: IT FirstCond '1111'");
return false;
}
if (FirstCond == 0xE && ITCounter != 1) {
DEBUG(errs() << "Encoding error: IT FirstCond '1110' && Mask != '1000'");
return false;
}
ITState = bits7_0;
// Only need to check for > 0.
return ITCounter > 0;
return true;
}
/// Update ITState if necessary.