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

PR1255 (case ranges: work with ConstantRangesSet instead of ConstantInt) related changes for Execution and Verifier.

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@157183 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Stepan Dyatkovskiy
2012-05-21 10:44:40 +00:00
parent 8ae97baef2
commit 1c8f4b8c34
3 changed files with 37 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
include/llvm/Support/CRSBuilder.h
View File

@ -100,15 +100,17 @@ public:
Sorted = false; Sorted = false;
} }
bool verify() { bool verify(RangeIterator& errItem) {
if (Items.empty()) if (Items.empty())
return true; return true;
sort(); sort();
for (CaseItemIt i = Items.begin(), j = i+1, e = Items.end(); for (CaseItemIt i = Items.begin(), j = i+1, e = Items.end();
j != e; i = j++) { j != e; i = j++) {
if (isIntersected(j, i) && j->second != i->second) if (isIntersected(j, i) && j->second != i->second) {
errItem = j;
return false; return false;
} }
}
return true; return true;
} }
@ -185,11 +187,14 @@ public:
template <class SuccessorClass> template <class SuccessorClass>
class CRSBuilderT : public CRSBuilderBase<SuccessorClass, false> { class CRSBuilderT : public CRSBuilderBase<SuccessorClass, false> {
public:
typedef typename CRSBuilderBase<SuccessorClass, false>::RangeTy RangeTy; typedef typename CRSBuilderBase<SuccessorClass, false>::RangeTy RangeTy;
typedef typename CRSBuilderBase<SuccessorClass, false>::RangeIterator typedef typename CRSBuilderBase<SuccessorClass, false>::RangeIterator
RangeIterator; RangeIterator;
private:
typedef std::list<RangeTy> RangesCollection; typedef std::list<RangeTy> RangesCollection;
typedef typename RangesCollection::iterator RangesCollectionIt; typedef typename RangesCollection::iterator RangesCollectionIt;

10
lib/ExecutionEngine/Interpreter/Execution.cpp
View File

@ -651,12 +651,18 @@ void Interpreter::visitSwitchInst(SwitchInst &I) {
// Check to see if any of the cases match... // Check to see if any of the cases match...
BasicBlock *Dest = 0; BasicBlock *Dest = 0;
for (SwitchInst::CaseIt i = I.case_begin(), e = I.case_end(); i != e; ++i) { for (SwitchInst::CaseIt i = I.case_begin(), e = I.case_end(); i != e; ++i) {
GenericValue CaseVal = getOperandValue(i.getCaseValue(), SF); ConstantRangesSet Case = i.getCaseValueEx();
if (executeICMP_EQ(CondVal, CaseVal, ElTy).IntVal != 0) { for (unsigned n = 0, en = Case.getNumItems(); n != en; ++n) {
ConstantRangesSet::Range r = Case.getItem(n);
GenericValue Low = getOperandValue(r.Low, SF);
GenericValue High = getOperandValue(r.High, SF);
if (executeICMP_ULE(Low, CondVal, ElTy).IntVal != 0 &&
executeICMP_ULE(CondVal, High, ElTy).IntVal != 0) {
Dest = cast<BasicBlock>(i.getCaseSuccessor()); Dest = cast<BasicBlock>(i.getCaseSuccessor());
break; break;
} }
} }
}
if (!Dest) Dest = I.getDefaultDest(); // No cases matched: use default if (!Dest) Dest = I.getDefaultDest(); // No cases matched: use default
SwitchToNewBasicBlock(Dest, SF); SwitchToNewBasicBlock(Dest, SF);
} }

22
lib/VMCore/Verifier.cpp
View File

@ -804,12 +804,26 @@ void Verifier::visitSwitchInst(SwitchInst &SI) {
// Check to make sure that all of the constants in the switch instruction // Check to make sure that all of the constants in the switch instruction
// have the same type as the switched-on value. // have the same type as the switched-on value.
Type *SwitchTy = SI.getCondition()->getType(); Type *SwitchTy = SI.getCondition()->getType();
SmallPtrSet<ConstantInt*, 32> Constants; CRSBuilder Builder;
std::map<ConstantRangesSet::Range, unsigned> RangeSetMap;
for (SwitchInst::CaseIt i = SI.case_begin(), e = SI.case_end(); i != e; ++i) { for (SwitchInst::CaseIt i = SI.case_begin(), e = SI.case_end(); i != e; ++i) {
Assert1(i.getCaseValue()->getType() == SwitchTy, ConstantRangesSet RS = i.getCaseValueEx();
for (unsigned ri = 0, rie = RS.getNumItems(); ri < rie; ++ri) {
ConstantRangesSet::Range r = RS.getItem(ri);
Assert1(r.Low->getType() == SwitchTy,
"Switch constants must all be same type as switch value!", &SI); "Switch constants must all be same type as switch value!", &SI);
Assert2(Constants.insert(i.getCaseValue()), Assert1(r.High->getType() == SwitchTy,
"Duplicate integer as switch case", &SI, i.getCaseValue()); "Switch constants must all be same type as switch value!", &SI);
Builder.add(r);
RangeSetMap[r] = i.getCaseIndex();
}
}
CRSBuilder::RangeIterator errItem;
if (!Builder.verify(errItem)) {
unsigned CaseIndex = RangeSetMap[errItem->first];
SwitchInst::CaseIt i(&SI, CaseIndex);
Assert2(false, "Duplicate integer as switch case", &SI, i.getCaseValueEx());
} }
visitTerminatorInst(SI); visitTerminatorInst(SI);