diff options
| author | Jim Grosbach <grosbach@apple.com> | 2011-07-08 20:39:19 +0000 |
|---|---|---|
| committer | Jim Grosbach <grosbach@apple.com> | 2011-07-08 20:39:19 +0000 |
| commit | 0b44aea7b564c5c28ac0acaaba8805ce7c625fd3 (patch) | |
| tree | 626a8dfe145b3edd5e5d2eb751f598db43d4b425 /lib | |
| parent | af7f2d6b67070eae933402c9115514719d1628cf (diff) | |
| download | llvm-0b44aea7b564c5c28ac0acaaba8805ce7c625fd3.tar.gz llvm-0b44aea7b564c5c28ac0acaaba8805ce7c625fd3.tar.bz2 llvm-0b44aea7b564c5c28ac0acaaba8805ce7c625fd3.tar.xz | |
Use tPseudoExpand for tTAILJMPrND and tTAILJMPr.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@134734 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/Target/ARM/ARMAsmPrinter.cpp | 14 | ||||
| -rw-r--r-- | lib/Target/ARM/ARMInstrThumb.td | 14 |
2 files changed, 8 insertions, 20 deletions
diff --git a/lib/Target/ARM/ARMAsmPrinter.cpp b/lib/Target/ARM/ARMAsmPrinter.cpp index 3a891c48c8..dbc3ee41f3 100644 --- a/lib/Target/ARM/ARMAsmPrinter.cpp +++ b/lib/Target/ARM/ARMAsmPrinter.cpp @@ -1799,20 +1799,6 @@ void ARMAsmPrinter::EmitInstruction(const MachineInstr *MI) { } return; } - // Tail jump branches are really just branch instructions with additional - // code-gen attributes. Convert them to the canonical form here. - case ARM::tTAILJMPrND: - case ARM::tTAILJMPr: { - MCInst TmpInst; - TmpInst.setOpcode(ARM::tBX); - TmpInst.addOperand(MCOperand::CreateReg(MI->getOperand(0).getReg())); - // Predicate. - TmpInst.addOperand(MCOperand::CreateImm(ARMCC::AL)); - TmpInst.addOperand(MCOperand::CreateReg(0)); - OutStreamer.AddComment("TAILCALL"); - OutStreamer.EmitInstruction(TmpInst); - return; - } } MCInst TmpInst; diff --git a/lib/Target/ARM/ARMInstrThumb.td b/lib/Target/ARM/ARMInstrThumb.td index 433d6b1033..c3fb83db47 100644 --- a/lib/Target/ARM/ARMInstrThumb.td +++ b/lib/Target/ARM/ARMInstrThumb.td @@ -578,9 +578,10 @@ let isCall = 1, isTerminator = 1, isReturn = 1, isBarrier = 1 in { Uses = [SP] in { // tTAILJMPd: Darwin version uses a Thumb2 branch (no Thumb1 tail calls // on Darwin), so it's in ARMInstrThumb2.td. - def tTAILJMPr : tPseudoInst<(outs), (ins tcGPR:$dst, variable_ops), - Size4Bytes, IIC_Br, - []>, Requires<[IsThumb, IsDarwin]>; + def tTAILJMPr : tPseudoExpand<(outs), (ins tcGPR:$dst, variable_ops), + Size4Bytes, IIC_Br, [], + (tBX GPR:$dst, (ops 14, zero_reg))>, + Requires<[IsThumb, IsDarwin]>; } // Non-Darwin versions (the difference is R9). let Defs = [R0, R1, R2, R3, R12, QQQQ0, QQQQ2, QQQQ3, PC], @@ -589,9 +590,10 @@ let isCall = 1, isTerminator = 1, isReturn = 1, isBarrier = 1 in { Size4Bytes, IIC_Br, [], (tB t_brtarget:$dst)>, Requires<[IsThumb, IsNotDarwin]>; - def tTAILJMPrND : tPseudoInst<(outs), (ins tcGPR:$dst, variable_ops), - Size4Bytes, IIC_Br, - []>, Requires<[IsThumb, IsNotDarwin]>; + def tTAILJMPrND : tPseudoExpand<(outs), (ins tcGPR:$dst, variable_ops), + Size4Bytes, IIC_Br, [], + (tBX GPR:$dst, (ops 14, zero_reg))>, + Requires<[IsThumb, IsNotDarwin]>; } } |