diff options
| author | Andrew Trick <atrick@apple.com> | 2012-09-15 00:19:57 +0000 |
|---|---|---|
| committer | Andrew Trick <atrick@apple.com> | 2012-09-15 00:19:57 +0000 |
| commit | 766864963bdb84897d23daea2da1a53b94c57327 (patch) | |
| tree | 78688e34fa205b5765fd070485c1020247116aaa /llvm/utils/TableGen/SubtargetEmitter.cpp | |
| parent | b93a2ceba56b7e0ca57d2d3d38d4d798a826f543 (diff) | |
| download | bcm5719-llvm-766864963bdb84897d23daea2da1a53b94c57327.tar.gz bcm5719-llvm-766864963bdb84897d23daea2da1a53b94c57327.zip | |
TableGen subtarget parser. Handle new machine model.
Collect SchedClasses and SchedRW types from the subtarget defs.
llvm-svn: 163951
Diffstat (limited to 'llvm/utils/TableGen/SubtargetEmitter.cpp')
| -rw-r--r-- | llvm/utils/TableGen/SubtargetEmitter.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/llvm/utils/TableGen/SubtargetEmitter.cpp b/llvm/utils/TableGen/SubtargetEmitter.cpp index 5dfd716d897..2fdd930c35b 100644 --- a/llvm/utils/TableGen/SubtargetEmitter.cpp +++ b/llvm/utils/TableGen/SubtargetEmitter.cpp @@ -521,7 +521,7 @@ EmitItineraries(raw_ostream &OS, std::vector<std::vector<InstrItinerary> >::iterator ProcItinListsIter = ProcItinLists.begin(); for (CodeGenSchedModels::ProcIter PI = SchedModels.procModelBegin(), - PE = SchedModels.procModelEnd(); PI != PE; ++PI) { + PE = SchedModels.procModelEnd(); PI != PE; ++PI, ++ProcItinListsIter) { Record *ItinsDef = PI->ItinsDef; if (!ItinsDefSet.insert(ItinsDef)) @@ -532,7 +532,7 @@ EmitItineraries(raw_ostream &OS, // Get the itinerary list for the processor. assert(ProcItinListsIter != ProcItinLists.end() && "bad iterator"); - std::vector<InstrItinerary> &ItinList = *ProcItinListsIter++; + std::vector<InstrItinerary> &ItinList = *ProcItinListsIter; OS << "\n"; OS << "static const llvm::InstrItinerary "; @@ -621,7 +621,7 @@ void SubtargetEmitter::EmitProcessorLookup(raw_ostream &OS) { const std::string &Name = Processor->getValueAsString("Name"); const std::string &ProcModelName = - SchedModels.getProcModel(Processor).ModelName; + SchedModels.getModelForProc(Processor).ModelName; // Emit as { "cpu", procinit }, OS << " { " |
