RPCS3/llvm-mirror
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2025-02-01 05:01:59 +01:00
Code Issues Projects Releases Wiki Activity

Mark tBX as an indirect branch rather than a return.

Browse Source 
llvm-svn: 132107
This commit is contained in:
Cameron Zwarich 2011-05-26 03:41:12 +00:00
parent 0021487a8e
commit 9c871755b6
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/Target/ARM/ARMAsmPrinter.cpp
View File

@ -1863,7 +1863,7 @@ void ARMAsmPrinter::EmitInstruction(const MachineInstr *MI) {
} }
{ {
MCInst TmpInst; MCInst TmpInst;
TmpInst.setOpcode(ARM::tBX_RET_vararg); TmpInst.setOpcode(ARM::tBX);
TmpInst.addOperand(MCOperand::CreateReg(ScratchReg)); TmpInst.addOperand(MCOperand::CreateReg(ScratchReg));
// Predicate. // Predicate.
TmpInst.addOperand(MCOperand::CreateImm(ARMCC::AL)); TmpInst.addOperand(MCOperand::CreateImm(ARMCC::AL));

16
lib/Target/ARM/ARMInstrThumb.td
View File

@ -361,14 +361,6 @@ def tADDspr : TIt<(outs GPR:$dst), (ins GPR:$lhs, GPR:$rhs), IIC_iALUr,
// //
let isReturn = 1, isTerminator = 1, isBarrier = 1 in { let isReturn = 1, isTerminator = 1, isBarrier = 1 in {
def tBX : TI<(outs), (ins GPR:$Rm, pred:$p), IIC_Br, "bx${p}\t$Rm", []>,
T1Special<{1,1,0,?}> {
// A6.2.3 & A8.6.25
bits<4> Rm;
let Inst{6-3} = Rm;
let Inst{2-0} = 0b000;
}
def tBX_RET : TI<(outs), (ins), IIC_Br, "bx\tlr", def tBX_RET : TI<(outs), (ins), IIC_Br, "bx\tlr",
[(ARMretflag)]>, [(ARMretflag)]>,
T1Special<{1,1,0,?}> { T1Special<{1,1,0,?}> {
@ -391,6 +383,14 @@ let isReturn = 1, isTerminator = 1, isBarrier = 1 in {
// Indirect branches // Indirect branches
let isBranch = 1, isTerminator = 1, isBarrier = 1, isIndirectBranch = 1 in { let isBranch = 1, isTerminator = 1, isBarrier = 1, isIndirectBranch = 1 in {
def tBX : TI<(outs), (ins GPR:$Rm, pred:$p), IIC_Br, "bx${p}\t$Rm", []>,
T1Special<{1,1,0,?}> {
// A6.2.3 & A8.6.25
bits<4> Rm;
let Inst{6-3} = Rm;
let Inst{2-0} = 0b000;
}
def tBRIND : TI<(outs), (ins GPR:$Rm), def tBRIND : TI<(outs), (ins GPR:$Rm),
IIC_Br, IIC_Br,
"mov\tpc, $Rm", "mov\tpc, $Rm",