From: Chris Lattner <sabre@nondot.org>
Date: Sun, 13 Sep 2009 20:19:22 +0000 (+0000)
Subject: the tblgen produced 'getRegisterName' method does not access
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=d95148f073c31924f275a34296da52a7cdefad91;p=oota-llvm.git

the tblgen produced 'getRegisterName' method does not access
the object, make it static instead of const.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@81711 91177308-0d34-0410-b5e6-96231b3b80d8
---

diff --git a/lib/Target/ARM/AsmPrinter/ARMAsmPrinter.cpp b/lib/Target/ARM/AsmPrinter/ARMAsmPrinter.cpp
index 876c4c89de3..dd91c275cd0 100644
--- a/lib/Target/ARM/AsmPrinter/ARMAsmPrinter.cpp
+++ b/lib/Target/ARM/AsmPrinter/ARMAsmPrinter.cpp
@@ -146,7 +146,7 @@ namespace {
 
     void PrintGlobalVariable(const GlobalVariable* GVar);
     void printInstruction(const MachineInstr *MI);  // autogenerated.
-    const char *getRegisterName(unsigned RegNo) const;
+    static const char *getRegisterName(unsigned RegNo);
 
     void printMachineInstruction(const MachineInstr *MI);
     bool runOnMachineFunction(MachineFunction &F);
diff --git a/lib/Target/Alpha/AsmPrinter/AlphaAsmPrinter.cpp b/lib/Target/Alpha/AsmPrinter/AlphaAsmPrinter.cpp
index 74d398b2724..49023688f7d 100644
--- a/lib/Target/Alpha/AsmPrinter/AlphaAsmPrinter.cpp
+++ b/lib/Target/Alpha/AsmPrinter/AlphaAsmPrinter.cpp
@@ -49,7 +49,7 @@ namespace {
       return "Alpha Assembly Printer";
     }
     void printInstruction(const MachineInstr *MI);
-    const char *getRegisterName(unsigned RegNo) const;
+    static const char *getRegisterName(unsigned RegNo);
 
     void printOp(const MachineOperand &MO, bool IsCallOp = false);
     void printOperand(const MachineInstr *MI, int opNum);
diff --git a/lib/Target/Blackfin/AsmPrinter/BlackfinAsmPrinter.cpp b/lib/Target/Blackfin/AsmPrinter/BlackfinAsmPrinter.cpp
index 96f4e784ba1..575a02c4afd 100644
--- a/lib/Target/Blackfin/AsmPrinter/BlackfinAsmPrinter.cpp
+++ b/lib/Target/Blackfin/AsmPrinter/BlackfinAsmPrinter.cpp
@@ -51,7 +51,7 @@ namespace {
     void printOperand(const MachineInstr *MI, int opNum);
     void printMemoryOperand(const MachineInstr *MI, int opNum);
     void printInstruction(const MachineInstr *MI);  // autogenerated.
-    const char *getRegisterName(unsigned RegNo) const;
+    static const char *getRegisterName(unsigned RegNo);
 
     void emitLinkage(const std::string &n, GlobalValue::LinkageTypes l);
     bool runOnMachineFunction(MachineFunction &F);
diff --git a/lib/Target/CellSPU/AsmPrinter/SPUAsmPrinter.cpp b/lib/Target/CellSPU/AsmPrinter/SPUAsmPrinter.cpp
index 21e9be430b7..9592fcc155a 100644
--- a/lib/Target/CellSPU/AsmPrinter/SPUAsmPrinter.cpp
+++ b/lib/Target/CellSPU/AsmPrinter/SPUAsmPrinter.cpp
@@ -68,7 +68,7 @@ namespace {
     /// printInstruction - This method is automatically generated by tablegen
     /// from the instruction set description.
     void printInstruction(const MachineInstr *MI);
-    const char *getRegisterName(unsigned RegNo) const;
+    static const char *getRegisterName(unsigned RegNo);
 
 
     void printMachineInstruction(const MachineInstr *MI);
diff --git a/lib/Target/MSP430/AsmPrinter/MSP430AsmPrinter.cpp b/lib/Target/MSP430/AsmPrinter/MSP430AsmPrinter.cpp
index c82f96d1dd7..1800e006868 100644
--- a/lib/Target/MSP430/AsmPrinter/MSP430AsmPrinter.cpp
+++ b/lib/Target/MSP430/AsmPrinter/MSP430AsmPrinter.cpp
@@ -58,7 +58,7 @@ namespace {
                             const char* Modifier = 0);
     void printCCOperand(const MachineInstr *MI, int OpNum);
     void printInstruction(const MachineInstr *MI);  // autogenerated.
-    const char *getRegisterName(unsigned RegNo) const;
+    static const char *getRegisterName(unsigned RegNo);
 
     void printMachineInstruction(const MachineInstr * MI);
     bool PrintAsmOperand(const MachineInstr *MI, unsigned OpNo,
diff --git a/lib/Target/Mips/AsmPrinter/MipsAsmPrinter.cpp b/lib/Target/Mips/AsmPrinter/MipsAsmPrinter.cpp
index b9d543edc84..d8346a3fc4c 100644
--- a/lib/Target/Mips/AsmPrinter/MipsAsmPrinter.cpp
+++ b/lib/Target/Mips/AsmPrinter/MipsAsmPrinter.cpp
@@ -82,7 +82,7 @@ namespace {
     void emitFrameDirective(MachineFunction &MF);
 
     void printInstruction(const MachineInstr *MI);  // autogenerated.
-    const char *getRegisterName(unsigned RegNo) const;
+    static const char *getRegisterName(unsigned RegNo);
 
     bool runOnMachineFunction(MachineFunction &F);
     bool doInitialization(Module &M);
diff --git a/lib/Target/PIC16/AsmPrinter/PIC16AsmPrinter.h b/lib/Target/PIC16/AsmPrinter/PIC16AsmPrinter.h
index e671feb8632..2dd4600b76c 100644
--- a/lib/Target/PIC16/AsmPrinter/PIC16AsmPrinter.h
+++ b/lib/Target/PIC16/AsmPrinter/PIC16AsmPrinter.h
@@ -45,7 +45,7 @@ namespace llvm {
     void printOperand(const MachineInstr *MI, int opNum);
     void printCCOperand(const MachineInstr *MI, int opNum);
     void printInstruction(const MachineInstr *MI); // definition autogenerated.
-    const char *getRegisterName(unsigned RegNo) const;
+    static const char *getRegisterName(unsigned RegNo);
 
     bool printMachineInstruction(const MachineInstr *MI);
     void EmitFunctionDecls (Module &M);
diff --git a/lib/Target/PowerPC/AsmPrinter/PPCAsmPrinter.cpp b/lib/Target/PowerPC/AsmPrinter/PPCAsmPrinter.cpp
index 658ac317e00..038e5f03b06 100644
--- a/lib/Target/PowerPC/AsmPrinter/PPCAsmPrinter.cpp
+++ b/lib/Target/PowerPC/AsmPrinter/PPCAsmPrinter.cpp
@@ -120,7 +120,7 @@ namespace {
     /// machine instruction was sufficiently described to print it, otherwise it
     /// returns false.
     void printInstruction(const MachineInstr *MI);
-    const char *getRegisterName(unsigned RegNo) const;
+    static const char *getRegisterName(unsigned RegNo);
 
 
     void printMachineInstruction(const MachineInstr *MI);
diff --git a/lib/Target/Sparc/AsmPrinter/SparcAsmPrinter.cpp b/lib/Target/Sparc/AsmPrinter/SparcAsmPrinter.cpp
index 15e7fb02b2b..62193234d1b 100644
--- a/lib/Target/Sparc/AsmPrinter/SparcAsmPrinter.cpp
+++ b/lib/Target/Sparc/AsmPrinter/SparcAsmPrinter.cpp
@@ -68,7 +68,7 @@ namespace {
     void printCCOperand(const MachineInstr *MI, int opNum);
 
     void printInstruction(const MachineInstr *MI);  // autogenerated.
-    const char *getRegisterName(unsigned RegNo) const;
+    static const char *getRegisterName(unsigned RegNo);
 
     bool runOnMachineFunction(MachineFunction &F);
     bool PrintAsmOperand(const MachineInstr *MI, unsigned OpNo,
diff --git a/lib/Target/SystemZ/AsmPrinter/SystemZAsmPrinter.cpp b/lib/Target/SystemZ/AsmPrinter/SystemZAsmPrinter.cpp
index 64843c902c3..452dd124da7 100644
--- a/lib/Target/SystemZ/AsmPrinter/SystemZAsmPrinter.cpp
+++ b/lib/Target/SystemZ/AsmPrinter/SystemZAsmPrinter.cpp
@@ -67,7 +67,7 @@ namespace {
     }
 
     void printInstruction(const MachineInstr *MI);  // autogenerated.
-    const char *getRegisterName(unsigned RegNo) const;
+    static const char *getRegisterName(unsigned RegNo);
 
     void printMachineInstruction(const MachineInstr * MI);
 
diff --git a/lib/Target/X86/AsmPrinter/X86ATTInstPrinter.h b/lib/Target/X86/AsmPrinter/X86ATTInstPrinter.h
index 773ac983611..5969ca939a1 100644
--- a/lib/Target/X86/AsmPrinter/X86ATTInstPrinter.h
+++ b/lib/Target/X86/AsmPrinter/X86ATTInstPrinter.h
@@ -19,7 +19,6 @@ namespace llvm {
   class MCInst;
   class MCOperand;
   class raw_ostream;
-  class TargetRegisterInfo; // FIXME: ELIM
   
 class X86ATTInstPrinter {
   raw_ostream &O;
@@ -29,7 +28,7 @@ public:
 
   // Autogenerated by tblgen.
   void printInstruction(const MCInst *MI);
-  const char *getRegisterName(unsigned RegNo) const;
+  static const char *getRegisterName(unsigned RegNo);
 
 
   void printOperand(const MCInst *MI, unsigned OpNo,
diff --git a/lib/Target/X86/AsmPrinter/X86IntelAsmPrinter.h b/lib/Target/X86/AsmPrinter/X86IntelAsmPrinter.h
index 97acf5d0572..081fd52770f 100644
--- a/lib/Target/X86/AsmPrinter/X86IntelAsmPrinter.h
+++ b/lib/Target/X86/AsmPrinter/X86IntelAsmPrinter.h
@@ -38,7 +38,7 @@ struct VISIBILITY_HIDDEN X86IntelAsmPrinter : public AsmPrinter {
   /// machine instruction was sufficiently described to print it, otherwise it
   /// returns false.
   void printInstruction(const MachineInstr *MI);
-  const char *getRegisterName(unsigned RegNo) const;
+  static const char *getRegisterName(unsigned RegNo);
 
 
   // This method is used by the tablegen'erated instruction printer.
diff --git a/lib/Target/XCore/AsmPrinter/XCoreAsmPrinter.cpp b/lib/Target/XCore/AsmPrinter/XCoreAsmPrinter.cpp
index 5fe9b2bbf46..3ad7108ed04 100644
--- a/lib/Target/XCore/AsmPrinter/XCoreAsmPrinter.cpp
+++ b/lib/Target/XCore/AsmPrinter/XCoreAsmPrinter.cpp
@@ -80,7 +80,7 @@ namespace {
     void emitFunctionEnd(MachineFunction &MF);
 
     void printInstruction(const MachineInstr *MI);  // autogenerated.
-    const char *getRegisterName(unsigned RegNo) const;
+    static const char *getRegisterName(unsigned RegNo);
 
     void printMachineInstruction(const MachineInstr *MI);
     bool runOnMachineFunction(MachineFunction &F);
diff --git a/utils/TableGen/AsmWriterEmitter.cpp b/utils/TableGen/AsmWriterEmitter.cpp
index 0455c9b5e81..b416a1ed975 100644
--- a/utils/TableGen/AsmWriterEmitter.cpp
+++ b/utils/TableGen/AsmWriterEmitter.cpp
@@ -804,7 +804,7 @@ void AsmWriterEmitter::EmitGetRegisterName(raw_ostream &O) {
   "/// from the register set description.  This returns the assembler name\n"
   "/// for the specified register.\n"
   "const char *" << Target.getName() << ClassName
-  << "::getRegisterName(unsigned RegNo) const {\n"
+  << "::getRegisterName(unsigned RegNo) {\n"
   << "  assert(RegNo && RegNo < " << (Registers.size()+1)
   << " && \"Invalid register number!\");\n"
   << "\n"