summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJim Grosbach <grosbach@apple.com>2010-12-09 19:01:46 +0000
committerJim Grosbach <grosbach@apple.com>2010-12-09 19:01:46 +0000
commitcf6220a9de15d8a2a431f2672ebab3ffb0048c78 (patch)
treefb1eb7855ebc4a34f27ea9cc024614c5491e3930
parentb78558c0e1d86cd6095149e8d4621c37c09a6371 (diff)
downloadllvm-cf6220a9de15d8a2a431f2672ebab3ffb0048c78.tar.gz
llvm-cf6220a9de15d8a2a431f2672ebab3ffb0048c78.tar.bz2
llvm-cf6220a9de15d8a2a431f2672ebab3ffb0048c78.tar.xz
Thumb needs a few different encoding schemes for branch targets. Rename
t_brtarget to be more specific. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@121398 91177308-0d34-0410-b5e6-96231b3b80d8
-rw-r--r--lib/Target/ARM/ARMInstrThumb.td6
-rw-r--r--utils/TableGen/EDEmitter.cpp2
2 files changed, 4 insertions, 4 deletions
diff --git a/lib/Target/ARM/ARMInstrThumb.td b/lib/Target/ARM/ARMInstrThumb.td
index 7322b035c9..df85690cb7 100644
--- a/lib/Target/ARM/ARMInstrThumb.td
+++ b/lib/Target/ARM/ARMInstrThumb.td
@@ -74,7 +74,7 @@ def t_imm_s4 : Operand<i32> {
// Define Thumb specific addressing modes.
-def t_brtarget : Operand<i32> {
+def t_cbtarget : Operand<i32> {
let EncoderMethod = "getThumbBRTargetOpValue";
}
@@ -518,7 +518,7 @@ let isBranch = 1, isTerminator = 1 in
// Compare and branch on zero / non-zero
let isBranch = 1, isTerminator = 1 in {
- def tCBZ : T1I<(outs), (ins tGPR:$Rn, t_brtarget:$target), IIC_Br,
+ def tCBZ : T1I<(outs), (ins tGPR:$Rn, t_cbtarget:$target), IIC_Br,
"cbz\t$Rn, $target", []>,
T1Misc<{0,0,?,1,?,?,?}> {
// A8.6.27
@@ -529,7 +529,7 @@ let isBranch = 1, isTerminator = 1 in {
let Inst{2-0} = Rn;
}
- def tCBNZ : T1I<(outs), (ins tGPR:$cmp, t_brtarget:$target), IIC_Br,
+ def tCBNZ : T1I<(outs), (ins tGPR:$cmp, t_cbtarget:$target), IIC_Br,
"cbnz\t$cmp, $target", []>,
T1Misc<{1,0,?,1,?,?,?}> {
// A8.6.27
diff --git a/utils/TableGen/EDEmitter.cpp b/utils/TableGen/EDEmitter.cpp
index 3393a07a90..d7bd0917e5 100644
--- a/utils/TableGen/EDEmitter.cpp
+++ b/utils/TableGen/EDEmitter.cpp
@@ -587,7 +587,7 @@ static int ARMFlagFromOpName(LiteralConstantEmitter *type,
IMM("neon_vcvt_imm32");
MISC("brtarget", "kOperandTypeARMBranchTarget"); // ?
- MISC("t_brtarget", "kOperandTypeARMBranchTarget"); // ?
+ MISC("t_cbtarget", "kOperandTypeARMBranchTarget"); // ?
MISC("bltarget", "kOperandTypeARMBranchTarget"); // ?
MISC("t_bltarget", "kOperandTypeARMBranchTarget"); // ?
MISC("t_blxtarget", "kOperandTypeARMBranchTarget"); // ?