Revert r152202: "Use uint16_t to store InstrNameIndices in MCInstrInfo."

We cannot limit the concatenated instruction names to 64K.  ARM is
already at 32K, and it is easy to imagine a target with more
instructions.

llvm-svn: 152817

1 files changed, 3 insertions, 8 deletions

diff --git a/llvm/utils/TableGen/AsmWriterEmitter.cpp b/llvm/utils/TableGen/AsmWriterEmitter.cpp
index 0ef5a93d569..c4812dcae6d 100644
--- a/llvm/utils/TableGen/AsmWriterEmitter.cpp
+++ b/llvm/utils/TableGen/AsmWriterEmitter.cpp
@@ -306,7 +306,6 @@ void AsmWriterEmitter::EmitPrintInstruction(raw_ostream &O) {
     }
 
     // Bias offset by one since we want 0 as a sentinel.
-    assert((Idx+1) <= 0xffff && "String offset too large to fit in table");
     OpcodeInfo.push_back(Idx+1);
   }
 
@@ -374,7 +373,7 @@ void AsmWriterEmitter::EmitPrintInstruction(raw_ostream &O) {
   O << "  };\n\n";
 
   // Emit the string itself.
-  O << "  const char *const AsmStrs = \n";
+  O << "  const char *AsmStrs = \n";
   StringTable.EmitString(O);
   O << ";\n\n";
 
@@ -497,9 +496,7 @@ emitRegisterNameString(raw_ostream &O, StringRef AltName,
       }
     }
 
-    unsigned Idx = StringTable.GetOrAddStringOffset(AsmName);
-    assert(Idx <= 0xffff && "String offset too large to fit in table");
-    O << Idx;
+    O << StringTable.GetOrAddStringOffset(AsmName);
     if (((i + 1) % 14) == 0)
       O << ",\n    ";
     else
@@ -594,9 +591,7 @@ void AsmWriterEmitter::EmitGetInstructionName(raw_ostream &O) {
     if ((i % 14) == 0)
       O << "\n    ";
 
-    unsigned Idx = StringTable.GetOrAddStringOffset(AsmName);
-    assert(Idx <= 0xffff && "String offset too large to fit in table");
-    O << Idx << ", ";
+    O << StringTable.GetOrAddStringOffset(AsmName) << ", ";
   }
   O << "0\n"
   << "  };\n"