From 1ee69515803d3297f776f3984d48e0c5a6b0687b Mon Sep 17 00:00:00 2001 From: Paul Brook Date: Tue, 3 Nov 2009 12:37:45 +0000 Subject: [PATCH] 2009-11-03 Paul Brook gas/ * config/tc-arm.c (do_vfp_nsyn_mla_mls): Fix vmls excoding. gas/testsuite/ * gas/arm/vfp-neon-syntax.d: Update expected results. * gas/arm/vfp-neon-syntax_t2.d: Update expected results. --- gas/ChangeLog | 4 ++++ gas/config/tc-arm.c | 4 ++-- gas/testsuite/ChangeLog | 5 +++++ gas/testsuite/gas/arm/vfp-neon-syntax.d | 8 ++++---- gas/testsuite/gas/arm/vfp-neon-syntax_t2.d | 8 ++++---- 5 files changed, 19 insertions(+), 10 deletions(-) diff --git a/gas/ChangeLog b/gas/ChangeLog index c562391..7b628d4 100644 --- a/gas/ChangeLog +++ b/gas/ChangeLog @@ -1,3 +1,7 @@ +2009-11-03 Paul Brook + + * config/tc-arm.c (do_vfp_nsyn_mla_mls): Fix vmls excoding. + 2009-11-02 Paul Brook * doc/c-arm.texi: Document new -mfpu options. diff --git a/gas/config/tc-arm.c b/gas/config/tc-arm.c index 6da0462..aee8516 100644 --- a/gas/config/tc-arm.c +++ b/gas/config/tc-arm.c @@ -12144,14 +12144,14 @@ do_vfp_nsyn_mla_mls (enum neon_shape rs) if (is_mla) do_vfp_nsyn_opcode ("fmacs"); else - do_vfp_nsyn_opcode ("fmscs"); + do_vfp_nsyn_opcode ("fnmacs"); } else { if (is_mla) do_vfp_nsyn_opcode ("fmacd"); else - do_vfp_nsyn_opcode ("fmscd"); + do_vfp_nsyn_opcode ("fnmacd"); } } diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog index d15afcb..388e54b 100644 --- a/gas/testsuite/ChangeLog +++ b/gas/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2009-11-03 Paul Brook + + * gas/arm/vfp-neon-syntax.d: Update expected results. + * gas/arm/vfp-neon-syntax_t2.d: Update expected results. + 2009-11-02 Paul Brook * gas/arm/attr-mfpu-vfpv4.d: New test. diff --git a/gas/testsuite/gas/arm/vfp-neon-syntax.d b/gas/testsuite/gas/arm/vfp-neon-syntax.d index c14c9db..b26a1a8 100644 --- a/gas/testsuite/gas/arm/vfp-neon-syntax.d +++ b/gas/testsuite/gas/arm/vfp-neon-syntax.d @@ -61,10 +61,10 @@ Disassembly of section .text: 0[0-9a-f]+ <[^>]+> ee010b02 (vmla\.f64|fmacd) d0, d1, d2 0[0-9a-f]+ <[^>]+> 0e000a81 (vmlaeq\.f32|fmacseq) s0, s1, s2 0[0-9a-f]+ <[^>]+> 0e010b02 (vmlaeq\.f64|fmacdeq) d0, d1, d2 -0[0-9a-f]+ <[^>]+> ee100a81 (vnmls\.f32|fmscs) s0, s1, s2 -0[0-9a-f]+ <[^>]+> ee110b02 (vnmls\.f64|fmscd) d0, d1, d2 -0[0-9a-f]+ <[^>]+> 0e100a81 (vnmlseq\.f32|fmscseq) s0, s1, s2 -0[0-9a-f]+ <[^>]+> 0e110b02 (vnmlseq\.f64|fmscdeq) d0, d1, d2 +0[0-9a-f]+ <[^>]+> ee000ac1 (vmls\.f32|fmscs) s0, s1, s2 +0[0-9a-f]+ <[^>]+> ee010b42 (vmls\.f64|fmscd) d0, d1, d2 +0[0-9a-f]+ <[^>]+> 0e000ac1 (vmlseq\.f32|fmscseq) s0, s1, s2 +0[0-9a-f]+ <[^>]+> 0e010b42 (vmlseq\.f64|fmscdeq) d0, d1, d2 0[0-9a-f]+ <[^>]+> ee300a81 (vadd\.f32|fadds) s0, s1, s2 0[0-9a-f]+ <[^>]+> ee310b02 (vadd\.f64|faddd) d0, d1, d2 0[0-9a-f]+ <[^>]+> 0e300a81 (vaddeq\.f32|faddseq) s0, s1, s2 diff --git a/gas/testsuite/gas/arm/vfp-neon-syntax_t2.d b/gas/testsuite/gas/arm/vfp-neon-syntax_t2.d index e5b6f2d..616ec4b 100644 --- a/gas/testsuite/gas/arm/vfp-neon-syntax_t2.d +++ b/gas/testsuite/gas/arm/vfp-neon-syntax_t2.d @@ -73,11 +73,11 @@ Disassembly of section \.text: 0[0-9a-f]+ <[^>]+> bf04 itt eq 0[0-9a-f]+ <[^>]+> ee00 0a81 (vmlaeq\.f32|fmacseq) s0, s1, s2 0[0-9a-f]+ <[^>]+> ee01 0b02 (vmlaeq\.f64|fmacdeq) d0, d1, d2 -0[0-9a-f]+ <[^>]+> ee10 0a81 (vnmls\.f32|fmscs) s0, s1, s2 -0[0-9a-f]+ <[^>]+> ee11 0b02 (vnmls\.f64|fmscd) d0, d1, d2 +0[0-9a-f]+ <[^>]+> ee00 0ac1 (vmls\.f32|fmscs) s0, s1, s2 +0[0-9a-f]+ <[^>]+> ee01 0b42 (vmls\.f64|fmscd) d0, d1, d2 0[0-9a-f]+ <[^>]+> bf04 itt eq -0[0-9a-f]+ <[^>]+> ee10 0a81 (vnmlseq\.f32|fmscseq) s0, s1, s2 -0[0-9a-f]+ <[^>]+> ee11 0b02 (vnmlseq\.f64|fmscdeq) d0, d1, d2 +0[0-9a-f]+ <[^>]+> ee00 0ac1 (vmlseq\.f32|fmscseq) s0, s1, s2 +0[0-9a-f]+ <[^>]+> ee01 0b42 (vmlseq\.f64|fmscdeq) d0, d1, d2 0[0-9a-f]+ <[^>]+> ee30 0a81 (vadd\.f32|fadds) s0, s1, s2 0[0-9a-f]+ <[^>]+> ee31 0b02 (vadd\.f64|faddd) d0, d1, d2 0[0-9a-f]+ <[^>]+> bf04 itt eq -- 2.7.4