From cced5262c4d4241eb8d52bd23a5f846bf1ac9eee Mon Sep 17 00:00:00 2001 From: Ahmed Bougacha Date: Wed, 2 Sep 2015 18:52:54 +0000 Subject: [PATCH] [AArch64] More consistently separate asm opc and operands with '\t'. Somehow missed these in r246686. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@246687 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Target/AArch64/AArch64InstrFormats.td | 60 +++++++++++------------ 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/lib/Target/AArch64/AArch64InstrFormats.td b/lib/Target/AArch64/AArch64InstrFormats.td index c39093a5be9..0903f320601 100644 --- a/lib/Target/AArch64/AArch64InstrFormats.td +++ b/lib/Target/AArch64/AArch64InstrFormats.td @@ -831,7 +831,7 @@ class RtSystemI // model patterns with sufficiently fine granularity let mayStore = 1, mayLoad = 1, hasSideEffects = 1 in class HintI - : SimpleSystemI<0, (ins imm0_127:$imm), mnemonic#" $imm", "", + : SimpleSystemI<0, (ins imm0_127:$imm), mnemonic#"\t$imm", "", [(int_aarch64_hint imm0_127:$imm)]>, Sched<[WriteHint]> { bits <7> imm; @@ -1353,7 +1353,7 @@ multiclass Shift shift_type, string asm, SDNode OpNode> { } class ShiftAlias - : InstAlias; class BaseMulAccum opc, RegisterClass multype, @@ -1419,13 +1419,13 @@ class MulHi opc, string asm, SDNode OpNode> } class MulAccumWAlias - : InstAlias; class MulAccumXAlias - : InstAlias; class WideMulAccumAlias - : InstAlias; class BaseCRC32 sz, bit C, RegisterClass StreamReg, @@ -1655,7 +1655,7 @@ class BaseAddSubEReg64 - : InstAlias; @@ -1713,10 +1713,10 @@ multiclass AddSub sub Rd, Rn, imm - def : InstAlias(NAME # "Wri") GPR32sp:$Rd, GPR32sp:$Rn, addsub_shifted_imm32_neg:$imm), 0>; - def : InstAlias(NAME # "Xri") GPR64sp:$Rd, GPR64sp:$Rn, addsub_shifted_imm64_neg:$imm), 0>; @@ -1788,43 +1788,43 @@ multiclass AddSubS subs Rd, Rn, imm - def : InstAlias(NAME # "Wri") GPR32:$Rd, GPR32sp:$Rn, addsub_shifted_imm32_neg:$imm), 0>; - def : InstAlias(NAME # "Xri") GPR64:$Rd, GPR64sp:$Rn, addsub_shifted_imm64_neg:$imm), 0>; // Compare aliases - def : InstAlias(NAME#"Wri") + def : InstAlias(NAME#"Wri") WZR, GPR32sp:$src, addsub_shifted_imm32:$imm), 5>; - def : InstAlias(NAME#"Xri") + def : InstAlias(NAME#"Xri") XZR, GPR64sp:$src, addsub_shifted_imm64:$imm), 5>; - def : InstAlias(NAME#"Wrx") + def : InstAlias(NAME#"Wrx") WZR, GPR32sp:$src1, GPR32:$src2, arith_extend:$sh), 4>; - def : InstAlias(NAME#"Xrx") + def : InstAlias(NAME#"Xrx") XZR, GPR64sp:$src1, GPR32:$src2, arith_extend:$sh), 4>; - def : InstAlias(NAME#"Xrx64") + def : InstAlias(NAME#"Xrx64") XZR, GPR64sp:$src1, GPR64:$src2, arith_extendlsl64:$sh), 4>; - def : InstAlias(NAME#"Wrs") + def : InstAlias(NAME#"Wrs") WZR, GPR32:$src1, GPR32:$src2, arith_shift32:$sh), 4>; - def : InstAlias(NAME#"Xrs") + def : InstAlias(NAME#"Xrs") XZR, GPR64:$src1, GPR64:$src2, arith_shift64:$sh), 4>; // Support negative immediates, e.g. cmp Rn, -imm -> cmn Rn, imm - def : InstAlias(NAME#"Wri") + def : InstAlias(NAME#"Wri") WZR, GPR32sp:$src, addsub_shifted_imm32_neg:$imm), 0>; - def : InstAlias(NAME#"Xri") + def : InstAlias(NAME#"Xri") XZR, GPR64sp:$src, addsub_shifted_imm64_neg:$imm), 0>; // Compare shorthands - def : InstAlias(NAME#"Wrs") + def : InstAlias(NAME#"Wrs") WZR, GPR32:$src1, GPR32:$src2, 0), 5>; - def : InstAlias(NAME#"Xrs") + def : InstAlias(NAME#"Xrs") XZR, GPR64:$src1, GPR64:$src2, 0), 5>; - def : InstAlias(NAME#"Wrx") + def : InstAlias(NAME#"Wrx") WZR, GPR32sponly:$src1, GPR32:$src2, 16), 5>; - def : InstAlias(NAME#"Xrx64") + def : InstAlias(NAME#"Xrx64") XZR, GPR64sponly:$src1, GPR64:$src2, 24), 5>; // Register/register aliases with no shift when SP is not used. @@ -2010,7 +2010,7 @@ class BaseLogicalSReg opc, bit N, RegisterClass regtype, // Aliases for register+register logical instructions. class LogicalRegAlias - : InstAlias; multiclass LogicalImm opc, string mnemonic, SDNode OpNode, @@ -2029,10 +2029,10 @@ multiclass LogicalImm opc, string mnemonic, SDNode OpNode, let Inst{31} = 1; } - def : InstAlias(NAME # "Wri") GPR32sp:$Rd, GPR32:$Rn, logical_imm32_not:$imm), 0>; - def : InstAlias(NAME # "Xri") GPR64sp:$Rd, GPR64:$Rn, logical_imm64_not:$imm), 0>; } @@ -2051,10 +2051,10 @@ multiclass LogicalImmS opc, string mnemonic, SDNode OpNode, } } // end Defs = [NZCV] - def : InstAlias(NAME # "Wri") GPR32:$Rd, GPR32:$Rn, logical_imm32_not:$imm), 0>; - def : InstAlias(NAME # "Xri") GPR64:$Rd, GPR64:$Rn, logical_imm64_not:$imm), 0>; } @@ -2345,7 +2345,7 @@ multiclass LoadUI sz, bit V, bits<2> opc, RegisterClass regtype, asm, pattern>, Sched<[WriteLD]>; - def : InstAlias(NAME # "ui") regtype:$Rt, GPR64sp:$Rn, 0)>; } @@ -2357,7 +2357,7 @@ multiclass StoreUI sz, bit V, bits<2> opc, RegisterClass regtype, asm, pattern>, Sched<[WriteST]>; - def : InstAlias(NAME # "ui") regtype:$Rt, GPR64sp:$Rn, 0)>; } -- 2.34.1