[llvm-commits] [llvm] r127448 - in /llvm/trunk/utils/TableGen: CodeGenRegisters.h CodeGenTarget.cpp RegisterInfoEmitter.cpp

[Jim Grosbach]

Author: grosbach
Date: Thu Mar 10 19:33:54 2011
New Revision: 127448

URL: http://llvm.org/viewvc/llvm-project?rev=127448&view=rev
Log:
Make the register enum value part of the CodeGenRegister struct.

Modified:
    llvm/trunk/utils/TableGen/CodeGenRegisters.h
    llvm/trunk/utils/TableGen/CodeGenTarget.cpp
    llvm/trunk/utils/TableGen/RegisterInfoEmitter.cpp

Modified: llvm/trunk/utils/TableGen/CodeGenRegisters.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/utils/TableGen/CodeGenRegisters.h?rev=127448&r1=127447&r2=127448&view=diff
==============================================================================
--- llvm/trunk/utils/TableGen/CodeGenRegisters.h (original)
+++ llvm/trunk/utils/TableGen/CodeGenRegisters.h Thu Mar 10 19:33:54 2011
@@ -30,6 +30,7 @@
     Record *TheDef;
     const std::string &getName() const;
     unsigned DeclaredSpillSize, DeclaredSpillAlignment;
+    unsigned EnumValue;
     CodeGenRegister(Record *R);
   };
 

Modified: llvm/trunk/utils/TableGen/CodeGenTarget.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/utils/TableGen/CodeGenTarget.cpp?rev=127448&r1=127447&r2=127448&view=diff
==============================================================================
--- llvm/trunk/utils/TableGen/CodeGenTarget.cpp (original)
+++ llvm/trunk/utils/TableGen/CodeGenTarget.cpp Thu Mar 10 19:33:54 2011
@@ -164,6 +164,9 @@
 
   Registers.reserve(Regs.size());
   Registers.assign(Regs.begin(), Regs.end());
+  // Assign the enumeration values.
+  for (unsigned i = 0, e = Registers.size(); i != e; ++i)
+    Registers[i].EnumValue = i + 1;
 }
 
 CodeGenRegister::CodeGenRegister(Record *R) : TheDef(R) {

Modified: llvm/trunk/utils/TableGen/RegisterInfoEmitter.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/utils/TableGen/RegisterInfoEmitter.cpp?rev=127448&r1=127447&r2=127448&view=diff
==============================================================================
--- llvm/trunk/utils/TableGen/RegisterInfoEmitter.cpp (original)
+++ llvm/trunk/utils/TableGen/RegisterInfoEmitter.cpp Thu Mar 10 19:33:54 2011
@@ -38,7 +38,10 @@
   OS << "enum {\n  NoRegister,\n";
 
   for (unsigned i = 0, e = Registers.size(); i != e; ++i)
-    OS << "  " << Registers[i].getName() << ", \t// " << i+1 << "\n";
+    OS << "  " << Registers[i].getName() << " = " <<
+      Registers[i].EnumValue << ",\n";
+  assert(Registers.size() == Registers[Registers.size()-1].EnumValue &&
+         "Register enum value mismatch!");
   OS << "  NUM_TARGET_REGS \t// " << Registers.size()+1 << "\n";
   OS << "};\n";
   if (!Namespace.empty())