diff options
| author | Owen Anderson <resistor@mac.com> | 2011-07-16 09:17:43 +0000 |
|---|---|---|
| committer | Owen Anderson <resistor@mac.com> | 2011-07-16 09:17:43 +0000 |
| commit | 91ddfc4723f5857e0124192d71e625a7926cbc70 (patch) | |
| tree | 424cebb2f56343c336cda132a9ec1469f46016a3 /utils | |
| parent | af37cb53f4c2da6cc15fc994f2f7629b82506fb7 (diff) | |
| download | external_llvm-91ddfc4723f5857e0124192d71e625a7926cbc70.zip external_llvm-91ddfc4723f5857e0124192d71e625a7926cbc70.tar.gz external_llvm-91ddfc4723f5857e0124192d71e625a7926cbc70.tar.bz2 | |
Revert r135319 in an attempt to get to unbreak testers.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@135343 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'utils')
| -rw-r--r-- | utils/TableGen/ARMDecoderEmitter.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/utils/TableGen/ARMDecoderEmitter.cpp b/utils/TableGen/ARMDecoderEmitter.cpp index 2902af4..8a5dc8b 100644 --- a/utils/TableGen/ARMDecoderEmitter.cpp +++ b/utils/TableGen/ARMDecoderEmitter.cpp @@ -1619,6 +1619,10 @@ ARMDEBackend::populateInstruction(const CodeGenInstruction &CGI, if (Name == "tSTMIA") return false; + // On Darwin R9 is call-clobbered. Ignore the non-Darwin counterparts. + if (Name == "tBL" || Name == "tBLXi" || Name == "tBLXr") + return false; + // A8.6.25 BX. Use the generic tBX_Rm, ignore tBX_RET and tBX_RET_vararg. if (Name == "tBX_RET" || Name == "tBX_RET_vararg") return false; @@ -1650,12 +1654,14 @@ ARMDEBackend::populateInstruction(const CodeGenInstruction &CGI, // Resolve conflicts: // + // tBfar conflicts with tBLr9 // t2LDMIA_RET conflict with t2LDM (ditto) // tMOVCCi conflicts with tMOVi8 // tMOVCCr conflicts with tMOVgpr2gpr // tLDRcp conflicts with tLDRspi // t2MOVCCi16 conflicts with tMOVi16 - if (Name == "t2LDMIA_RET" || + if (Name == "tBfar" || + Name == "t2LDMIA_RET" || Name == "tMOVCCi" || Name == "tMOVCCr" || Name == "tLDRcp" || Name == "t2MOVCCi16") |