svn commit: r318776 - stable/11/contrib/binutils/gas/config

[Michal Meloun]

Author: mmel
Date: Wed May 24 06:49:01 2017
New Revision: 318776
URL: https://svnweb.freebsd.org/changeset/base/318776

Log:
  MFC r318135:
  
    Fix parsing of 'vmov Q<n>.F32,Q<n>.F32' instruction.

Modified:
  stable/11/contrib/binutils/gas/config/tc-arm.c
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/contrib/binutils/gas/config/tc-arm.c
==============================================================================
--- stable/11/contrib/binutils/gas/config/tc-arm.c	Wed May 24 05:30:36 2017	(r318775)
+++ stable/11/contrib/binutils/gas/config/tc-arm.c	Wed May 24 06:49:01 2017	(r318776)
@@ -5211,12 +5211,6 @@ parse_neon_mov (char **str, int *which_o
               inst.operands[i].present = 1;
             }
         }
-      else if (parse_qfloat_immediate (&ptr, &inst.operands[i].imm) == SUCCESS)
-          /* Case 2: VMOV<c><q>.<dt> <Qd>, #<float-imm>
-             Case 3: VMOV<c><q>.<dt> <Dd>, #<float-imm>
-             Case 10: VMOV.F32 <Sd>, #<imm>
-             Case 11: VMOV.F64 <Dd>, #<imm>  */
-        inst.operands[i].immisfloat = 1;
       else if ((val = arm_typed_reg_parse (&ptr, REG_TYPE_NSDQ, &rtype,
                                            &optype)) != FAIL)
         {
@@ -5253,9 +5247,15 @@ parse_neon_mov (char **str, int *which_o
               
               inst.operands[i].reg = val;
               inst.operands[i].isreg = 1;
-              inst.operands[i++].present = 1;
+              inst.operands[i].present = 1;
             }
         }
+      else if (parse_qfloat_immediate (&ptr, &inst.operands[i].imm) == SUCCESS)
+          /* Case 2: VMOV<c><q>.<dt> <Qd>, #<float-imm>
+             Case 3: VMOV<c><q>.<dt> <Dd>, #<float-imm>
+             Case 10: VMOV.F32 <Sd>, #<imm>
+             Case 11: VMOV.F64 <Dd>, #<imm>  */
+        inst.operands[i].immisfloat = 1;
       else if (parse_big_immediate (&ptr, i) == SUCCESS)
           /* Case 2: VMOV<c><q>.<dt> <Qd>, #<imm>
              Case 3: VMOV<c><q>.<dt> <Dd>, #<imm>  */
@@ -5337,7 +5337,7 @@ parse_neon_mov (char **str, int *which_o
           inst.operands[i].isvec = 1;
           inst.operands[i].issingle = 1;
           inst.operands[i].vectype = optype;
-          inst.operands[i++].present = 1;
+          inst.operands[i].present = 1;
         }
     }
   else