Fixed some indentation in the AsmWriterInst

implementation.  Also changed the constructor
so that it does not require a Record, making it
usable by the EDEmitter.

llvm-svn: 95715

utils/TableGen/AsmWriterEmitter.cpp

@@ -256,7 +256,11 @@ void AsmWriterEmitter::EmitPrintInstruction(raw_ostream &O) {
          E = Target.inst_end(); I != E; ++I)
     if (!I->second.AsmString.empty() &&
         I->second.TheDef->getName() != "PHI")
-      Instructions.push_back(AsmWriterInst(I->second, AsmWriter));
+      Instructions.push_back(
+        AsmWriterInst(I->second, 
+                      AsmWriter->getValueAsInt("Variant"),
+                      AsmWriter->getValueAsInt("FirstOperandColumn"),
+                      AsmWriter->getValueAsInt("OperandSpacing")));
 
   // Get the instruction numbering.
   Target.getInstructionsByEnumValue(NumberedInstructions);

utils/TableGen/AsmWriterInst.cpp

@@ -46,13 +46,12 @@ std::string AsmWriterOperand::getCode() const {
 /// ParseAsmString - Parse the specified Instruction's AsmString into this
 /// AsmWriterInst.
 ///
-AsmWriterInst::AsmWriterInst(const CodeGenInstruction &CGI, Record *AsmWriter) {
+AsmWriterInst::AsmWriterInst(const CodeGenInstruction &CGI,
+                             unsigned Variant,
+                             int FirstOperandColumn,
+                             int OperandSpacing) {
   this->CGI = &CGI;
   
-  unsigned Variant       = AsmWriter->getValueAsInt("Variant");
-  int FirstOperandColumn = AsmWriter->getValueAsInt("FirstOperandColumn");
-  int OperandSpacing     = AsmWriter->getValueAsInt("OperandSpacing");
-  
   unsigned CurVariant = ~0U;  // ~0 if we are outside a {.|.|.} region, other #.
   
   // This is the number of tabs we've seen if we're doing columnar layout.
@@ -88,7 +87,8 @@ AsmWriterInst::AsmWriterInst(const CodeGenInstruction &CGI, Record *AsmWriter) {
                 unsigned DestColumn = FirstOperandColumn + 
                 CurColumn++ * OperandSpacing;
                 Operands.push_back(
-                                   AsmWriterOperand("O.PadToColumn(" +
+                  AsmWriterOperand(
+                    "O.PadToColumn(" +
                     utostr(DestColumn) + ");\n",
                     AsmWriterOperand::isLiteralStatementOperand));
               }

utils/TableGen/AsmWriterInst.h

@@ -81,7 +81,10 @@ namespace llvm {
     std::vector<AsmWriterOperand> Operands;
     const CodeGenInstruction *CGI;
     
-    AsmWriterInst(const CodeGenInstruction &CGI, Record *AsmWriter);
+    AsmWriterInst(const CodeGenInstruction &CGI, 
+                  unsigned Variant,
+                  int FirstOperandColumn,
+                  int OperandSpacing);
     
     /// MatchesAllButOneOp - If this instruction is exactly identical to the
     /// specified instruction except for one differing operand, return the

utils/TableGen/EDEmitter.cpp

@@ -15,6 +15,7 @@
 
 #include "EDEmitter.h"
 
+#include "AsmWriterInst.h"
 #include "CodeGenTarget.h"
 #include "Record.h"