This is the mail archive of the
binutils@sourceware.org
mailing list for the binutils project.
[OPCODE][ARM]Correct disassembler for cdp/cdp2, mcr/mcr2, mrc/mrc2, ldc/ldc2, stc/stc2
- From: Renlin Li <renlin dot li at foss dot arm dot com>
- To: "binutils at sourceware dot org" <binutils at sourceware dot org>
- Cc: Nicholas Clifton <nickc at redhat dot com>, Marcus Shawcroft <Marcus dot Shawcroft at arm dot com>, Ramana Radhakrishnan <Ramana dot Radhakrishnan at arm dot com>
- Date: Thu, 18 Feb 2016 15:05:44 +0000
- Subject: [OPCODE][ARM]Correct disassembler for cdp/cdp2, mcr/mcr2, mrc/mrc2, ldc/ldc2, stc/stc2
- Authentication-results: sourceware.org; auth=none
Hi all,
This is a patch to correct the dissembler for cpd/cpd2, mcr/mcr2, mrc/mrc2, ldc/ldc2, stc/stc2.
For cpd, cdp2, mcr, mrc, ldc, stc
when the co-processor number (bit 9-11) is 10 or 11, it should be a SIMD or floating point instruction.
In this case, it should be skipped, and search for another matching instruction.
For mcr2, mrc2, ldc2, stc2
when the coprocessor number (bit 9-11) is 10 or 11, it's undefined.
A new variable cp_num is declared and used here to represent co-processor number in
current instruction if applicable.
Binutils, gas, ld checked Okay without any new issues. Okay to commit?
opcodes/ChangeLog:
2016-02-18 Renlin Li <renlin.li@arm.com>
* arm-dis.c (print_insn_coprocessor): Check co-processor number for
cpd/cpd2, mcr/mcr2, mrc/mrc2, ldc/ldc2, stc/stc2.
* testsuite/gas/arm/copro.s: Update.
* testsuite/gas/arm/copro.d: Update.
diff --git a/gas/testsuite/gas/arm/copro.d b/gas/testsuite/gas/arm/copro.d
index d007c81..eb7b454 100644
--- a/gas/testsuite/gas/arm/copro.d
+++ b/gas/testsuite/gas/arm/copro.d
@@ -30,7 +30,7 @@ Disassembly of section .text:
0+050 <[^>]*> ecd43704 ldcl 7, cr3, \[r4\], \{4\}
0+054 <[^>]*> ecc52805 stcl 8, cr2, \[r5\], \{5\}
0+058 <[^>]*> fcd61906 ldc2l 9, cr1, \[r6\], \{6\}
-0+05c <[^>]*> fcc70a07 stc2l 10, cr0, \[r7\], \{7\}
+0+05c <[^>]*> fcc70c07 stc2l 12, cr0, \[r7\], \{7\}
0+060 <[^>]*> ecd88cff ldcl 12, cr8, \[r8\], \{255\}.*
0+064 <[^>]*> ecc99cfe stcl 12, cr9, \[r9\], \{254\}.*
0+068 <[^>]*> ec507d04 mrrc 13, 0, r7, r0, cr4
diff --git a/gas/testsuite/gas/arm/copro.s b/gas/testsuite/gas/arm/copro.s
index 0ed0e05..f03f5ae 100644
--- a/gas/testsuite/gas/arm/copro.s
+++ b/gas/testsuite/gas/arm/copro.s
@@ -32,7 +32,8 @@ bar:
ldcl 7, c3, [r4], {4}
stcl p8, c2, [r5], {5}
ldc2l 9, c1, [r6], {6}
- stc2l p10, c0, [r7], {7}
+ @ using '10, 11' below results in an invalid stc2l instruction.
+ stc2l p12, c0, [r7], {7}
@ using '11' below results in an (invalid) Neon vldmia instruction.
ldcl 12, c8, [r8], {255}
stcl p12, c9, [r9], {254}
diff --git a/opcodes/arm-dis.c b/opcodes/arm-dis.c
index 430da08..2572f9c 100644
--- a/opcodes/arm-dis.c
+++ b/opcodes/arm-dis.c
@@ -3181,6 +3181,7 @@ print_insn_coprocessor (bfd_vma pc,
unsigned long mask;
unsigned long value = 0;
int cond;
+ int cp_num;
struct arm_private_data *private_data = info->private_data;
arm_feature_set allowed_arches = ARM_ARCH_NONE;
@@ -3219,6 +3220,8 @@ print_insn_coprocessor (bfd_vma pc,
mask = insn->mask;
value = insn->value;
+ cp_num = (given >> 8) & 0xf;
+
if (thumb)
{
/* The high 4 bits are 0xe for Arm conditional instructions, and
@@ -3254,6 +3257,26 @@ print_insn_coprocessor (bfd_vma pc,
if (! ARM_CPU_HAS_FEATURE (insn->arch, allowed_arches))
continue;
+ if (insn->value == 0xfe000010 /* mcr2 */
+ || insn->value == 0xfe100010 /* mrc2 */
+ || insn->value == 0xfc100000 /* ldc2 */
+ || insn->value == 0xfc000000) /* stc2 */
+ {
+ if (cp_num == 10 || cp_num == 11)
+ is_unpredictable = TRUE;
+ }
+ else if (insn->value == 0x0e000000 /* cdp */
+ || insn->value == 0xfe000000 /* cdp2 */
+ || insn->value == 0x0e000010 /* mcr */
+ || insn->value == 0x0e100010 /* mrc */
+ || insn->value == 0x0c100000 /* ldc */
+ || insn->value == 0x0c000000) /* stc */
+ {
+ /* Floating-point instructions. */
+ if (cp_num == 10 || cp_num == 11)
+ continue;
+ }
+
for (c = insn->assembler; *c; c++)
{
if (*c == '%')