6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2025-07-25 13:24:46 +00:00
Code Issues Projects Releases Wiki Activity

Better error handling of invalid IT mask '0000', instead of just asserting.

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@101827 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Johnny Chen
2010-04-19 23:02:58 +00:00
parent 35bb85b7ee
commit d0f3c46d16
3 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -508,17 +508,23 @@ bool ThumbDisassembler::getInstruction(MCInst &MI,
} }
// A8.6.50 // A8.6.50
// Valid return values are {1, 2, 3, 4}, with 0 signifying an error condition.
static unsigned short CountITSize(unsigned ITMask) { static unsigned short CountITSize(unsigned ITMask) {
// First count the trailing zeros of the IT mask. // First count the trailing zeros of the IT mask.
unsigned TZ = CountTrailingZeros_32(ITMask); unsigned TZ = CountTrailingZeros_32(ITMask);
assert(TZ <= 3 && "Encoding error"); if (TZ > 3) {
DEBUG(errs() << "Encoding error of IT mask");
return 0;
}
return (4 - TZ); return (4 - TZ);
} }
/// Init ITState. /// Init ITState. Note that at least one bit is always 1 in mask.
void Session::InitIT(unsigned short bits7_0) { bool Session::InitIT(unsigned short bits7_0) {
ITCounter = CountITSize(slice(bits7_0, 3, 0)); ITCounter = CountITSize(slice(bits7_0, 3, 0));
ITState = bits7_0; ITState = bits7_0;
// Only need to check for > 0.
return ITCounter > 0;
} }
/// Update ITState if necessary. /// Update ITState if necessary.

2
lib/Target/ARM/Disassembler/ARMDisassembler.h
View File

@@ -60,7 +60,7 @@ public:
Session() : ITCounter(0), ITState(0) {} Session() : ITCounter(0), ITState(0) {}
~Session() {} ~Session() {}
/// InitIT - Initializes ITCounter/ITState. /// InitIT - Initializes ITCounter/ITState.
void InitIT(unsigned short bits7_0); bool InitIT(unsigned short bits7_0);
/// UpdateIT - Updates ITCounter/ITState as IT Block progresses. /// UpdateIT - Updates ITCounter/ITState as IT Block progresses.
void UpdateIT(); void UpdateIT();

2
lib/Target/ARM/Disassembler/ARMDisassemblerCore.cpp
View File

@@ -3282,7 +3282,7 @@ bool ARMBasicMCBuilder::RunBuildAfterHook(bool Status, MCInst &MI,
if (!SP) return Status; if (!SP) return Status;
if (Opcode == ARM::t2IT) if (Opcode == ARM::t2IT)
SP->InitIT(slice(insn, 7, 0)); Status = SP->InitIT(slice(insn, 7, 0)) ? Status : false;
else if (InITBlock()) else if (InITBlock())
SP->UpdateIT(); SP->UpdateIT();