diff options
| author | Jim Grosbach <grosbach@apple.com> | 2011-06-30 17:34:04 +0000 |
|---|---|---|
| committer | Jim Grosbach <grosbach@apple.com> | 2011-06-30 17:34:04 +0000 |
| commit | 417671a7b1f785f92362b8fd1dc9c8ec59bc51a6 (patch) | |
| tree | 6f50f85db2ce55b9482cfc4c72a24089077789fb /llvm/utils/TableGen/ARMDecoderEmitter.cpp | |
| parent | de7a9c2415205846dc28077d0d6ca4fa9b222fc8 (diff) | |
| download | bcm5719-llvm-417671a7b1f785f92362b8fd1dc9c8ec59bc51a6.tar.gz bcm5719-llvm-417671a7b1f785f92362b8fd1dc9c8ec59bc51a6.zip | |
Pseudo-ize the Thumb tPOP_RET instruction.
It's just a tPOP instruction with additional code-gen properties, so it
doesn't need encoding information.
llvm-svn: 134172
Diffstat (limited to 'llvm/utils/TableGen/ARMDecoderEmitter.cpp')
| -rw-r--r-- | llvm/utils/TableGen/ARMDecoderEmitter.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/llvm/utils/TableGen/ARMDecoderEmitter.cpp b/llvm/utils/TableGen/ARMDecoderEmitter.cpp index 4ccab9b7342..b3aac9898b2 100644 --- a/llvm/utils/TableGen/ARMDecoderEmitter.cpp +++ b/llvm/utils/TableGen/ARMDecoderEmitter.cpp @@ -1656,13 +1656,13 @@ ARMDEBackend::populateInstruction(const CodeGenInstruction &CGI, // Resolve conflicts: // // tBfar conflicts with tBLr9 - // tPOP_RET/t2LDMIA_RET conflict with tPOP/t2LDM (ditto) + // t2LDMIA_RET conflict with t2LDM (ditto) // tMOVCCi conflicts with tMOVi8 // tMOVCCr conflicts with tMOVgpr2gpr // tLDRcp conflicts with tLDRspi // t2MOVCCi16 conflicts with tMOVi16 if (Name == "tBfar" || - Name == "tPOP_RET" || Name == "t2LDMIA_RET" || + Name == "t2LDMIA_RET" || Name == "tMOVCCi" || Name == "tMOVCCr" || Name == "tLDRcp" || Name == "t2MOVCCi16") |
