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.

diff --git a/gas/ChangeLog b/gas/ChangeLog
index 28c509572f2ff66668c4e8ad94d456a9319f2325..344102489fbf568623fb508a08f763054099dc4f 100644 (file)
--- 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 61b802c82dca04868ed170e071b2b9701bf47373..3220d2b012a6ff480eedd6fd2dcf2e26549717f0 100644 (file)
--- 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 c27a794aabb3ff1a15381d991bfb5d5380dda9a3..dc6ceb06ee2b67f831af9f3342c9db4e6b22dcbb 100644 (file)
--- 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 714a2f0514ccdf0cb2c6c03423668d361d80d045..cd8b3e2b753afca8e06701a76b7c79c6b15ceaa8 100644 (file)
--- 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 2b1c01c00e02599685bb5a99109c24da06e1d3d6..1fa1b7426f38e4f2c58bc075f606dfd4790ef4ad 100644 (file)
--- 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