ARM Thumb2 asm parsing [SU]XT[BH] without rotate but with .w.

Add inst alias to handle these assembly forms. Add tests, too.

rdar://10178799

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@140647 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/lib/Target/ARM/ARMInstrThumb2.td b/lib/Target/ARM/ARMInstrThumb2.td
index c0911d0f3df28f9ada9a0666ae4e2084e0e4f7bc..6ce443894388d17cb3a87db4f6b1688b97c1604d 100644 (file)
--- a/lib/Target/ARM/ARMInstrThumb2.td
+++ b/lib/Target/ARM/ARMInstrThumb2.td
@@ -3936,12 +3936,17 @@ def : t2InstAlias<"sxtah${p} $Rd, $Rn, $Rm",
                 (t2SXTAH rGPR:$Rd, rGPR:$Rn, rGPR:$Rm, 0, pred:$p)>;
 def : t2InstAlias<"sxtab16${p} $Rd, $Rn, $Rm",
                 (t2SXTAB16 rGPR:$Rd, rGPR:$Rn, rGPR:$Rm, 0, pred:$p)>;
+
 def : t2InstAlias<"sxtb${p} $Rd, $Rm",
                 (t2SXTB rGPR:$Rd, rGPR:$Rm, 0, pred:$p)>;
 def : t2InstAlias<"sxtb16${p} $Rd, $Rm",
                 (t2SXTB16 rGPR:$Rd, rGPR:$Rm, 0, pred:$p)>;
 def : t2InstAlias<"sxth${p} $Rd, $Rm",
                 (t2SXTH rGPR:$Rd, rGPR:$Rm, 0, pred:$p)>;
+def : t2InstAlias<"sxtb${p}.w $Rd, $Rm",
+                (t2SXTB rGPR:$Rd, rGPR:$Rm, 0, pred:$p)>;
+def : t2InstAlias<"sxth${p}.w $Rd, $Rm",
+                (t2SXTH rGPR:$Rd, rGPR:$Rm, 0, pred:$p)>;
 
 def : t2InstAlias<"uxtab${p} $Rd, $Rn, $Rm",
                 (t2UXTAB rGPR:$Rd, rGPR:$Rn, rGPR:$Rm, 0, pred:$p)>;
@@ -3956,6 +3961,11 @@ def : t2InstAlias<"uxtb16${p} $Rd, $Rm",
 def : t2InstAlias<"uxth${p} $Rd, $Rm",
                 (t2UXTH rGPR:$Rd, rGPR:$Rm, 0, pred:$p)>;
 
+def : t2InstAlias<"uxtb${p}.w $Rd, $Rm",
+                (t2UXTB rGPR:$Rd, rGPR:$Rm, 0, pred:$p)>;
+def : t2InstAlias<"uxth${p}.w $Rd, $Rm",
+                (t2UXTH rGPR:$Rd, rGPR:$Rm, 0, pred:$p)>;
+
 // Extend instruction w/o the ".w" optional width specifier.
 def : t2InstAlias<"uxtb${p} $Rd, $Rm$rot",
                   (t2UXTB rGPR:$Rd, rGPR:$Rm, rot_imm:$rot, pred:$p)>;

diff --git a/test/MC/ARM/basic-thumb2-instructions.s b/test/MC/ARM/basic-thumb2-instructions.s
index b75f9f8ee1de5cbcd8ac3a27f04675419ce8f9a7..c2e78e71f8383eaa8979c4064d039bc506e3b85c 100644 (file)
--- a/test/MC/ARM/basic-thumb2-instructions.s
+++ b/test/MC/ARM/basic-thumb2-instructions.s
@@ -2517,6 +2517,7 @@ _func:
         ite ge
         sxtbge r2, r4
         sxtblt r5, r1, ror #16
+        sxtb.w  r7, r8
 
 @ CHECK: sxtb  r5, r6                  @ encoding: [0x75,0xb2]
 @ CHECK: sxtb.w        r6, r9, ror #8          @ encoding: [0x4f,0xfa,0x99,0xf6]
@@ -2524,6 +2525,7 @@ _func:
 @ CHECK: ite   ge                      @ encoding: [0xac,0xbf]
 @ CHECK: sxtbge        r2, r4                  @ encoding: [0x62,0xb2]
 @ CHECK: sxtblt.w      r5, r1, ror #16 @ encoding: [0x4f,0xfa,0xa1,0xf5]
+@ CHECK: sxtb.w        r7, r8                  @ encoding: [0x4f,0xfa,0x88,0xf7]
 
 
 @------------------------------------------------------------------------------
@@ -2553,6 +2555,7 @@ _func:
         itt ne
         sxthne r3, r9
         sxthne r2, r2, ror #16
+        sxth.w  r7, r8
 
 @ CHECK: sxth  r1, r6                  @ encoding: [0x31,0xb2]
 @ CHECK: sxth.w        r3, r8, ror #8          @ encoding: [0x0f,0xfa,0x98,0xf3]
@@ -2560,6 +2563,7 @@ _func:
 @ CHECK: itt   ne                      @ encoding: [0x1c,0xbf]
 @ CHECK: sxthne.w      r3, r9          @ encoding: [0x0f,0xfa,0x89,0xf3]
 @ CHECK: sxthne.w      r2, r2, ror #16 @ encoding: [0x0f,0xfa,0xa2,0xf2]
+@ CHECK: sxth.w        r7, r8                  @ encoding: [0x0f,0xfa,0x88,0xf7]
 
 
 @------------------------------------------------------------------------------
@@ -3016,6 +3020,7 @@ _func:
         it cc
         uxtbcc r5, r1, ror #16
         uxtb r8, r3, ror #24
+        uxtb.w  r7, r8
 
 @ CHECK: it    ge                      @ encoding: [0xa8,0xbf]
 @ CHECK: uxtbge        r2, r4                  @ encoding: [0xe2,0xb2]
@@ -3024,6 +3029,7 @@ _func:
 @ CHECK: it    lo                      @ encoding: [0x38,0xbf]
 @ CHECK: uxtblo.w      r5, r1, ror #16 @ encoding: [0x5f,0xfa,0xa1,0xf5]
 @ CHECK: uxtb.w        r8, r3, ror #24         @ encoding: [0x5f,0xfa,0xb3,0xf8]
+@ CHECK: uxtb.w        r7, r8                  @ encoding: [0x5f,0xfa,0x88,0xf7]
 
 
 @------------------------------------------------------------------------------
@@ -3056,6 +3062,7 @@ _func:
         it le
         uxthle r2, r2, ror #16
         uxth r9, r3, ror #24
+        uxth.w  r7, r8
 
 @ CHECK: it    ne                      @ encoding: [0x18,0xbf]
 @ CHECK: uxthne.w      r3, r9          @ encoding: [0x1f,0xfa,0x89,0xf3]
@@ -3064,7 +3071,7 @@ _func:
 @ CHECK: it    le                      @ encoding: [0xd8,0xbf]
 @ CHECK: uxthle.w      r2, r2, ror #16 @ encoding: [0x1f,0xfa,0xa2,0xf2]
 @ CHECK: uxth.w        r9, r3, ror #24         @ encoding: [0x1f,0xfa,0xb3,0xf9]
-
+@ CHECK: uxth.w        r7, r8                  @ encoding: [0x1f,0xfa,0x88,0xf7]
 
 @------------------------------------------------------------------------------
 @ WFE/WFI/YIELD