Merged revisions 1323 via svnmerge from

/trunk

git-svn-id: branches/fixes_2_0@1324 -

compiler/i386/csopt386.pas

@@ -72,7 +72,7 @@ var
   p, hp: taicpu;
   tmpRef: treference;
   r,regCounter: tsuperregister;
-  opCount: byte;
+  opCount: longint;
   dummy: boolean;
 begin
   modifiesConflictingMemLocation := false;
@@ -1097,7 +1097,7 @@ end;
 
 function doReplaceReadReg(p: taicpu; newReg,orgReg: tsuperregister): boolean;
 var
-  opCount: byte;
+  opCount: longint;
 begin
   doReplaceReadReg := false;
   { handle special case }

compiler/i386/daopt386.pas

@@ -809,7 +809,7 @@ function regInInstruction(supreg: tsuperregister; p1: tai): boolean;
 { this one ignores CH_ALL opcodes, while regModifiedByInstruction doesn't  }
 var
   p: taicpu;
-  opcount: Word;
+  opcount: longint;
 begin
   regInInstruction := false;
   if p1.typ <> ait_instruction then