2009-11-03 Paul Brook <paul@codesourcery.com>

	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.

diff --git a/gas/ChangeLog b/gas/ChangeLog
index c562391a9a03c5ab09baa499c7045d1afecd5e1c..7b628d48f8ccb81fbe6bb10b3ee99d1d3787564c 100644 (file)
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,7 @@
+2009-11-03  Paul Brook  <paul@codesourcery.com>
+
+       * config/tc-arm.c (do_vfp_nsyn_mla_mls): Fix vmls excoding.
+
 2009-11-02  Paul Brook  <paul@codesourcery.com>
 
        * doc/c-arm.texi: Document new -mfpu options.

diff --git a/gas/config/tc-arm.c b/gas/config/tc-arm.c
index 6da0462b07d5b3b4a1ce73c2652bc0fe0c62a57d..aee851684f978b1480bff4b2053ff2d90f5ded65 100644 (file)
--- 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 d15afcbaedfbeb21961a34de42dd9f3273531697..388e54bfb6fce5411a51a267f66935214e89d04d 100644 (file)
--- a/gas/testsuite/ChangeLog
+++ b/gas/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2009-11-03  Paul Brook  <paul@codesourcery.com>
+
+       * gas/arm/vfp-neon-syntax.d: Update expected results.
+       * gas/arm/vfp-neon-syntax_t2.d: Update expected results.
+
 2009-11-02  Paul Brook  <paul@codesourcery.com>
 
        * 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 c14c9db4203975201e41cd3aa6a308ff8ce6a829..b26a1a8fe11e340cec5fea0219cf112ac4762fae 100644 (file)
--- 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 e5b6f2d4ad6bc1a54b1509a1ce918b6f5b91f479..616ec4bbfa0e6b3adada9afd1e1f6bd17d468353 100644 (file)
--- 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