From deaf994ff08b1d3258624e5c3a36c1280ad05514 Mon Sep 17 00:00:00 2001 From: Cameron Zwarich Date: Wed, 25 May 2011 04:45:14 +0000 Subject: [PATCH] Rename the existing tBX/tBXr9 instructions to tBX_CALL/tBXr9_CALL to better reflect their actual meaning and match the ARM instructions. llvm-svn: 132039 --- llvm/lib/Target/ARM/ARMAsmPrinter.cpp | 2 +- llvm/lib/Target/ARM/ARMInstrThumb.td | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/llvm/lib/Target/ARM/ARMAsmPrinter.cpp b/llvm/lib/Target/ARM/ARMAsmPrinter.cpp index 02263ee45e98..dc6cdae24961 100644 --- a/llvm/lib/Target/ARM/ARMAsmPrinter.cpp +++ b/llvm/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/llvm/lib/Target/ARM/ARMInstrThumb.td b/llvm/lib/Target/ARM/ARMInstrThumb.td index 07b46d9ccdd9..e715ac2e3234 100644 --- a/llvm/lib/Target/ARM/ARMInstrThumb.td +++ b/llvm/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)]>,