aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYufeng Zhang <yufeng.zhang@arm.com>2013-01-08 18:17:10 +0000
committerYufeng Zhang <yufeng.zhang@arm.com>2013-01-08 18:17:10 +0000
commita3251895a6c76c3f3a1e8535ea776b9029263253 (patch)
tree915b86a539416834b39a24132919208e9cc0b628
parent652451f8f20a6783d60ed921f9d8479f8e91a04e (diff)
downloadfsf-binutils-gdb-a3251895a6c76c3f3a1e8535ea776b9029263253.zip
fsf-binutils-gdb-a3251895a6c76c3f3a1e8535ea776b9029263253.tar.gz
fsf-binutils-gdb-a3251895a6c76c3f3a1e8535ea776b9029263253.tar.bz2
gas/
2013-01-08 Yufeng Zhang <yufeng.zhang@arm.com> * config/tc-aarch64.c (parse_operands): Change to compare the result of function call 'parse_sys_reg' with 'PARSE_FAIL' instead of 'FALSE'. gas/testsuite/ 2013-01-08 Yufeng Zhang <yufeng.zhang@arm.com> * gas/aarch64/diagnostic.s: Add test. * gas/aarch64/diagnostic.l: Update.
-rw-r--r--gas/ChangeLog5
-rw-r--r--gas/config/tc-aarch64.c9
-rw-r--r--gas/testsuite/ChangeLog5
-rw-r--r--gas/testsuite/gas/aarch64/diagnostic.l1
-rw-r--r--gas/testsuite/gas/aarch64/diagnostic.s1
5 files changed, 18 insertions, 3 deletions
diff --git a/gas/ChangeLog b/gas/ChangeLog
index 28c5095..3441024 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,8 @@
+2013-01-08 Yufeng Zhang <yufeng.zhang@arm.com>
+
+ * config/tc-aarch64.c (parse_operands): Change to compare the result
+ of function call 'parse_sys_reg' with 'PARSE_FAIL' instead of 'FALSE'.
+
2013-01-07 Nick Clifton <nickc@redhat.com>
PR gas/14887
diff --git a/gas/config/tc-aarch64.c b/gas/config/tc-aarch64.c
index 61b802c..3220d2b 100644
--- a/gas/config/tc-aarch64.c
+++ b/gas/config/tc-aarch64.c
@@ -1,6 +1,7 @@
/* tc-aarch64.c -- Assemble for the AArch64 ISA
- Copyright 2009, 2010, 2011, 2012 Free Software Foundation, Inc.
+ Copyright 2009, 2010, 2011, 2012, 2013
+ Free Software Foundation, Inc.
Contributed by ARM Ltd.
This file is part of GAS.
@@ -5050,7 +5051,8 @@ parse_operands (char *str, const aarch64_opcode *opcode)
break;
case AARCH64_OPND_SYSREG:
- if ((val = parse_sys_reg (&str, aarch64_sys_regs_hsh, 1)) == FALSE)
+ if ((val = parse_sys_reg (&str, aarch64_sys_regs_hsh, 1))
+ == PARSE_FAIL)
{
set_syntax_error (_("unknown or missing system register name"));
goto failure;
@@ -5059,7 +5061,8 @@ parse_operands (char *str, const aarch64_opcode *opcode)
break;
case AARCH64_OPND_PSTATEFIELD:
- if ((val = parse_sys_reg (&str, aarch64_pstatefield_hsh, 0)) == FALSE)
+ if ((val = parse_sys_reg (&str, aarch64_pstatefield_hsh, 0))
+ == PARSE_FAIL)
{
set_syntax_error (_("unknown or missing PSTATE field name"));
goto failure;
diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog
index c27a794..dc6ceb0 100644
--- a/gas/testsuite/ChangeLog
+++ b/gas/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2013-01-08 Yufeng Zhang <yufeng.zhang@arm.com>
+
+ * gas/aarch64/diagnostic.s: Add test.
+ * gas/aarch64/diagnostic.l: Update.
+
2013-01-07 Nick Clifton <nickc@redhat.com>
PR gas/14887
diff --git a/gas/testsuite/gas/aarch64/diagnostic.l b/gas/testsuite/gas/aarch64/diagnostic.l
index 714a2f0..cd8b3e2 100644
--- a/gas/testsuite/gas/aarch64/diagnostic.l
+++ b/gas/testsuite/gas/aarch64/diagnostic.l
@@ -85,3 +85,4 @@
[^:]*:87: Error: immediate offset out of range -256 to 252 at operand 3 -- `ldnp w7,w15,\[x3,#256\]'
[^:]*:88: Error: shift is not permitted at operand 2 -- `movi v1.2d,4294967295,lsl#0'
[^:]*:89: Error: shift amount non-zero at operand 2 -- `movi v1.8b,97,lsl#8'
+[^:]*:90: Error: unknown or missing system register name at operand 1 -- `msr dummy,x1'
diff --git a/gas/testsuite/gas/aarch64/diagnostic.s b/gas/testsuite/gas/aarch64/diagnostic.s
index 2b1c01c..1fa1b74 100644
--- a/gas/testsuite/gas/aarch64/diagnostic.s
+++ b/gas/testsuite/gas/aarch64/diagnostic.s
@@ -87,3 +87,4 @@
ldnp w7, w15, [x3, #256]
movi v1.2d, 4294967295, lsl #0
movi v1.8b, 97, lsl #8
+ msr dummy, x1