From 90a468c424f7d0a85b3dc783634106d9a46d6688 Mon Sep 17 00:00:00 2001 From: Benjamin Kramer Date: Wed, 8 Feb 2012 14:43:53 +0000 Subject: [PATCH] Value initialize MCRegisterClasses. Not sure how could miss this during the MCTargetDesc refactor. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@150076 91177308-0d34-0410-b5e6-96231b3b80d8 --- include/llvm/MC/MCRegisterInfo.h | 13 +------------ utils/TableGen/RegisterInfoEmitter.cpp | 4 ++-- 2 files changed, 3 insertions(+), 14 deletions(-) diff --git a/include/llvm/MC/MCRegisterInfo.h b/include/llvm/MC/MCRegisterInfo.h index ec21fba945f..4d4e9f66d73 100644 --- a/include/llvm/MC/MCRegisterInfo.h +++ b/include/llvm/MC/MCRegisterInfo.h @@ -27,7 +27,7 @@ class MCRegisterClass { public: typedef const unsigned* iterator; typedef const unsigned* const_iterator; -private: + unsigned ID; const char *Name; const unsigned RegSize, Alignment; // Size & Alignment of register in bytes @@ -36,17 +36,6 @@ private: const iterator RegsBegin, RegsEnd; const unsigned char *const RegSet; const unsigned RegSetSize; -public: - MCRegisterClass(unsigned id, const char *name, - unsigned RS, unsigned Al, int CC, bool Allocable, - iterator RB, iterator RE, const unsigned char *Bits, - unsigned NumBytes) - : ID(id), Name(name), RegSize(RS), Alignment(Al), CopyCost(CC), - Allocatable(Allocable), RegsBegin(RB), RegsEnd(RE), RegSet(Bits), - RegSetSize(NumBytes) { - for (iterator i = RegsBegin; i != RegsEnd; ++i) - assert(contains(*i) && "Bit field corrupted."); - } /// getID() - Return the register class ID number. /// diff --git a/utils/TableGen/RegisterInfoEmitter.cpp b/utils/TableGen/RegisterInfoEmitter.cpp index 9bb2f99408e..2f8b4b821e9 100644 --- a/utils/TableGen/RegisterInfoEmitter.cpp +++ b/utils/TableGen/RegisterInfoEmitter.cpp @@ -367,7 +367,7 @@ RegisterInfoEmitter::runMCDesc(raw_ostream &OS, CodeGenTarget &Target, for (unsigned rc = 0, e = RegisterClasses.size(); rc != e; ++rc) { const CodeGenRegisterClass &RC = *RegisterClasses[rc]; - OS << " MCRegisterClass(" << RC.getQualifiedName() + "RegClassID" << ", " + OS << " { " << RC.getQualifiedName() + "RegClassID" << ", " << '\"' << RC.getName() << "\", " << RC.SpillSize/8 << ", " << RC.SpillAlignment/8 << ", " @@ -376,7 +376,7 @@ RegisterInfoEmitter::runMCDesc(raw_ostream &OS, CodeGenTarget &Target, << RC.getName() << ", " << RC.getName() << " + " << RC.getOrder().size() << ", " << RC.getName() << "Bits, sizeof(" << RC.getName() << "Bits)" - << "),\n"; + << " },\n"; } OS << "};\n\n"; -- 2.34.1