You may want to fix AsmMatcher that also uses uint16_t for mnemonics.<br><br><pre><pre>  OS << <b><font color="#BC8F8F">"  struct OperandMatchEntry {\n"</font></b>;
  OS << <b><font color="#BC8F8F">"    static const char *MnemonicTable;\n"</font></b>;
  OS << <b><font color="#BC8F8F">"    unsigned OperandMask;\n"</font></b>;
  OS << <b><font color="#BC8F8F">"    uint16_t Mnemonic;\n"</font></b>;</pre></pre><br><pre><pre>  OS << <b><font color="#BC8F8F">"namespace {\n"</font></b>;
  OS << <b><font color="#BC8F8F">"  struct MatchEntry {\n"</font></b>;
  OS << <b><font color="#BC8F8F">"    static const char *MnemonicTable;\n"</font></b>;
  OS << <b><font color="#BC8F8F">"    uint16_t Opcode;\n"</font></b>;
  OS << <b><font color="#BC8F8F">"    uint16_t Mnemonic;\n"</font></b>;</pre></pre><br><br><br><div class="gmail_quote">On Thu, Mar 15, 2012 at 11:05 AM, Jakob Stoklund Olesen <span dir="ltr"><<a href="mailto:stoklund@2pi.dk">stoklund@2pi.dk</a>></span> wrote:<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: stoklund<br>
Date: Thu Mar 15 13:05:54 2012<br>
New Revision: 152816<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=152816&view=rev" target="_blank">http://llvm.org/viewvc/llvm-project?rev=152816&view=rev</a><br>
Log:<br>
Revert r152105: "Use uint16_t to store indices into string table"<br>
<br>
This patch limited the concatenated register names to 64K which meant<br>
that the total number of registers was many times less than 64K.<br>
<br>
If any compilers actually enforce the 64K limit on string literals, and<br>
it turns out to be a problem, we should fix that problem by not using<br>
long string literals.<br>
<br>
Modified:<br>
    llvm/trunk/utils/TableGen/AsmWriterEmitter.cpp<br>
<br>
Modified: llvm/trunk/utils/TableGen/AsmWriterEmitter.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/utils/TableGen/AsmWriterEmitter.cpp?rev=152816&r1=152815&r2=152816&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/utils/TableGen/AsmWriterEmitter.cpp?rev=152816&r1=152815&r2=152816&view=diff</a><br>

==============================================================================<br>
--- llvm/trunk/utils/TableGen/AsmWriterEmitter.cpp (original)<br>
+++ llvm/trunk/utils/TableGen/AsmWriterEmitter.cpp Thu Mar 15 13:05:54 2012<br>
@@ -464,7 +464,7 @@<br>
 emitRegisterNameString(raw_ostream &O, StringRef AltName,<br>
   const std::vector<CodeGenRegister*> &Registers) {<br>
   StringToOffsetTable StringTable;<br>
-  O << "  static const uint16_t RegAsmOffset" << AltName << "[] = {\n    ";<br>
+  O << "  static const unsigned RegAsmOffset" << AltName << "[] = {\n    ";<br>
   for (unsigned i = 0, e = Registers.size(); i != e; ++i) {<br>
     const CodeGenRegister &Reg = *Registers[i];<br>
<br>
@@ -510,7 +510,7 @@<br>
     << "  };\n"<br>
     << "\n";<br>
<br>
-  O << "  const char *const AsmStrs" << AltName << " =\n";<br>
+  O << "  const char *AsmStrs" << AltName << " =\n";<br>
   StringTable.EmitString(O);<br>
   O << ";\n";<br>
 }<br>
@@ -544,7 +544,7 @@<br>
     emitRegisterNameString(O, "", Registers);<br>
<br>
   if (hasAltNames) {<br>
-    O << "  const uint16_t *RegAsmOffset;\n"<br>
+    O << "  const unsigned *RegAsmOffset;\n"<br>
       << "  const char *AsmStrs;\n"<br>
       << "  switch(AltIdx) {\n"<br>
       << "  default: llvm_unreachable(\"Invalid register alt name index!\");\n";<br>
@@ -586,7 +586,7 @@<br>
   << "  assert(Opcode < " << NumberedInstructions.size()<br>
   << " && \"Invalid instruction number!\");\n"<br>
   << "\n"<br>
-  << "  static const uint16_t InstAsmOffset[] = {";<br>
+  << "  static const unsigned InstAsmOffset[] = {";<br>
   for (unsigned i = 0, e = NumberedInstructions.size(); i != e; ++i) {<br>
     const CodeGenInstruction &Inst = *NumberedInstructions[i];<br>
<br>
@@ -602,7 +602,7 @@<br>
   << "  };\n"<br>
   << "\n";<br>
<br>
-  O << "  const char *const Strs =\n";<br>
+  O << "  const char *Strs =\n";<br>
   StringTable.EmitString(O);<br>
   O << ";\n";<br>
<br>
<br>
<br>
_______________________________________________<br>
llvm-commits mailing list<br>
<a href="mailto:llvm-commits@cs.uiuc.edu">llvm-commits@cs.uiuc.edu</a><br>
<a href="http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits" target="_blank">http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits</a><br>
</blockquote></div><br><br clear="all"><br>-- <br>~Craig<br>