[llvm-commits] [llvm] r151246 - in /llvm/trunk: include/llvm/MC/MCRegisterInfo.h utils/TableGen/RegisterInfoEmitter.cpp

[Craig Topper]

Author: ctopper
Date: Thu Feb 23 02:42:06 2012
New Revision: 151246

URL: http://llvm.org/viewvc/llvm-project?rev=151246&view=rev
Log:
Remove 'if' from getSuperRegisters, getSubRegisters, and getOverlaps that were added in r151038.

Modified:
    llvm/trunk/include/llvm/MC/MCRegisterInfo.h
    llvm/trunk/utils/TableGen/RegisterInfoEmitter.cpp

Modified: llvm/trunk/include/llvm/MC/MCRegisterInfo.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/MC/MCRegisterInfo.h?rev=151246&r1=151245&r2=151246&view=diff
==============================================================================
--- llvm/trunk/include/llvm/MC/MCRegisterInfo.h (original)
+++ llvm/trunk/include/llvm/MC/MCRegisterInfo.h Thu Feb 23 02:42:06 2012
@@ -107,9 +107,9 @@
 ///
 struct MCRegisterDesc {
   const char *Name;         // Printable name for the reg (for debugging)
-  int        Overlaps;      // Overlapping registers, described above
-  int        SubRegs;       // Sub-register set, described above
-  int        SuperRegs;     // Super-register set, described above
+  unsigned   Overlaps;      // Overlapping registers, described above
+  unsigned   SubRegs;       // Sub-register set, described above
+  unsigned   SuperRegs;     // Super-register set, described above
 };
 
 /// MCRegisterInfo base class - We assume that the target defines a static
@@ -213,7 +213,6 @@
   ///
   const unsigned *getAliasSet(unsigned RegNo) const {
     // The Overlaps set always begins with Reg itself.
-    if (get(RegNo).Overlaps < 0) return 0;
     return Overlaps + get(RegNo).Overlaps + 1;
   }
 
@@ -223,7 +222,6 @@
   /// These are exactly the registers in { x | regsOverlap(x, Reg) }.
   ///
   const unsigned *getOverlaps(unsigned RegNo) const {
-    if (get(RegNo).Overlaps < 0) return 0;
     return Overlaps + get(RegNo).Overlaps;
   }
 
@@ -233,7 +231,6 @@
   /// relations. e.g. X86::RAX's sub-register list is EAX, AX, AL, AH.
   ///
   const unsigned *getSubRegisters(unsigned RegNo) const {
-    if (get(RegNo).SubRegs < 0) return 0;
     return SubRegs + get(RegNo).SubRegs;
   }
 
@@ -243,7 +240,6 @@
   /// relations. e.g. X86::AL's super-register list is AX, EAX, RAX.
   ///
   const unsigned *getSuperRegisters(unsigned RegNo) const {
-    if (get(RegNo).SuperRegs < 0) return 0;
     return SuperRegs + get(RegNo).SuperRegs;
   }
 

Modified: llvm/trunk/utils/TableGen/RegisterInfoEmitter.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/utils/TableGen/RegisterInfoEmitter.cpp?rev=151246&r1=151245&r2=151246&view=diff
==============================================================================
--- llvm/trunk/utils/TableGen/RegisterInfoEmitter.cpp (original)
+++ llvm/trunk/utils/TableGen/RegisterInfoEmitter.cpp Thu Feb 23 02:42:06 2012
@@ -312,7 +312,7 @@
 
   OS << "extern const MCRegisterDesc " << TargetName
      << "RegDesc[] = { // Descriptors\n";
-  OS << "  { \"NOREG\", -1, -1, -1 },\n";
+  OS << "  { \"NOREG\", 0, 0, 0 },\n";
 
   // Now that register alias and sub-registers sets have been emitted, emit the
   // register descriptors now.