Refactor code for numbering instructions into CodeGenTarget.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@19758 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Chris Lattner 2005-01-22 18:58:51 +00:00
parent 615ed993e1
commit d648867173
3 changed files with 29 additions and 10 deletions

View File

@ -198,6 +198,22 @@ const CodeGenInstruction &CodeGenTarget::getPHIInstruction() const {
return I->second; return I->second;
} }
/// getInstructionsByEnumValue - Return all of the instructions defined by the
/// target, ordered by their enum value.
void CodeGenTarget::
getInstructionsByEnumValue(std::vector<const CodeGenInstruction*>
&NumberedInstructions) {
// Print out the rest of the instructions now.
unsigned i = 0;
const CodeGenInstruction *PHI = &getPHIInstruction();
NumberedInstructions.push_back(PHI);
for (inst_iterator II = inst_begin(), E = inst_end(); II != E; ++II)
if (&II->second != PHI)
NumberedInstructions.push_back(&II->second);
}
/// isLittleEndianEncoding - Return whether this target encodes its instruction /// isLittleEndianEncoding - Return whether this target encodes its instruction
/// in little-endian format, i.e. bits laid out in the order [0..n] /// in little-endian format, i.e. bits laid out in the order [0..n]
/// ///

View File

@ -93,6 +93,12 @@ public:
inst_iterator inst_begin() const { return getInstructions().begin(); } inst_iterator inst_begin() const { return getInstructions().begin(); }
inst_iterator inst_end() const { return Instructions.end(); } inst_iterator inst_end() const { return Instructions.end(); }
/// getInstructionsByEnumValue - Return all of the instructions defined by the
/// target, ordered by their enum value.
void getInstructionsByEnumValue(std::vector<const CodeGenInstruction*>
&NumberedInstructions);
/// getPHIInstruction - Return the designated PHI instruction. /// getPHIInstruction - Return the designated PHI instruction.
/// ///
const CodeGenInstruction &getPHIInstruction() const; const CodeGenInstruction &getPHIInstruction() const;

View File

@ -26,7 +26,6 @@ void InstrInfoEmitter::runEnums(std::ostream &OS) {
// We must emit the PHI opcode first... // We must emit the PHI opcode first...
Record *InstrInfo = Target.getInstructionSet(); Record *InstrInfo = Target.getInstructionSet();
Record *PHI = InstrInfo->getValueAsDef("PHIInst");
std::string Namespace = Target.inst_begin()->second.Namespace; std::string Namespace = Target.inst_begin()->second.Namespace;
@ -34,15 +33,13 @@ void InstrInfoEmitter::runEnums(std::ostream &OS) {
OS << "namespace " << Namespace << " {\n"; OS << "namespace " << Namespace << " {\n";
OS << " enum {\n"; OS << " enum {\n";
OS << " " << PHI->getName() << ", \t// 0 (fixed for all targets)\n"; std::vector<const CodeGenInstruction*> NumberedInstructions;
Target.getInstructionsByEnumValue(NumberedInstructions);
// Print out the rest of the instructions now.
unsigned i = 0; for (unsigned i = 0, e = NumberedInstructions.size(); i != e; ++i) {
for (CodeGenTarget::inst_iterator II = Target.inst_begin(), OS << " " << NumberedInstructions[i]->TheDef->getName()
E = Target.inst_end(); II != E; ++II) << ", \t// " << i << "\n";
if (II->second.TheDef != PHI) }
OS << " " << II->first << ", \t// " << ++i << "\n";
OS << " };\n"; OS << " };\n";
if (!Namespace.empty()) if (!Namespace.empty())
OS << "}\n"; OS << "}\n";