Do folding for indirect branches, where possible
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@102836 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/Target/MSP430/MSP430BranchSelector.cpp b/lib/Target/MSP430/MSP430BranchSelector.cpp
index 836e425..68cb342 100644
--- a/lib/Target/MSP430/MSP430BranchSelector.cpp
+++ b/lib/Target/MSP430/MSP430BranchSelector.cpp
@@ -157,7 +157,7 @@
NewSize = 6;
}
// Uncond branch to the real destination.
- I = BuildMI(MBB, I, dl, TII->get(MSP430::B)).addMBB(Dest);
+ I = BuildMI(MBB, I, dl, TII->get(MSP430::Bi)).addMBB(Dest);
// Remove the old branch from the function.
OldBranch->eraseFromParent();
diff --git a/lib/Target/MSP430/MSP430InstrInfo.td b/lib/Target/MSP430/MSP430InstrInfo.td
index 9993648..6b9a2f2 100644
--- a/lib/Target/MSP430/MSP430InstrInfo.td
+++ b/lib/Target/MSP430/MSP430InstrInfo.td
@@ -76,9 +76,6 @@
let MIOperandInfo = (ops GR16, i16imm);
}
-// Branch targets have OtherVT type.
-def brtarget : Operand<OtherVT>;
-
// Short jump targets have OtherVT type and are printed as pcrel imm values.
def jmptarget : Operand<OtherVT> {
let PrintMethod = "printPCRelImmOperand";
@@ -177,9 +174,9 @@
[(br bb:$dst)]>;
let isIndirectBranch = 1 in {
// Long branches
- def B : I16ri<0, (outs), (ins brtarget:$dst),
- "br\t$dst",
- []>;
+ def Bi : I16ri<0, (outs), (ins i16imm:$brdst),
+ "br\t$brdst",
+ [(brind tblockaddress:$brdst)]>;
def Br : I16rr<0, (outs), (ins GR16:$brdst),
"mov.w\t{$brdst, pc}",
[(brind GR16:$brdst)]>;