diff options
| author | Cameron Zwarich <zwarich@apple.com> | 2011-05-25 04:45:14 +0000 |
|---|---|---|
| committer | Cameron Zwarich <zwarich@apple.com> | 2011-05-25 04:45:14 +0000 |
| commit | b36c1ae6d504168b496ac11031da4bdac0024f80 (patch) | |
| tree | f6a852812e7f8e036d7392327abfa7fdd09e1933 /lib/Target | |
| parent | 03d3d3b361800f28c75d3386978d22e6d57744b7 (diff) | |
| download | external_llvm-b36c1ae6d504168b496ac11031da4bdac0024f80.tar.gz external_llvm-b36c1ae6d504168b496ac11031da4bdac0024f80.tar.bz2 external_llvm-b36c1ae6d504168b496ac11031da4bdac0024f80.zip | |
Rename the existing tBX/tBXr9 instructions to tBX_CALL/tBXr9_CALL to better
reflect their actual meaning and match the ARM instructions.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@132039 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Target')
| -rw-r--r-- | lib/Target/ARM/ARMAsmPrinter.cpp | 2 | ||||
| -rw-r--r-- | lib/Target/ARM/ARMInstrThumb.td | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/lib/Target/ARM/ARMAsmPrinter.cpp b/lib/Target/ARM/ARMAsmPrinter.cpp index 02263ee45e..dc6cdae249 100644 --- a/lib/Target/ARM/ARMAsmPrinter.cpp +++ b/lib/Target/ARM/ARMAsmPrinter.cpp @@ -1875,7 +1875,7 @@ void ARMAsmPrinter::EmitInstruction(const MachineInstr *MI) { case ARM::TAILJMPr: case ARM::tTAILJMPr: { unsigned newOpc = (Opc == ARM::TAILJMPr || Opc == ARM::TAILJMPrND) - ? ARM::BX : ARM::tBX; + ? ARM::BX : ARM::tBX_CALL; MCInst TmpInst; TmpInst.setOpcode(newOpc); TmpInst.addOperand(MCOperand::CreateReg(MI->getOperand(0).getReg())); diff --git a/lib/Target/ARM/ARMInstrThumb.td b/lib/Target/ARM/ARMInstrThumb.td index 07b46d9ccd..e715ac2e32 100644 --- a/lib/Target/ARM/ARMInstrThumb.td +++ b/lib/Target/ARM/ARMInstrThumb.td @@ -466,7 +466,7 @@ let isCall = 1, // ARMv4T // FIXME: Should be a pseudo. let isCodeGenOnly = 1 in - def tBX : TIx2<{?,?,?,?,?}, {?,?}, ?, + def tBX_CALL : TIx2<{?,?,?,?,?}, {?,?}, ?, (outs), (ins tGPR:$func, variable_ops), IIC_Br, "mov\tlr, pc\n\tbx\t$func", [(ARMcall_nolink tGPR:$func)]>, @@ -521,7 +521,7 @@ let isCall = 1, // ARMv4T let isCodeGenOnly = 1 in // FIXME: Should be a pseudo. - def tBXr9 : TIx2<{?,?,?,?,?}, {?,?}, ?, + def tBXr9_CALL : TIx2<{?,?,?,?,?}, {?,?}, ?, (outs), (ins tGPR:$func, variable_ops), IIC_Br, "mov\tlr, pc\n\tbx\t$func", [(ARMcall_nolink tGPR:$func)]>, |