Support "Methods" in register classes in CodgeGenRegisterClass
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@15965 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/utils/TableGen/CodeGenRegisters.h b/utils/TableGen/CodeGenRegisters.h
index bbec4ea..e6838d5 100644
--- a/utils/TableGen/CodeGenRegisters.h
+++ b/utils/TableGen/CodeGenRegisters.h
@@ -26,7 +26,6 @@
Record *TheDef;
const std::string &getName() const;
unsigned DeclaredSpillSize, DeclaredSpillAlignment;
-
CodeGenRegister(Record *R);
};
@@ -36,6 +35,7 @@
std::vector<Record*> Elements;
unsigned SpillSize;
unsigned SpillAlignment;
+ std::string MethodDefinitions;
const std::string &getName() const;
diff --git a/utils/TableGen/CodeGenTarget.cpp b/utils/TableGen/CodeGenTarget.cpp
index e0d585c..49fd772 100644
--- a/utils/TableGen/CodeGenTarget.cpp
+++ b/utils/TableGen/CodeGenTarget.cpp
@@ -135,6 +135,12 @@
SpillSize = R->getValueAsInt("Size");
SpillAlignment = R->getValueAsInt("Alignment");
+ if (CodeInit *CI = dynamic_cast<CodeInit*>(R->getValueInit("Methods")))
+ MethodDefinitions = CI->getValue();
+ else
+ throw "Expected 'code' fragment for 'Methods' value in register class '"+
+ getName() + "'!";
+
ListInit *RegList = R->getValueAsListInit("MemberList");
for (unsigned i = 0, e = RegList->getSize(); i != e; ++i) {
DefInit *RegDef = dynamic_cast<DefInit*>(RegList->getElement(i));
diff --git a/utils/TableGen/RegisterInfoEmitter.cpp b/utils/TableGen/RegisterInfoEmitter.cpp
index 6763af3..696a3ce 100644
--- a/utils/TableGen/RegisterInfoEmitter.cpp
+++ b/utils/TableGen/RegisterInfoEmitter.cpp
@@ -121,16 +121,9 @@
OS << " struct " << Name << "Class : public TargetRegisterClass {\n"
<< " " << Name << "Class() : TargetRegisterClass("
<< RC.SpillSize/8 << ", " << RC.SpillAlignment << ", " << Name << ", "
- << Name << " + " << RC.Elements.size() << ") {}\n";
-
- if (CodeInit *CI =
- dynamic_cast<CodeInit*>(RC.TheDef->getValueInit("Methods")))
- OS << CI->getValue();
- else
- throw "Expected 'code' fragment for 'Methods' value in register class '"+
- RC.getName() + "'!";
-
- OS << " } " << Name << "Instance;\n\n";
+ << Name << " + " << RC.Elements.size() << ") {}\n"
+ << RC.MethodDefinitions
+ << " } " << Name << "Instance;\n\n";
}
OS << " const TargetRegisterClass* const RegisterClasses[] = {\n";