diff options
| author | Craig Topper <craig.topper@gmail.com> | 2012-03-08 06:55:27 +0000 |
|---|---|---|
| committer | Craig Topper <craig.topper@gmail.com> | 2012-03-08 06:55:27 +0000 |
| commit | 88d2fa438a5b9feb7da77e4beeaa00944ae4168e (patch) | |
| tree | 78670ed745845060a34061c675e15f0ba9026d25 /include | |
| parent | 8c0152f8a557742efddc57c3993c2c0a3a79ca4d (diff) | |
| download | external_llvm-88d2fa438a5b9feb7da77e4beeaa00944ae4168e.zip external_llvm-88d2fa438a5b9feb7da77e4beeaa00944ae4168e.tar.gz external_llvm-88d2fa438a5b9feb7da77e4beeaa00944ae4168e.tar.bz2 | |
Re-commit r152202 hopefully fixing the MSVC linker error.
Original commit message:
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@152296 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'include')
| -rw-r--r-- | include/llvm/MC/MCInstrInfo.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/llvm/MC/MCInstrInfo.h b/include/llvm/MC/MCInstrInfo.h index 1d3a36c..686d438 100644 --- 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 unsigned *InstrNameIndices; // Array for name indices in InstrNameData + const uint16_t *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 unsigned *NI, const char *ND, + void InitMCInstrInfo(const MCInstrDesc *D, const uint16_t *NI, const char *ND, unsigned NO) { Desc = D; InstrNameIndices = NI; |