* shortened the names of the is_x86_string_instruction_op,

  is_x86_parameterless_string_instruction_op and
  is_x86_parameterized_string_instruction_op by removing 'instruction' from
  their names

git-svn-id: trunk@37451 -

compiler/aasmtai.pas

@@ -2617,7 +2617,7 @@ implementation
 {$ifdef x86}
             { We allow this exception for x86, since overloading this would be
               too much of a a speed penalty}
-            if is_x86_parameterized_string_instruction_op(opcode) then
+            if is_x86_parameterized_string_op(opcode) then
               begin
                 if ((ref^.base=NR_NO) or (getsupreg(ref^.base)<>RS_EDI)) and
                    ((ref^.index=NR_NO) or (getsupreg(ref^.index)<>RS_EDI)) and
@@ -2698,7 +2698,7 @@ implementation
                   new(ref);
                   ref^:=o.ref^;
 {$ifdef x86}
-                  if is_x86_parameterized_string_instruction_op(opcode) then
+                  if is_x86_parameterized_string_op(opcode) then
                     begin
                       if ((ref^.base=NR_NO) or (getsupreg(ref^.base)<>RS_EDI)) and
                          ((ref^.index=NR_NO) or (getsupreg(ref^.index)<>RS_EDI)) and

compiler/x86/agx86nsm.pas

@@ -986,7 +986,7 @@ interface
                     end;
                if fixed_opcode=A_FWAIT then
                 writer.AsmWriteln(#9#9'DB'#9'09bh')
-               else if is_x86_parameterized_string_instruction_op(fixed_opcode) then
+               else if is_x86_parameterized_string_op(fixed_opcode) then
                 begin
                   writer.AsmWrite(#9#9);
                   i:=get_x86_string_op_si_param(fixed_opcode);

compiler/x86/cpubase.pas

@@ -316,13 +316,13 @@ uses
     function segment_regs_equal(r1,r2:tregister):boolean;
 
     { checks whether the specified op is an x86 string instruction (e.g. cmpsb, movsd, scasw, etc.) }
-    function is_x86_string_instruction_op(op: TAsmOp): boolean;
+    function is_x86_string_op(op: TAsmOp): boolean;
     { checks whether the specified op is an x86 parameterless string instruction
       (e.g. returns true for movsb, cmpsw, etc, but returns false for movs, cmps, etc.) }
-    function is_x86_parameterless_string_instruction_op(op: TAsmOp): boolean;
+    function is_x86_parameterless_string_op(op: TAsmOp): boolean;
     { checks whether the specified op is an x86 parameterized string instruction
       (e.g. returns true for movs, cmps, etc, but returns false for movsb, cmpsb, etc.) }
-    function is_x86_parameterized_string_instruction_op(op: TAsmOp): boolean;
+    function is_x86_parameterized_string_op(op: TAsmOp): boolean;
     function x86_param2paramless_string_op(op: TAsmOp): TAsmOp;
     function get_x86_string_op_size(op: TAsmOp): TOpSize;
     { returns the 0-based operand number (intel syntax) of the ds:[si] param of
@@ -656,7 +656,7 @@ implementation
       end;
 
 
-    function is_x86_string_instruction_op(op: TAsmOp): boolean;
+    function is_x86_string_op(op: TAsmOp): boolean;
       begin
         case op of
 {$ifdef x86_64}
@@ -681,7 +681,7 @@ implementation
       end;
 
 
-    function is_x86_parameterless_string_instruction_op(op: TAsmOp): boolean;
+    function is_x86_parameterless_string_op(op: TAsmOp): boolean;
       begin
         case op of
 {$ifdef x86_64}
@@ -705,7 +705,7 @@ implementation
       end;
 
 
-    function is_x86_parameterized_string_instruction_op(op: TAsmOp): boolean;
+    function is_x86_parameterized_string_op(op: TAsmOp): boolean;
       begin
         case op of
           A_MOVS,A_CMPS,A_SCAS,A_LODS,A_STOS,A_INS,A_OUTS:

compiler/x86/rax86att.pas

@@ -876,7 +876,7 @@ Implementation
         instr.Ops:=operandnum;
         { handle string instructions with parameters }
         with instr do
-          if is_x86_parameterless_string_instruction_op(opcode) and
+          if is_x86_parameterless_string_op(opcode) and
              (Ops>=1) and (Ops<=2) then
             begin
               if opcode=A_MOVSD then