diff options
| author | Craig Topper <craig.topper@gmail.com> | 2012-03-07 05:17:23 +0000 |
|---|---|---|
| committer | Craig Topper <craig.topper@gmail.com> | 2012-03-07 05:17:23 +0000 |
| commit | d3c9d9447ed7b5b8d3800b871ff162ae2df9fd5b (patch) | |
| tree | d08e8a5fda30f7bc303ffa5fab41037e447e9228 /utils/TableGen/InstrInfoEmitter.cpp | |
| parent | bb9dbb7d6b4f39b74b755795e31b219a5518dd77 (diff) | |
Use uint16_t to store InstrNameIndices in MCInstrInfo. Add asserts to protect all 16-bit string table offsets. Also make sure the string to offset table string is not larger than 65536 characters since larger string literals aren't portable.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@152202 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'utils/TableGen/InstrInfoEmitter.cpp')
| -rw-r--r-- | utils/TableGen/InstrInfoEmitter.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/utils/TableGen/InstrInfoEmitter.cpp b/utils/TableGen/InstrInfoEmitter.cpp index 4c4cd18e1c..b539194f86 100644 --- a/utils/TableGen/InstrInfoEmitter.cpp +++ b/utils/TableGen/InstrInfoEmitter.cpp @@ -213,18 +213,20 @@ void InstrInfoEmitter::run(raw_ostream &OS) { OperandInfoIDs, OS); OS << "};\n\n"; - OS << "extern const unsigned " << TargetName <<"InstrNameIndices[] = {\n "; + OS << "extern const uint16_t " << TargetName <<"InstrNameIndices[] = {\n "; StringToOffsetTable StringTable; for (unsigned i = 0, e = NumberedInstructions.size(); i != e; ++i) { const CodeGenInstruction *Instr = NumberedInstructions[i]; - OS << StringTable.GetOrAddStringOffset(Instr->TheDef->getName()) << "U, "; + unsigned Idx = StringTable.GetOrAddStringOffset(Instr->TheDef->getName()); + assert(Idx <= 0xffff && "String offset too large to fit in table"); + OS << Idx << "U, "; if (i % 8 == 0) OS << "\n "; } OS << "\n};\n\n"; - OS << "const char *" << TargetName << "InstrNameData =\n"; + OS << "extern const char *const " << TargetName << "InstrNameData =\n"; StringTable.EmitString(OS); OS << ";\n\n"; @@ -257,7 +259,7 @@ void InstrInfoEmitter::run(raw_ostream &OS) { OS << "namespace llvm {\n"; OS << "extern const MCInstrDesc " << TargetName << "Insts[];\n"; - OS << "extern const unsigned " << TargetName << "InstrNameIndices[];\n"; + OS << "extern const uint16_t " << TargetName << "InstrNameIndices[];\n"; OS << "extern const char *" << TargetName << "InstrNameData;\n"; OS << ClassName << "::" << ClassName << "(int SO, int DO)\n" << " : TargetInstrInfoImpl(SO, DO) {\n" |