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 | 2ebff84b90713aa17c96543bc2ba4cfb8d7b4d16 (patch) | |
| tree | 67370e472f54960c1a21df2f7a2a3a4529295c1b /llvm/utils/TableGen/ARMDecoderEmitter.cpp | |
| parent | c56b9c75d5794914228c1835ceebe629d6c8efa7 (diff) | |
| download | bcm5719-llvm-2ebff84b90713aa17c96543bc2ba4cfb8d7b4d16.tar.gz bcm5719-llvm-2ebff84b90713aa17c96543bc2ba4cfb8d7b4d16.zip | |
Revert r135319 in an attempt to get to unbreak testers.
llvm-svn: 135343
Diffstat (limited to 'llvm/utils/TableGen/ARMDecoderEmitter.cpp')
| -rw-r--r-- | llvm/utils/TableGen/ARMDecoderEmitter.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/llvm/utils/TableGen/ARMDecoderEmitter.cpp b/llvm/utils/TableGen/ARMDecoderEmitter.cpp index 2902af44740..8a5dc8ba154 100644 --- a/llvm/utils/TableGen/ARMDecoderEmitter.cpp +++ b/llvm/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") |
