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

Recommit "Use unique_ptr to manager FilterChooser ownership."

Browse Source 
Just using insert of a pair this time instead of emplace.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@217018 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Craig Topper
2014-09-03 06:07:54 +00:00
parent 6426140b90
commit 732b026119
1 changed files with 16 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
utils/TableGen/FixedLenDecoderEmitter.cpp
View File

@ -230,7 +230,7 @@ protected:
std::vector<unsigned> VariableInstructions; std::vector<unsigned> VariableInstructions;
// Map of well-known segment value to its delegate. // Map of well-known segment value to its delegate.
std::map<unsigned, const FilterChooser*> FilterChooserMap; std::map<unsigned, std::unique_ptr<const FilterChooser>> FilterChooserMap;
// Number of instructions which fall under FilteredInstructions category. // Number of instructions which fall under FilteredInstructions category.
unsigned NumFiltered; unsigned NumFiltered;
@ -530,12 +530,6 @@ Filter::Filter(FilterChooser &owner, unsigned startBit, unsigned numBits,
} }
Filter::~Filter() { Filter::~Filter() {
std::map<unsigned, const FilterChooser*>::iterator filterIterator;
for (filterIterator = FilterChooserMap.begin();
filterIterator != FilterChooserMap.end();
filterIterator++) {
delete filterIterator->second;
}
} }
// Divides the decoding task into sub tasks and delegates them to the // Divides the decoding task into sub tasks and delegates them to the
@ -557,14 +551,13 @@ void Filter::recurse() {
// Delegates to an inferior filter chooser for further processing on this // Delegates to an inferior filter chooser for further processing on this
// group of instructions whose segment values are variable. // group of instructions whose segment values are variable.
FilterChooserMap.insert(std::pair<unsigned, const FilterChooser*>( FilterChooserMap.insert(std::make_pair(
(unsigned)-1, -1U,
new FilterChooser(Owner->AllInstructions, make_unique<FilterChooser>(Owner->AllInstructions,
VariableInstructions, VariableInstructions,
Owner->Operands, Owner->Operands,
BitValueArray, BitValueArray,
*Owner) *Owner)));
));
} }
// No need to recurse for a singleton filtered instruction. // No need to recurse for a singleton filtered instruction.
@ -590,14 +583,13 @@ void Filter::recurse() {
// Delegates to an inferior filter chooser for further processing on this // Delegates to an inferior filter chooser for further processing on this
// category of instructions. // category of instructions.
FilterChooserMap.insert(std::pair<unsigned, const FilterChooser*>( FilterChooserMap.insert(std::make_pair(
mapIterator->first, mapIterator->first,
new FilterChooser(Owner->AllInstructions, make_unique<FilterChooser>(Owner->AllInstructions,
mapIterator->second, mapIterator->second,
Owner->Operands, Owner->Operands,
BitValueArray, BitValueArray,
*Owner) *Owner)));
));
} }
} }
@ -632,7 +624,8 @@ void Filter::emitTableEntry(DecoderTableInfo &TableInfo) const {
// A new filter entry begins a new scope for fixup resolution. // A new filter entry begins a new scope for fixup resolution.
TableInfo.FixupStack.push_back(FixupList()); TableInfo.FixupStack.push_back(FixupList());
std::map<unsigned, const FilterChooser*>::const_iterator filterIterator; std::map<unsigned,
std::unique_ptr<const FilterChooser>>::const_iterator filterIterator;
DecoderTable &Table = TableInfo.Table; DecoderTable &Table = TableInfo.Table;