gas/

	* testsuite/gas/aarch64/diagnostic.s: Update.
	* testsuite/gas/aarch64/diagnostic.l: Ditto.
	* testsuite/gas/aarch64/movi.s: Add new tests.
	* testsuite/gas/aarch64/movi.d: Update.

opcodes/

	* aarch64-asm.c (aarch64_ins_advsimd_imm_modified): Remove assertion.
	* aarch64-opc.c (operand_general_constraint_met_p): Relax the range
	check from [0, 255] to [-128, 255].

diff --git a/gas/ChangeLog b/gas/ChangeLog
index e35c82147abfbbb5b7ba25d0cf9e358e07496822..c1a0aa7e43eb642f054520476639b5d003ec391b 100644 (file)
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,10 @@
+2013-05-13  Yufeng Zhang  <yufeng.zhang@arm.com>
+
+       * testsuite/gas/aarch64/diagnostic.s: Update.
+       * testsuite/gas/aarch64/diagnostic.l: Ditto.
+       * testsuite/gas/aarch64/movi.s: Add new tests.
+       * testsuite/gas/aarch64/movi.d: Update.
+
 2013-05-09  Andrew Pinski  <apinski@cavium.com>
 
        * config/tc-mips.c (struct mips_set_options): New ase_virt field.

diff --git a/gas/testsuite/gas/aarch64/diagnostic.l b/gas/testsuite/gas/aarch64/diagnostic.l
index 0a0801123bc1766a155e67fe7bbb734f4129215d..cca8881bc0a43191cfd5839cf784b131f5ec1502 100644 (file)
--- a/gas/testsuite/gas/aarch64/diagnostic.l
+++ b/gas/testsuite/gas/aarch64/diagnostic.l
@@ -38,8 +38,8 @@
 [^:]*:40: Error: invalid shift amount at operand 3 -- `shll v1.4s,v2.4h,#32'
 [^:]*:41: Error: immediate value out of range 0 to 31 at operand 3 -- `shl v1.2s,v2.2s,32'
 [^:]*:42: Error: immediate value out of range 1 to 8 at operand 3 -- `sqshrn2 v2.16b,v3.8h,#17'
-[^:]*:43: Error: immediate value out of range 0 to 255 at operand 2 -- `movi v1.4h,256'
-[^:]*:44: Error: immediate value out of range 0 to 255 at operand 2 -- `movi v1.4h,-1'
+[^:]*:43: Error: immediate value out of range -128 to 255 at operand 2 -- `movi v1.4h,256'
+[^:]*:44: Error: immediate value out of range -128 to 255 at operand 2 -- `movi v1.4h,-129'
 [^:]*:45: Error: invalid shift operator at operand 2 -- `movi v1.4h,255,msl#8'
 [^:]*:46: Error: invalid value for immediate at operand 2 -- `movi d0,256'
 [^:]*:47: Error: immediate value should be a multiple of 8 at operand 2 -- `movi v1.4h,255,lsl#7'

diff --git a/gas/testsuite/gas/aarch64/diagnostic.s b/gas/testsuite/gas/aarch64/diagnostic.s
index 99ebf8fa5f4d2068a83af43912531b838271184f..e5443ab750d865493a24486dfbc9bcfe617396a5 100644 (file)
--- a/gas/testsuite/gas/aarch64/diagnostic.s
+++ b/gas/testsuite/gas/aarch64/diagnostic.s
@@ -41,7 +41,7 @@
        shl     v1.2s, v2.2s, 32
        sqshrn2 v2.16b, v3.8h, #17
        movi    v1.4h, 256
-       movi    v1.4h, -1
+       movi    v1.4h, -129
        movi    v1.4h, 255, msl #8
        movi    d0, 256
        movi    v1.4h, 255, lsl #7

diff --git a/gas/testsuite/gas/aarch64/movi.d b/gas/testsuite/gas/aarch64/movi.d
index cd54cfd229bbf90025cca6d274513e4acd46595c..e159e4705918b0d3c620eb45b5ef58e06e58bbab 100644 (file)
--- a/gas/testsuite/gas/aarch64/movi.d
+++ b/gas/testsuite/gas/aarch64/movi.d
@@ -8713,3 +8713,6 @@ Disassembly of section \.text:
     8804:      6f07e7e0        movi    v0.2d, #0xffffffffffffffff
     8808:      6f07e7e0        movi    v0.2d, #0xffffffffffffffff
     880c:      2f07e7ff        movi    d31, #0xffffffffffffffff
+    8810:      0f04e403        movi    v3.8b, #0x80
+    8814:      0f04e423        movi    v3.8b, #0x81
+    8818:      0f07e7e3        movi    v3.8b, #0xff

diff --git a/gas/testsuite/gas/aarch64/movi.s b/gas/testsuite/gas/aarch64/movi.s
index a65079017861daf6895a88fe5be2989fa976103c..3a15e3d165578f72010725da0fc45ab35912114a 100644 (file)
--- a/gas/testsuite/gas/aarch64/movi.s
+++ b/gas/testsuite/gas/aarch64/movi.s
@@ -113,3 +113,8 @@
        movi    v0.2d, bignum
        movi    d31, 18446744073709551615
 .set    bignum, 0xffffffffffffffff
+
+       // Allow -128 to 255 in #<imm8>
+       movi    v3.8b, -128
+       movi    v3.8b, -127
+       movi    v3.8b, -1

diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog
index 9a80d0481b907ddff78ba394abc84f494536b080..d37be84c909d24869115922b86defcfc2113a8b9 100644 (file)
--- a/opcodes/ChangeLog
+++ b/opcodes/ChangeLog
@@ -1,3 +1,9 @@
+2013-05-13  Yufeng Zhang  <yufeng.zhang@arm.com>
+
+       * aarch64-asm.c (aarch64_ins_advsimd_imm_modified): Remove assertion.
+       * aarch64-opc.c (operand_general_constraint_met_p): Relax the range
+       check from [0, 255] to [-128, 255].
+
 2013-05-09  Andrew Pinski  <apinski@cavium.com>
 
        * mips-dis.c (mips_arch_choices): Add INSN_VIRT to mips32r2.

diff --git a/opcodes/aarch64-asm.c b/opcodes/aarch64-asm.c
index 7a92b49ac280d0fa8a34b16bed65485e8017a0e2..96396e87d48080ee9741508508d968a48fde1f9c 100644 (file)
--- a/opcodes/aarch64-asm.c
+++ b/opcodes/aarch64-asm.c
@@ -370,7 +370,6 @@ aarch64_ins_advsimd_imm_modified (const aarch64_operand *self ATTRIBUTE_UNUSED,
       imm = aarch64_shrink_expanded_imm8 (imm);
       assert ((int)imm >= 0);
     }
-  assert (imm <= 255);
   insert_fields (code, imm, 0, 2, FLD_defgh, FLD_abc);
 
   if (kind == AARCH64_MOD_NONE)

diff --git a/opcodes/aarch64-opc.c b/opcodes/aarch64-opc.c
index b7b1b4a913a00e82787e4861e8eeb134b1a7d539..74f2826035f6509f45909acc0471d706f91796e5 100644 (file)
--- a/opcodes/aarch64-opc.c
+++ b/opcodes/aarch64-opc.c
@@ -1724,10 +1724,10 @@ operand_general_constraint_met_p (const aarch64_opnd_info *opnds, int idx,
          assert (idx == 1);
          if (aarch64_get_qualifier_esize (opnds[0].qualifier) != 8)
            {
-             /* uimm8 */
-             if (!value_in_range_p (opnd->imm.value, 0, 255))
+             /* uimm8 or simm8 */
+             if (!value_in_range_p (opnd->imm.value, -128, 255))
                {
-                 set_imm_out_of_range_error (mismatch_detail, idx, 0, 255);
+                 set_imm_out_of_range_error (mismatch_detail, idx, -128, 255);
                  return 0;
                }
            }