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.

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

diff --git a/include/llvm/MC/MCInstrInfo.h b/include/llvm/MC/MCInstrInfo.h
index 686d4386aa950189fffca825288ff1de3f0b6c95..1d3a36ca7c73afdd77f37d1278dd65168485a8b0 100644 (file)
--- a/include/llvm/MC/MCInstrInfo.h
+++ b/include/llvm/MC/MCInstrInfo.h
@@ -25,14 +25,14 @@ namespace llvm {
 ///
 class MCInstrInfo {
   const MCInstrDesc *Desc;          // Raw array to allow static init'n
-  const uint16_t *InstrNameIndices; // Array for name indices in InstrNameData
+  const unsigned *InstrNameIndices; // Array for name indices in InstrNameData
   const char *InstrNameData;        // Instruction name string pool
   unsigned NumOpcodes;              // Number of entries in the desc array
 
 public:
   /// InitMCInstrInfo - Initialize MCInstrInfo, called by TableGen
   /// auto-generated routines. *DO NOT USE*.
-  void InitMCInstrInfo(const MCInstrDesc *D, const uint16_t *NI, const char *ND,
+  void InitMCInstrInfo(const MCInstrDesc *D, const unsigned *NI, const char *ND,
                        unsigned NO) {
     Desc = D;
     InstrNameIndices = NI;

diff --git a/utils/TableGen/AsmMatcherEmitter.cpp b/utils/TableGen/AsmMatcherEmitter.cpp
index 4afee215234077d3527e7f3dd48e4a3dae9f9996..cdcc496e7d4b26a55798b9557d37fce31dbab06c 100644 (file)
--- a/utils/TableGen/AsmMatcherEmitter.cpp
+++ b/utils/TableGen/AsmMatcherEmitter.cpp
@@ -2023,7 +2023,7 @@ static void EmitCustomOperandParsing(raw_ostream &OS, CodeGenTarget &Target,
   // Emit the static custom operand parsing table;
   OS << "namespace {\n";
   OS << "  struct OperandMatchEntry {\n";
-  OS << "    static const char *const MnemonicTable;\n";
+  OS << "    static const char *MnemonicTable;\n";
   OS << "    unsigned OperandMask;\n";
   OS << "    uint16_t Mnemonic;\n";
   OS << "    " << getMinimalTypeForRange(Info.Classes.size())
@@ -2079,9 +2079,8 @@ static void EmitCustomOperandParsing(raw_ostream &OS, CodeGenTarget &Target,
 
     // Store a pascal-style length byte in the mnemonic.
     std::string LenMnemonic = char(II.Mnemonic.size()) + II.Mnemonic.str();
-    unsigned Idx = StringTable.GetOrAddStringOffset(LenMnemonic, false);
-    assert(Idx <= 0xffff && "String offset too large to fit in table");
-    OS << ", " << Idx << " /* " << II.Mnemonic << " */";
+    OS << ", " << StringTable.GetOrAddStringOffset(LenMnemonic, false)
+       << " /* " << II.Mnemonic << " */";
 
     OS << ", " << OMI.CI->Name
        << ", ";
@@ -2098,7 +2097,7 @@ static void EmitCustomOperandParsing(raw_ostream &OS, CodeGenTarget &Target,
   }
   OS << "};\n\n";
 
-  OS << "const char *const OperandMatchEntry::MnemonicTable =\n";
+  OS << "const char *OperandMatchEntry::MnemonicTable =\n";
   StringTable.EmitString(OS);
   OS << ";\n\n";
 
@@ -2321,7 +2320,7 @@ void AsmMatcherEmitter::run(raw_ostream &OS) {
   // following the mnemonic.
   OS << "namespace {\n";
   OS << "  struct MatchEntry {\n";
-  OS << "    static const char *const MnemonicTable;\n";
+  OS << "    static const char *MnemonicTable;\n";
   OS << "    uint16_t Opcode;\n";
   OS << "    uint16_t Mnemonic;\n";
   OS << "    " << getMinimalTypeForRange(Info.Matchables.size())
@@ -2364,11 +2363,10 @@ void AsmMatcherEmitter::run(raw_ostream &OS) {
 
     // Store a pascal-style length byte in the mnemonic.
     std::string LenMnemonic = char(II.Mnemonic.size()) + II.Mnemonic.str();
-    unsigned Idx = StringTable.GetOrAddStringOffset(LenMnemonic, false);
-    assert(Idx <= 0xffff && "String offset too large to fit in table");
     OS << "  { " << Target.getName() << "::"
        << II.getResultInst()->TheDef->getName() << ", "
-       << Idx << " /* " << II.Mnemonic << " */"
+       << StringTable.GetOrAddStringOffset(LenMnemonic, false)
+       << " /* " << II.Mnemonic << " */"
        << ", " << II.ConversionFnKind << ", { ";
     for (unsigned i = 0, e = II.AsmOperands.size(); i != e; ++i) {
       MatchableInfo::AsmOperand &Op = II.AsmOperands[i];
@@ -2392,7 +2390,7 @@ void AsmMatcherEmitter::run(raw_ostream &OS) {
 
   OS << "};\n\n";
 
-  OS << "const char *const MatchEntry::MnemonicTable =\n";
+  OS << "const char *MatchEntry::MnemonicTable =\n";
   StringTable.EmitString(OS);
   OS << ";\n\n";
 

diff --git a/utils/TableGen/AsmWriterEmitter.cpp b/utils/TableGen/AsmWriterEmitter.cpp
index 0ef5a93d569fd469f4462573dfceddce57d526fb..c4812dcae6d5cf4ca55d9a3b27ab8d1c8fcc988e 100644 (file)
--- a/utils/TableGen/AsmWriterEmitter.cpp
+++ b/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"

diff --git a/utils/TableGen/InstrInfoEmitter.cpp b/utils/TableGen/InstrInfoEmitter.cpp
index 43ff20373d1439a71b51523f59d48222f66a1c9b..0d278288ea40848657f9e71a1cb4b7a7bed2da2a 100644 (file)
--- a/utils/TableGen/InstrInfoEmitter.cpp
+++ b/utils/TableGen/InstrInfoEmitter.cpp
@@ -213,20 +213,18 @@ void InstrInfoEmitter::run(raw_ostream &OS) {
                OperandInfoIDs, OS);
   OS << "};\n\n";
 
-  OS << "extern const uint16_t " << TargetName <<"InstrNameIndices[] = {\n    ";
+  OS << "extern const unsigned " << TargetName <<"InstrNameIndices[] = {\n    ";
   StringToOffsetTable StringTable;
   for (unsigned i = 0, e = NumberedInstructions.size(); i != e; ++i) {
     const CodeGenInstruction *Instr = NumberedInstructions[i];
-    unsigned Idx = StringTable.GetOrAddStringOffset(Instr->TheDef->getName());
-    assert(Idx <= 0xffff && "String offset too large to fit in table");
-    OS << Idx << "U, ";
+    OS << StringTable.GetOrAddStringOffset(Instr->TheDef->getName()) << "U, ";
     if (i % 8 == 0)
       OS << "\n    ";
   }
 
   OS << "\n};\n\n";
 
-  OS << "extern const char *const " << TargetName << "InstrNameData =\n";
+  OS << "const char *" << TargetName << "InstrNameData =\n";
   StringTable.EmitString(OS);
   OS << ";\n\n";
 
@@ -259,8 +257,8 @@ void InstrInfoEmitter::run(raw_ostream &OS) {
 
   OS << "namespace llvm {\n";
   OS << "extern const MCInstrDesc " << TargetName << "Insts[];\n";
-  OS << "extern const uint16_t " << TargetName << "InstrNameIndices[];\n";
-  OS << "extern const char *const " << TargetName << "InstrNameData;\n";
+  OS << "extern const unsigned " << TargetName << "InstrNameIndices[];\n";
+  OS << "extern const char *" << TargetName << "InstrNameData;\n";
   OS << ClassName << "::" << ClassName << "(int SO, int DO)\n"
      << "  : TargetInstrInfoImpl(SO, DO) {\n"
      << "  InitMCInstrInfo(" << TargetName << "Insts, "

diff --git a/utils/TableGen/StringToOffsetTable.h b/utils/TableGen/StringToOffsetTable.h
index 6d528a2b0a7d9064101afe2a4a11f21e23f7a841..803f5bd5cf014e1d5e7a18f60d11bc769a8e0745 100644 (file)
--- a/utils/TableGen/StringToOffsetTable.h
+++ b/utils/TableGen/StringToOffsetTable.h
@@ -40,9 +40,6 @@ public:
   }
   
   void EmitString(raw_ostream &O) {
-    assert(AggregateString.size() <= 65536 &&
-           "Aggregate string too large to be portable");
-
     // Escape the string.
     SmallString<256> Str;
     raw_svector_ostream(Str).write_escaped(AggregateString);