diff options
| author | Mihai Popa <mihail.popa@gmail.com> | 2013-08-06 15:52:36 +0000 |
|---|---|---|
| committer | Mihai Popa <mihail.popa@gmail.com> | 2013-08-06 15:52:36 +0000 |
| commit | 4a378b95aa0f24ba461e512608b8aaeaa803996f (patch) | |
| tree | ebad22575ee76edd7c7a77633a179306227f32ca /test/MC | |
| parent | df66ff09bcbdddf4ed6e3d162110a3d2b7978628 (diff) | |
| download | llvm-4a378b95aa0f24ba461e512608b8aaeaa803996f.tar.gz llvm-4a378b95aa0f24ba461e512608b8aaeaa803996f.tar.bz2 llvm-4a378b95aa0f24ba461e512608b8aaeaa803996f.tar.xz | |
Support APSR_nzcv as operand for Thumb2 mrc. Deprecate pre-UAL syntax (pc instead of apsr_nzcv)
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@187803 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'test/MC')
| -rw-r--r-- | test/MC/ARM/basic-arm-instructions.s | 8 | ||||
| -rw-r--r-- | test/MC/ARM/basic-thumb2-instructions.s | 21 |
2 files changed, 14 insertions, 15 deletions
diff --git a/test/MC/ARM/basic-arm-instructions.s b/test/MC/ARM/basic-arm-instructions.s index 66a1ff962d..ead2ce104e 100644 --- a/test/MC/ARM/basic-arm-instructions.s +++ b/test/MC/ARM/basic-arm-instructions.s @@ -1076,20 +1076,16 @@ Lforward: @------------------------------------------------------------------------------ mrc p14, #0, r1, c1, c2, #4 mrc p15, #7, apsr_nzcv, c15, c6, #6 - mrc p15, #7, pc, c15, c6, #6 mrc2 p14, #0, r1, c1, c2, #4 mrc2 p10, #7, apsr_nzcv, c15, c0, #1 - mrc2 p10, #7, pc, c15, c0, #1 @ CHECK: mrc p14, #0, r1, c1, c2, #4 @ encoding: [0x92,0x1e,0x11,0xee] @ CHECK: mrc p15, #7, apsr_nzcv, c15, c6, #6 @ encoding: [0xd6,0xff,0xff,0xee] -@ CHECK: mrc p15, #7, pc, c15, c6, #6 @ encoding: [0xd6,0xff,0xff,0xee] @ CHECK: mrc2 p14, #0, r1, c1, c2, #4 @ encoding: [0x92,0x1e,0x11,0xfe] @ CHECK: mrc2 p10, #7, apsr_nzcv, c15, c0, #1 @ encoding: [0x30,0xfa,0xff,0xfe] -@ CHECK: mrc2 p10, #7, pc, c15, c0, #1 @ encoding: [0x30,0xfa,0xff,0xfe] - mrceq p15, #7, pc, c15, c6, #6 -@ CHECK: mrceq p15, #7, pc, c15, c6, #6 @ encoding: [0xd6,0xff,0xff,0x0e] + mrceq p15, #7, apsr_nzcv, c15, c6, #6 +@ CHECK: mrceq p15, #7, apsr_nzcv, c15, c6, #6 @ encoding: [0xd6,0xff,0xff,0x0e] @------------------------------------------------------------------------------ @ MRRC/MRRC2 diff --git a/test/MC/ARM/basic-thumb2-instructions.s b/test/MC/ARM/basic-thumb2-instructions.s index f3a1c6a9f9..b5d3966b1f 100644 --- a/test/MC/ARM/basic-thumb2-instructions.s +++ b/test/MC/ARM/basic-thumb2-instructions.s @@ -1347,16 +1347,19 @@ _func: @ MRC/MRC2 @------------------------------------------------------------------------------ mrc p14, #0, r1, c1, c2, #4 - mrc2 p14, #0, r1, c1, c2, #4 - mrc p11, #1, r1, c2, c2 + mrc p15, #7, apsr_nzcv, c15, c6, #6 + mrc p11, #1, r1, c2, c2 mrc2 p12, #3, r3, c3, c4 - -@ CHECK: mrc p14, #0, r1, c1, c2, #4 @ encoding: [0x11,0xee,0x92,0x1e] -@ CHECK: mrc2 p14, #0, r1, c1, c2, #4 @ encoding: [0x11,0xfe,0x92,0x1e] -@ CHECK: mrc p11, #1, r1, c2, c2, #0 @ encoding: [0x32,0xee,0x12,0x1b] -@ CHECK: mrc2 p12, #3, r3, c3, c4, #0 @ encoding: [0x73,0xfe,0x14,0x3c] - - + mrc2 p14, #0, r1, c1, c2, #4 + mrc2 p10, #7, apsr_nzcv, c15, c0, #1 + +@ CHECK: mrc p14, #0, r1, c1, c2, #4 @ encoding: [0x11,0xee,0x92,0x1e] +@ CHECK: mrc p15, #7, apsr_nzcv, c15, c6, #6 @ encoding: [0xff,0xee,0xd6,0xff] +@ CHECK: mrc p11, #1, r1, c2, c2, #0 @ encoding: [0x32,0xee,0x12,0x1b] +@ CHECK: mrc2 p12, #3, r3, c3, c4, #0 @ encoding: [0x73,0xfe,0x14,0x3c] +@ CHECK: mrc2 p14, #0, r1, c1, c2, #4 @ encoding: [0x11,0xfe,0x92,0x1e] +@ CHECK: mrc2 p10, #7, apsr_nzcv, c15, c0, #1 @ encoding: [0xff,0xfe,0x30,0xfa] + @------------------------------------------------------------------------------ @ MRRC/MRRC2 @------------------------------------------------------------------------------ |