diff options
| author | Nick Clifton <nickc@redhat.com> | 2018-07-13 11:44:49 +0100 |
|---|---|---|
| committer | Nick Clifton <nickc@redhat.com> | 2018-07-13 11:44:49 +0100 |
| commit | 524496887011b46736f4c5865a5faedd46be6f54 (patch) | |
| tree | e9a8d866c41224ba7daa862ecbef33fea2a3a256 | |
| parent | 65cc93d2fbcf570bf6459e292c2d55727ca64905 (diff) | |
Allow bit-patterns in the immediate field of ARM neon mov instructions.
* config/tc-arm.c (do_neon_mov): When converting an integer
immediate into a floating point value, check that the conversion
is valid. Also warn if the immediate is valid as both a floating
point value and a bit pattern.
* testsuite/gas/arm/vfp-mov-enc.s: Add instructions that use
floating point bit patterns.
* testsuite/gas/arm/vfp-mov-enc.d: Add regexps for the disassembly
of the new insns.
| -rw-r--r-- | gas/ChangeLog | 11 | ||||
| -rw-r--r-- | gas/config/tc-arm.c | 19 | ||||
| -rw-r--r-- | gas/testsuite/gas/arm/vfp-mov-enc.d | 3 | ||||
| -rw-r--r-- | gas/testsuite/gas/arm/vfp-mov-enc.s | 4 |
4 files changed, 33 insertions, 4 deletions
diff --git a/gas/ChangeLog b/gas/ChangeLog index 3c7a4c23d2..a6d7ebc912 100644 --- a/gas/ChangeLog +++ b/gas/ChangeLog @@ -1,3 +1,14 @@ +2018-07-13 Nick Clifton <nickc@redhat.com> + + * config/tc-arm.c (do_neon_mov): When converting an integer + immediate into a floating point value, check that the conversion + is valid. Also warn if the immediate is valid as both a floating + point value and a bit pattern. + * testsuite/gas/arm/vfp-mov-enc.s: Add instructions that use + floating point bit patterns. + * testsuite/gas/arm/vfp-mov-enc.d: Add regexps for the disassembly + of the new insns. + 2018-07-12 Sudakshina Das <sudi.das@arm.com> * testsuite/gas/aarch64/system.s: Add test for ssbb diff --git a/gas/config/tc-arm.c b/gas/config/tc-arm.c index 3f93041e62..c2507e6ef7 100644 --- a/gas/config/tc-arm.c +++ b/gas/config/tc-arm.c @@ -16692,13 +16692,24 @@ do_neon_mov (void) case NS_HI: case NS_FI: /* case 10 (fconsts). */ ldconst = "fconsts"; - encode_fconstd: + encode_fconstd: if (!inst.operands[1].immisfloat) { + unsigned new_imm; /* Immediate has to fit in 8 bits so float is enough. */ - float imm = (float)inst.operands[1].imm; - memcpy (&inst.operands[1].imm, &imm, sizeof (float)); - inst.operands[1].immisfloat = 1; + float imm = (float) inst.operands[1].imm; + memcpy (&new_imm, &imm, sizeof (float)); + /* But the assembly may have been written to provide an integer + bit pattern that equates to a float, so check that the + conversion has worked. */ + if (is_quarter_float (new_imm)) + { + if (is_quarter_float (inst.operands[1].imm)) + as_warn (_("immediate constant is valid both as a bit-pattern and a floating point value (using the fp value)")); + + inst.operands[1].imm = new_imm; + inst.operands[1].immisfloat = 1; + } } if (is_quarter_float (inst.operands[1].imm)) diff --git a/gas/testsuite/gas/arm/vfp-mov-enc.d b/gas/testsuite/gas/arm/vfp-mov-enc.d index 5c4b266e8a..fda47f2b43 100644 --- a/gas/testsuite/gas/arm/vfp-mov-enc.d +++ b/gas/testsuite/gas/arm/vfp-mov-enc.d @@ -11,3 +11,6 @@ Disassembly of section .text: 0[0-9a-f]+ <[^>]+> 4ef7da00 vmovmi.f32 s27, #112 ; 0x3f800000 1.0 0[0-9a-f]+ <[^>]+> cebb1b04 vmovgt.f64 d1, #180 ; 0xc1a00000 -20.0 0[0-9a-f]+ <[^>]+> ceb81b00 vmovgt.f64 d1, #128 ; 0xc0000000 -2.0 +0[0-9a-f]+ <[^>]+> eef0aa00 vmov.f32 s21, #0 ; 0x40000000 2.0 +0[0-9a-f]+ <[^>]+> eef97a07 vmov.f32 s15, #151 ; 0xc0b80000 -5.750 +0[0-9a-f]+ <[^>]+> eefc4a05 vmov.f32 s9, #197 ; 0xbe280000 -0.1640625 diff --git a/gas/testsuite/gas/arm/vfp-mov-enc.s b/gas/testsuite/gas/arm/vfp-mov-enc.s index 4362fb1d39..049f46b5f2 100644 --- a/gas/testsuite/gas/arm/vfp-mov-enc.s +++ b/gas/testsuite/gas/arm/vfp-mov-enc.s @@ -4,3 +4,7 @@ VMOVMI.F32 s27,#1 VMOVMI.F32 s27,#1.0 VMOVGT.F64 d1,#-20 VMOVGT.F64 d1,#-2 + @ Check that integer-encoded floating-point bit-patterns still work + vmov s21,#0x40000000 + vmov s15,#0xc0b80000 + vmov s9,#0xbe280000 |