* Removed/ifdefed/commented unused local variables.

git-svn-id: trunk@11430 -

compiler/aopt.pas

@@ -109,7 +109,7 @@ Unit aopt;
     Procedure TAsmOptimizer.BuildLabelTableAndFixRegAlloc;
     { Builds a table with the locations of the labels in the TAsmList.       }
     { Also fixes some RegDeallocs like "# %eax released; push (%eax)"           }
-    Var p, hp1, hp2: tai;
+    Var p{, hp1, hp2}: tai;
         UsedRegs: TRegSet;
         LabelIdx : longint;
     Begin

compiler/aoptda.pas

@@ -62,11 +62,13 @@ Unit aoptda;
     { Analyzes the Data Flow of an assembler list. Analyses the reg contents     }
     { for the instructions between blockstart and blockend. Returns the last pai }
     { which has been processed                                                   }
+    {
     Var
         CurProp: TPaiProp;
         UsedRegs: TUsedRegs;
         p, hp, NewBlockStart : tai;
         TmpReg: TRegister;
+    }
     Begin
     {!!!!!!!!!!
       p := BlockStart;

compiler/aoptobj.pas

@@ -377,11 +377,13 @@ Unit AoptObj;
         End;
 
       Function TPaiProp.RegInSequence(Reg, which: TRegister): Boolean;
+      {
       Var p: Tai;
           RegsChecked: TRegSet;
           content: TContent;
           Counter: Byte;
           TmpResult: Boolean;
+      }
       Begin
       {!!!!!!!!!!1
         RegsChecked := [];
@@ -429,8 +431,10 @@ Unit AoptObj;
                   TInstrSinceLastMod);
       { Destroys the contents of the register Reg in the PPaiProp p1, as well as }
       { the contents of registers are loaded with a memory location based on Reg }
+      {
       Var TmpWState, TmpRState: Byte;
           Counter: TRegister;
+      }
       Begin
       {!!!!!!!
         Reg := RegMaxSize(Reg);
@@ -469,8 +473,10 @@ Unit AoptObj;
       { destroys all registers which possibly contain a reference to Ref, WhichReg }
       { is the register whose contents are being written to memory (if this proc   }
       { is called because of a "mov?? %reg, (mem)" instruction)                    }
+      {
       Var RefsEq: TRefCompare;
           Counter: TRegister;
+      }
       Begin
       {!!!!!!!!!!!
         WhichReg := RegMaxSize(WhichReg);
@@ -547,7 +553,7 @@ Unit AoptObj;
       End;
 
       Procedure TPaiProp.DestroyAllRegs(var InstrSinceLastMod: TInstrSinceLastMod);
-      Var Counter: TRegister;
+      {Var Counter: TRegister;}
       Begin {initializes/desrtoys all registers}
       {!!!!!!!!!
         For Counter := LoGPReg To HiGPReg Do

compiler/arm/aasmcpu.pas

@@ -1279,7 +1279,7 @@ implementation
        * required to have unspecified size in the instruction too...)
       }
       var
-        i,j,asize,oprs : longint;
+        i,{j,}asize{,oprs} : longint;
         siz : array[0..3] of longint;
       begin
         Matches:=100;

compiler/arm/narmcon.pas

@@ -57,7 +57,6 @@ interface
         floattype2ait:array[tfloattype] of taitype=
           (ait_real_32bit,ait_real_64bit,ait_real_80bit,ait_comp_64bit,ait_comp_64bit,ait_real_128bit);
       var
-         hp1 : tai;
          lastlabel : tasmlabel;
          realait : taitype;
          hiloswapped : boolean;

compiler/arm/raarmgas.pas

@@ -262,9 +262,7 @@ Unit raarmgas;
 
       procedure read_index(require_rbracket : boolean);
         var 
-          i : longint; 
-          w : word; 
-          recname : string; 
+          recname : string;
           o_int,s_int : aint;
         begin
           case actasmtoken of
@@ -651,7 +649,7 @@ Unit raarmgas;
         tempreg : tregister;
         ireg : tsuperregister;
         hl : tasmlabel;
-        ofs : longint;
+        {ofs : longint;}
         registerset : tcpuregisterset;
       Begin
         expr:='';
@@ -928,9 +926,7 @@ Unit raarmgas;
           PF_B,PF_D,PF_E,PF_P,PF_T,PF_H,PF_S);
 
       var
-        len,
-        j,
-        sufidx : longint;
+        j  : longint;
         hs : string;
         maxlen : longint;
         icond : tasmcond;

compiler/cfileutl.pas

@@ -298,7 +298,6 @@ implementation
     function TCachedDirectory.FileExistsCaseAware(const path, fn: TCmdStr; out FoundName: TCmdStr):boolean;
       var
         entry : PCachedDirectoryEntry;
-        Attr  : Longint;
       begin
         if (tf_files_case_aware in source_info.flags) then
           begin

compiler/nadd.pas

@@ -2356,8 +2356,6 @@ implementation
          hp      : tnode;
 {$endif addstringopt}
          rd,ld   : tdef;
-         newstatement : tstatementnode;
-         temp    : ttempcreatenode;
          i       : longint;
          lt,rt   : tnodetype;
       begin

compiler/ncgcal.pas

@@ -510,7 +510,9 @@ implementation
         tmpcgsize,
         cgsize    : tcgsize;
         retloc    : tlocation;
+{$ifdef cpu64bitaddr}
         ref       : treference;
+{$endif cpu64bitaddr}
 {$ifndef x86}
         hregister : tregister;
 {$endif not x86}
@@ -873,7 +875,9 @@ implementation
 {$ifdef vtentry}
         sym : tasmsymbol;
 {$endif vtentry}
+{$ifdef x86_64}
         cgpara : tcgpara;
+{$endif x86_64}
       begin
          if not assigned(procdefinition) or
             not procdefinition.has_paraloc_info then

compiler/ncgcon.pas

@@ -548,7 +548,7 @@ implementation
         var
            hp1         : tai;
            lastlabel   : tasmlabel;
-           i, diff     : longint;
+           i           : longint;
            neededtyp   : taiconst_type;
         begin
           location_reset(location,LOC_CREFERENCE,OS_NO);

compiler/ogcoff.pas

@@ -2036,7 +2036,6 @@ const pemagic : array[0..3] of byte = (
       var
         objsec : TObjSection;
         i      : longint;
-        b      : boolean;
       begin
         with texesection(p) do
           begin

compiler/options.pas

@@ -2080,7 +2080,9 @@ function check_configfile(const fn:string;var foundfn:string):boolean;
   end;
 
 var
+{$ifdef Unix}
   hs,
+{$endif Unix}
   configpath : string;
 begin
   foundfn:=fn;

compiler/pmodules.pas

@@ -249,7 +249,6 @@ implementation
     Procedure InsertResourceInfo(ResourcesUsed : boolean);
 
     var
-      I            : Integer;
       ResourceInfo : TAsmList;
 
     begin
@@ -1280,7 +1279,6 @@ implementation
 
     procedure insert_export(sym : TObject;arg:pointer);
       var
-        hp : texported_item;
         i : longint;
         item : TCmdStrListItem;
       begin

compiler/ppu.pas

@@ -466,7 +466,7 @@ end;
 
 procedure tppufile.readdata(var b;len:integer);
 var
-  p,pmax,pbuf : pchar;
+  p,pbuf : pchar;
   left : integer;
 begin
   p:=pchar(@b);

compiler/pstatmnt.pas

@@ -1157,7 +1157,9 @@ implementation
     function assembler_block : tnode;
       var
         p : tnode;
+{$ifndef arm}
         locals : longint;
+{$endif arm}
         srsym : tsym;
       begin
          { Rename the funcret so that recursive calls are possible }

compiler/scanner.pas

@@ -472,7 +472,6 @@ implementation
     function isdef(var valuedescr: String): Boolean;
       var
         hs    : string;
-        mac   : tmacro;
       begin
         current_scanner.skipspace;
         hs:=current_scanner.readid;
@@ -490,7 +489,6 @@ implementation
     function isnotdef(var valuedescr: String): Boolean;
       var
         hs    : string;
-        mac   : tmacro;
       begin
         current_scanner.skipspace;
         hs:=current_scanner.readid;

compiler/symdef.pas

@@ -2884,7 +2884,6 @@ implementation
     constructor tprocdef.ppuload(ppufile:tcompilerppufile);
       var
         i,aliasnamescount : longint;
-        item : TCmdStrListItem;
         level : byte;
       begin
          inherited ppuload(procdef,ppufile);
@@ -3908,8 +3907,6 @@ implementation
 
 
     procedure tobjectdef.buildderefimpl;
-      var
-         i : longint;
       begin
          inherited buildderefimpl;
          if not (df_copied_def in defoptions) then