* changed the x86 TInsProp.Ch structure from a 3-element array to a pascal set;

this removes the limit of 3 Ch_XXX flags per instruction (thus allowing adding
  more precise flags, e.g. for tracking only certain bits of the flags register,
  etc.) and avoids the ugliness of having the Ch_None filler, which makes
  x86ins.dat less readable.

git-svn-id: trunk@35850 -

compiler/i386/aoptcpu.pas

@@ -181,34 +181,74 @@ unit aoptcpu;
                   RegReadByInstruction := true;
                   exit
                 end;
-            for opcount := 1 to maxinschanges do
+            with insprop[p.opcode] do
-              case insprop[p.opcode].ch[opcount] of
+              begin
-                CH_REAX..CH_REDI,CH_RWEAX..CH_MEDI:
+                case getsupreg(reg) of
-                  if getsupreg(reg) = tch2reg(insprop[p.opcode].ch[opcount]) then
+                  RS_EAX:
+                    if [Ch_REAX,Ch_RWEAX,Ch_MEAX]*Ch<>[] then
                       begin
                         RegReadByInstruction := true;
                         exit
                       end;
-                CH_RWOP1,CH_ROP1,CH_MOP1:
+                  RS_ECX:
-                  if reginop(reg,p.oper[0]^) then
+                    if [Ch_RECX,Ch_RWECX,Ch_MECX]*Ch<>[] then
                       begin
                         RegReadByInstruction := true;
                         exit
                       end;
-                Ch_RWOP2,Ch_ROP2,Ch_MOP2:
+                  RS_EDX:
-                  if reginop(reg,p.oper[1]^) then
+                    if [Ch_REDX,Ch_RWEDX,Ch_MEDX]*Ch<>[] then
                       begin
                         RegReadByInstruction := true;
                         exit
                       end;
-                Ch_RWOP3,Ch_ROP3,Ch_MOP3:
+                  RS_EBX:
-                  if reginop(reg,p.oper[2]^) then
+                    if [Ch_REBX,Ch_RWEBX,Ch_MEBX]*Ch<>[] then
                       begin
                         RegReadByInstruction := true;
                         exit
                       end;
-                Ch_RFlags,Ch_RWFlags:
+                  RS_ESP:
-                  if reg=NR_DEFAULTFLAGS then
+                    if [Ch_RESP,Ch_RWESP,Ch_MESP]*Ch<>[] then
+                      begin
+                        RegReadByInstruction := true;
+                        exit
+                      end;
+                  RS_EBP:
+                    if [Ch_REBP,Ch_RWEBP,Ch_MEBP]*Ch<>[] then
+                      begin
+                        RegReadByInstruction := true;
+                        exit
+                      end;
+                  RS_ESI:
+                    if [Ch_RESI,Ch_RWESI,Ch_MESI]*Ch<>[] then
+                      begin
+                        RegReadByInstruction := true;
+                        exit
+                      end;
+                  RS_EDI:
+                    if [Ch_REDI,Ch_RWEDI,Ch_MEDI]*Ch<>[] then
+                      begin
+                        RegReadByInstruction := true;
+                        exit
+                      end;
+                end;
+                if ([CH_RWOP1,CH_ROP1,CH_MOP1]*Ch<>[]) and reginop(reg,p.oper[0]^) then
+                  begin
+                    RegReadByInstruction := true;
+                    exit
+                  end;
+                if ([Ch_RWOP2,Ch_ROP2,Ch_MOP2]*Ch<>[]) and reginop(reg,p.oper[1]^) then
+                  begin
+                    RegReadByInstruction := true;
+                    exit
+                  end;
+                if ([Ch_RWOP3,Ch_ROP3,Ch_MOP3]*Ch<>[]) and reginop(reg,p.oper[2]^) then
+                  begin
+                    RegReadByInstruction := true;
+                    exit
+                  end;
+                if ([Ch_RFlags,Ch_RWFlags]*Ch<>[]) and (reg=NR_DEFAULTFLAGS) then
                   begin
                     RegReadByInstruction := true;
                     exit
@@ -240,11 +280,8 @@ function InstrReadsFlags(p: tai): boolean;
     InstrReadsFlags := true;
     case p.typ of
       ait_instruction:
-        begin
+        if InsProp[taicpu(p).opcode].Ch*[Ch_RFlags,Ch_RWFlags,Ch_All]<>[] then
-          for l := 1 to maxinschanges do
-            if InsProp[taicpu(p).opcode].Ch[l] in [Ch_RFlags,Ch_RWFlags,Ch_All] then
           exit;
-        end;
       ait_label:
         exit;
     end;

compiler/utils/mkx86ins.pp

@@ -348,6 +348,8 @@ begin
            repeat
              readln(infile,inschanges);
            until eof(infile) or ((inschanges<>'') and (inschanges[1]<>';'));
+           inschanges[1]:='[';
+           inschanges[length(inschanges)]:=']';
            continue;
          end;
         { we must have an opcode }

compiler/x86/aasmcpu.pas

@@ -196,7 +196,6 @@ interface
       instabentries = {$i i8086nop.inc}
 {$endif}
       maxinfolen    = 8;
-      MaxInsChanges = 3; { Max things a instruction can change }
 
     type
       { What an instruction can change. Needed for optimizer and spilling code.
@@ -228,7 +227,7 @@ interface
       );
 
       TInsProp = packed record
-        Ch : Array[1..MaxInsChanges] of TInsChange;
+        Ch : set of TInsChange;
       end;
 
       TMemRefSizeInfo = (msiUnkown, msiUnsupported, msiNoSize,
@@ -3474,35 +3473,28 @@ implementation
         new(operation_type_table);
         fillchar(operation_type_table^,sizeof(toperation_type_table),byte(operand_read));
         for opcode:=low(tasmop) to high(tasmop) do
+          with InsProp[opcode] do
             begin
-            for i:=1 to MaxInsChanges do
+              if Ch_Rop1 in Ch then
-              begin
-                case InsProp[opcode].Ch[i] of
-                  Ch_Rop1 :
                 operation_type_table^[opcode,0]:=operand_read;
-                  Ch_Wop1 :
+              if Ch_Wop1 in Ch then
                 operation_type_table^[opcode,0]:=operand_write;
-                  Ch_RWop1,
+              if [Ch_RWop1,Ch_Mop1]*Ch<>[] then
-                  Ch_Mop1 :
                 operation_type_table^[opcode,0]:=operand_readwrite;
-                  Ch_Rop2 :
+              if Ch_Rop2 in Ch then
                 operation_type_table^[opcode,1]:=operand_read;
-                  Ch_Wop2 :
+              if Ch_Wop2 in Ch then
                 operation_type_table^[opcode,1]:=operand_write;
-                  Ch_RWop2,
+              if [Ch_RWop2,Ch_Mop2]*Ch<>[] then
-                  Ch_Mop2 :
                 operation_type_table^[opcode,1]:=operand_readwrite;
-                  Ch_Rop3 :
+              if Ch_Rop3 in Ch then
                 operation_type_table^[opcode,2]:=operand_read;
-                  Ch_Wop3 :
+              if Ch_Wop3 in Ch then
                 operation_type_table^[opcode,2]:=operand_write;
-                  Ch_RWop3,
+              if [Ch_RWop3,Ch_Mop3]*Ch<>[] then
-                  Ch_Mop3 :
                 operation_type_table^[opcode,2]:=operand_readwrite;
             end;
       end;
-          end;
-      end;
 
 
     function taicpu.spilling_get_operation_type(opnr: longint): topertype;