From d2865ed314c9d0c2c9257ce833a6f3f5ebe20e7f Mon Sep 17 00:00:00 2001 From: Yufeng Zhang Date: Mon, 13 May 2013 22:28:27 +0000 Subject: [PATCH] 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]. --- gas/ChangeLog | 7 +++++++ gas/testsuite/gas/aarch64/diagnostic.l | 4 ++-- gas/testsuite/gas/aarch64/diagnostic.s | 2 +- gas/testsuite/gas/aarch64/movi.d | 3 +++ gas/testsuite/gas/aarch64/movi.s | 5 +++++ opcodes/ChangeLog | 6 ++++++ opcodes/aarch64-asm.c | 1 - opcodes/aarch64-opc.c | 6 +++--- 8 files changed, 27 insertions(+), 7 deletions(-) diff --git a/gas/ChangeLog b/gas/ChangeLog index e35c82147ab..c1a0aa7e43e 100644 --- a/gas/ChangeLog +++ b/gas/ChangeLog @@ -1,3 +1,10 @@ +2013-05-13 Yufeng Zhang + + * 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 * 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 0a0801123bc..cca8881bc0a 100644 --- 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 99ebf8fa5f4..e5443ab750d 100644 --- 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 cd54cfd229b..e159e470591 100644 --- 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 a6507901786..3a15e3d1655 100644 --- 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 # + movi v3.8b, -128 + movi v3.8b, -127 + movi v3.8b, -1 diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog index 9a80d0481b9..d37be84c909 100644 --- a/opcodes/ChangeLog +++ b/opcodes/ChangeLog @@ -1,3 +1,9 @@ +2013-05-13 Yufeng Zhang + + * 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 * mips-dis.c (mips_arch_choices): Add INSN_VIRT to mips32r2. diff --git a/opcodes/aarch64-asm.c b/opcodes/aarch64-asm.c index 7a92b49ac28..96396e87d48 100644 --- 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 b7b1b4a913a..74f2826035f 100644 --- 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; } } -- 2.30.2