diff options
| author | Tim Northover <tnorthover@apple.com> | 2013-11-05 21:36:02 +0000 |
|---|---|---|
| committer | Tim Northover <tnorthover@apple.com> | 2013-11-05 21:36:02 +0000 |
| commit | f635ab8eabb06a41fa791d897ebf32eb338688a0 (patch) | |
| tree | 08037bc1a4300f94b39bcfe607c53376f19ca67b | |
| parent | 5f5095e3dce0386658481353d93c11ca6123bb95 (diff) | |
| download | llvm-f635ab8eabb06a41fa791d897ebf32eb338688a0.tar.gz llvm-f635ab8eabb06a41fa791d897ebf32eb338688a0.tar.bz2 llvm-f635ab8eabb06a41fa791d897ebf32eb338688a0.tar.xz | |
ARM: permit bare dmb/dsb/isb aliases on Cortex-M0
Cortex-M0 supports these 32-bit instructions despite being Thumb1 only
(mostly). We knew about that but not that the aliases without the default "sy"
operand were also permitted.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@194094 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | lib/Target/ARM/ARMInstrThumb2.td | 6 | ||||
| -rw-r--r-- | test/MC/ARM/thumb-hints.s | 32 |
2 files changed, 34 insertions, 4 deletions
diff --git a/lib/Target/ARM/ARMInstrThumb2.td b/lib/Target/ARM/ARMInstrThumb2.td index f09b65fd52..725e5054f7 100644 --- a/lib/Target/ARM/ARMInstrThumb2.td +++ b/lib/Target/ARM/ARMInstrThumb2.td @@ -4329,9 +4329,9 @@ def : t2InstAlias<"tst${p} $Rn, $Rm", (t2TSTrr GPRnopc:$Rn, rGPR:$Rm, pred:$p)>; // Memory barriers -def : InstAlias<"dmb${p}", (t2DMB 0xf, pred:$p)>, Requires<[IsThumb2, HasDB]>; -def : InstAlias<"dsb${p}", (t2DSB 0xf, pred:$p)>, Requires<[IsThumb2, HasDB]>; -def : InstAlias<"isb${p}", (t2ISB 0xf, pred:$p)>, Requires<[IsThumb2, HasDB]>; +def : InstAlias<"dmb${p}", (t2DMB 0xf, pred:$p)>, Requires<[HasDB]>; +def : InstAlias<"dsb${p}", (t2DSB 0xf, pred:$p)>, Requires<[HasDB]>; +def : InstAlias<"isb${p}", (t2ISB 0xf, pred:$p)>, Requires<[HasDB]>; // Alias for LDR, LDRB, LDRH, LDRSB, and LDRSH without the ".w" optional // width specifier. diff --git a/test/MC/ARM/thumb-hints.s b/test/MC/ARM/thumb-hints.s index 73e83621a9..b3c4cee40b 100644 --- a/test/MC/ARM/thumb-hints.s +++ b/test/MC/ARM/thumb-hints.s @@ -17,9 +17,21 @@ @ CHECK: wfi @ encoding: [0x30,0xbf] @ CHECK: sev @ encoding: [0x40,0xbf] - @ CHECK-EVIL-PRE-UAL: mov r8, r8 @ encoding: [0xc0,0x46] + dmb sy + dmb + dsb sy + dsb + isb sy + isb +@ CHECK: dmb sy @ encoding: [0xbf,0xf3,0x5f,0x8f] +@ CHECK: dmb sy @ encoding: [0xbf,0xf3,0x5f,0x8f] +@ CHECK: dsb sy @ encoding: [0xbf,0xf3,0x4f,0x8f] +@ CHECK: dsb sy @ encoding: [0xbf,0xf3,0x4f,0x8f] +@ CHECK: isb sy @ encoding: [0xbf,0xf3,0x6f,0x8f] +@ CHECK: isb sy @ encoding: [0xbf,0xf3,0x6f,0x8f] + @ CHECK-ERROR: error: instruction requires: armv6m or armv6t2 @ CHECK-ERROR-NEXT: yield @@ -32,3 +44,21 @@ @ CHECK-ERROR: error: instruction requires: armv6m or armv6t2 @ CHECK-ERROR-NEXT: sev + +@ CHECK-ERROR: error: +@ CHECK-ERROR-NEXT: dmb sy + +@ CHECK-ERROR: error: instruction requires: data-barriers +@ CHECK-ERROR-NEXT: dmb + +@ CHECK-ERROR: error: +@ CHECK-ERROR-NEXT: dsb sy + +@ CHECK-ERROR: error: instruction requires: data-barriers +@ CHECK-ERROR-NEXT: dsb + +@ CHECK-ERROR: error: +@ CHECK-ERROR-NEXT: isb sy + +@ CHECK-ERROR: error: instruction requires: data-barriers +@ CHECK-ERROR-NEXT: isb |