aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTamar Christina <tamar.christina@arm.com>2016-08-19 12:57:20 +0100
committerNick Clifton <nickc@redhat.com>2016-08-19 12:58:49 +0100
commit873f10f02f5959ce9b74cc5b599f5006147de940 (patch)
treecc5f5385bddb342e589d152abff9868161c6e6af
parent0646e07d6e88045d650ee1ec5b674da1cdeaa6b6 (diff)
downloadgdb-873f10f02f5959ce9b74cc5b599f5006147de940.zip
gdb-873f10f02f5959ce9b74cc5b599f5006147de940.tar.gz
gdb-873f10f02f5959ce9b74cc5b599f5006147de940.tar.bz2
ARM: Issue a warning when the MRRC and MRRC2 instructions are used with the same destination registers.
* config/tc-arm.c (do_co_reg2c): Added constraint. * testsuite/gas/arm/dest-unpredictable.s: New. * testsuite/gas/arm/dest-unpredictable.l: New. * testsuite/gas/arm/dest-unpredictable.d: New.
-rw-r--r--gas/ChangeLog7
-rw-r--r--gas/config/tc-arm.c8
-rw-r--r--gas/testsuite/gas/arm/dest-unpredictable.d2
-rw-r--r--gas/testsuite/gas/arm/dest-unpredictable.l5
-rw-r--r--gas/testsuite/gas/arm/dest-unpredictable.s29
5 files changed, 51 insertions, 0 deletions
diff --git a/gas/ChangeLog b/gas/ChangeLog
index d14b0d9..1744cf8 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,10 @@
+2016-08-19 Tamar Christina <tamar.christina@arm.com>
+
+ * config/tc-arm.c (do_co_reg2c): Added constraint.
+ * testsuite/gas/arm/dest-unpredictable.s: New.
+ * testsuite/gas/arm/dest-unpredictable.l: New.
+ * testsuite/gas/arm/dest-unpredictable.d: New.
+
2016-08-19 Nick Clifton <nickc@redhat.com>
* testsuite/gas/i386/ilp32/x86-64-unwind.d: Adjust expected
diff --git a/gas/config/tc-arm.c b/gas/config/tc-arm.c
index a8d9556..040fee4 100644
--- a/gas/config/tc-arm.c
+++ b/gas/config/tc-arm.c
@@ -8691,6 +8691,14 @@ do_co_reg2c (void)
constraint (Rn == REG_PC, BAD_PC);
}
+ /* Only check the MRRC{2} variants. */
+ if ((inst.instruction & 0x0FF00000) == 0x0C500000)
+ {
+ /* If Rd == Rn, error that the operation is
+ unpredictable (example MRRC p3,#1,r1,r1,c4). */
+ constraint (Rd == Rn, BAD_OVERLAP);
+ }
+
inst.instruction |= inst.operands[0].reg << 8;
inst.instruction |= inst.operands[1].imm << 4;
inst.instruction |= Rd << 12;
diff --git a/gas/testsuite/gas/arm/dest-unpredictable.d b/gas/testsuite/gas/arm/dest-unpredictable.d
new file mode 100644
index 0000000..129d08c
--- /dev/null
+++ b/gas/testsuite/gas/arm/dest-unpredictable.d
@@ -0,0 +1,2 @@
+# name: Unpredictable MRRC and MRRC2 instructions. - ARM
+# error-output: dest-unpredictable.l
diff --git a/gas/testsuite/gas/arm/dest-unpredictable.l b/gas/testsuite/gas/arm/dest-unpredictable.l
new file mode 100644
index 0000000..7c17c25
--- /dev/null
+++ b/gas/testsuite/gas/arm/dest-unpredictable.l
@@ -0,0 +1,5 @@
+[^:]*: Assembler messages:
+[^:]*:6: Error: registers may not be the same -- `mrrc p0,#1,r1,r1,c4'
+[^:]*:7: Error: registers may not be the same -- `mrrc2 p0,#1,r1,r1,c4'
+[^:]*:20: Error: registers may not be the same -- `mrrc p0,#1,r1,r1,c4'
+[^:]*:21: Error: registers may not be the same -- `mrrc2 p0,#1,r1,r1,c4'
diff --git a/gas/testsuite/gas/arm/dest-unpredictable.s b/gas/testsuite/gas/arm/dest-unpredictable.s
new file mode 100644
index 0000000..fae22be
--- /dev/null
+++ b/gas/testsuite/gas/arm/dest-unpredictable.s
@@ -0,0 +1,29 @@
+.syntax unified
+
+.arm
+
+@ warnings
+mrrc p0,#1,r1,r1,c4 @ unpredictable
+mrrc2 p0,#1,r1,r1,c4 @ ditto
+
+@ normal
+mrrc p0,#1,r1,r2,c4 @ predictable
+mrrc2 p0,#1,r1,r2,c4 @ ditto
+mcrr p0,#1,r1,r2,c4 @ ditto
+mcrr2 p0,#1,r1,r2,c4 @ ditto
+mcrr p0,#1,r1,r1,c4 @ ditto
+mcrr2 p0,#1,r1,r1,c4 @ ditto
+
+.thumb
+
+@ warnings
+mrrc p0,#1,r1,r1,c4 @ unpredictable
+mrrc2 p0,#1,r1,r1,c4 @ ditto
+
+@ normal
+mrrc p0,#1,r1,r2,c4 @ predictable
+mrrc2 p0,#1,r1,r2,c4 @ ditto
+mcrr p0,#1,r1,r2,c4 @ ditto
+mcrr2 p0,#1,r1,r2,c4 @ ditto
+mcrr p0,#1,r1,r1,c4 @ ditto
+mcrr2 p0,#1,r1,r1,c4 @ ditto