From b1dff29cbf23d7fdf39a6ab4af21121a8c1c847c Mon Sep 17 00:00:00 2001 From: florian Date: Tue, 9 May 2017 19:53:14 +0000 Subject: [PATCH] * removed unused units git-svn-id: trunk@36165 - --- compiler/aopt.pas | 2 +- compiler/aoptbase.pas | 2 +- compiler/aoptda.pas | 4 ++-- compiler/aoptobj.pas | 1 - compiler/assemble.pas | 4 +--- compiler/blockutl.pas | 4 ++-- compiler/cgobj.pas | 2 +- compiler/compiler.pas | 5 ++++- compiler/cresstr.pas | 2 +- compiler/dbgbase.pas | 2 +- compiler/export.pas | 2 +- compiler/expunix.pas | 13 ++++++------- compiler/fmodule.pas | 4 ++-- compiler/fpcp.pas | 3 ++- compiler/globals.pas | 5 +++-- compiler/hlcg2ll.pas | 10 +++++----- compiler/hlcgobj.pas | 6 +++--- compiler/htypechk.pas | 2 +- compiler/i386/aoptcpu.pas | 4 +--- compiler/import.pas | 5 +---- compiler/link.pas | 2 +- compiler/nadd.pas | 2 +- compiler/nbas.pas | 7 +++---- compiler/ncgadd.pas | 10 +++++----- compiler/ncgbas.pas | 6 +++--- compiler/ncgcal.pas | 8 +++----- compiler/ncgcnv.pas | 7 +++---- compiler/ncgcon.pas | 8 ++++---- compiler/ncgflw.pas | 6 +++--- compiler/ncginl.pas | 14 +++++++------- compiler/ncgld.pas | 4 ++-- compiler/ncgmat.pas | 8 ++------ compiler/ncgmem.pas | 12 +++++------- compiler/ncgobjc.pas | 2 +- compiler/ncgopt.pas | 8 ++++---- compiler/ncgrtti.pas | 3 +-- compiler/ncgset.pas | 6 ++---- compiler/ncgutil.pas | 14 ++++++-------- compiler/ncgvmt.pas | 5 ++--- compiler/ncon.pas | 5 ++--- compiler/nflw.pas | 2 +- compiler/ngenutil.pas | 6 +++--- compiler/ngtcon.pas | 8 ++++---- compiler/ninl.pas | 6 +++--- compiler/nld.pas | 4 ++-- compiler/nmat.pas | 2 +- compiler/nmem.pas | 4 ++-- compiler/nobj.pas | 10 +++------- compiler/nobjc.pas | 10 +++------- compiler/nset.pas | 6 ++---- compiler/nutils.pas | 2 +- compiler/objcdef.pas | 3 +-- compiler/objcutil.pas | 6 +++--- compiler/ogbase.pas | 2 +- compiler/ogcoff.pas | 5 +++-- compiler/ogelf.pas | 2 +- compiler/ogmap.pas | 8 +++----- compiler/omfbase.pas | 7 +++---- compiler/optconstprop.pas | 1 - compiler/optdead.pas | 1 - compiler/optdeadstore.pas | 3 +-- compiler/optdfa.pas | 5 ++--- compiler/optvirt.pas | 2 -- compiler/owomflib.pas | 1 - compiler/parabase.pas | 4 ++-- compiler/paramgr.pas | 9 +++++---- compiler/parser.pas | 13 ++++++------- compiler/pass_1.pas | 7 ++++--- compiler/pass_2.pas | 12 +++++++----- compiler/pbase.pas | 2 +- compiler/pdecl.pas | 4 ++-- compiler/pdecobj.pas | 10 +++++----- compiler/pdecsub.pas | 2 +- compiler/pdecvar.pas | 9 +++------ compiler/pexpr.pas | 2 +- compiler/pgenutil.pas | 4 +--- compiler/pinline.pas | 12 +++--------- compiler/pkgutil.pas | 1 - compiler/pmodules.pas | 9 ++++----- compiler/ppu.pas | 5 ++--- compiler/procinfo.pas | 10 ++++------ compiler/pstatmnt.pas | 11 ++++------- compiler/psub.pas | 9 ++++----- compiler/psystem.pas | 7 +++---- compiler/ptconst.pas | 4 ++-- compiler/ptype.pas | 6 ++---- compiler/rasm.pas | 3 +-- compiler/rgobj.pas | 8 +++----- compiler/symcreat.pas | 2 +- compiler/symdef.pas | 6 ++---- compiler/symsym.pas | 6 ++---- compiler/symtype.pas | 2 +- compiler/symutil.pas | 5 ++--- compiler/syscinfo.pas | 2 +- compiler/systems/i_bsd.pas | 2 +- compiler/systems/i_linux.pas | 2 +- compiler/systems/t_aros.pas | 2 +- compiler/systems/t_linux.pas | 6 +++--- compiler/systems/t_sunos.pas | 5 ++--- compiler/systems/t_win.pas | 4 ++-- compiler/tgobj.pas | 11 ++++------- compiler/wpoinfo.pas | 3 +-- compiler/x86/aasmcpu.pas | 5 +---- compiler/x86/agx86att.pas | 6 +++--- compiler/x86/agx86int.pas | 2 +- compiler/x86/cga.pas | 7 +++---- compiler/x86/cgx86.pas | 8 ++++---- compiler/x86/cpubase.pas | 4 ++-- compiler/x86/itcpugas.pas | 2 +- compiler/x86/nx86add.pas | 6 +++--- compiler/x86/nx86cnv.pas | 13 +++++++------ compiler/x86/nx86inl.pas | 9 ++++----- compiler/x86/nx86mat.pas | 8 ++++---- compiler/x86/nx86mem.pas | 8 ++++---- compiler/x86/rax86.pas | 4 ++-- compiler/x86/rax86att.pas | 4 ++-- compiler/x86/rax86int.pas | 16 +++++++++++----- compiler/x86/rgx86.pas | 6 ++---- compiler/x86_64/aoptcpu.pas | 11 +++-------- compiler/x86_64/cgcpu.pas | 8 ++++---- compiler/x86_64/cpupara.pas | 1 - compiler/x86_64/cputarg.pas | 4 +++- compiler/x86_64/nx64add.pas | 4 ++-- compiler/x86_64/nx64cal.pas | 4 ++-- compiler/x86_64/nx64cnv.pas | 11 +++++------ compiler/x86_64/nx64flw.pas | 10 +++++----- compiler/x86_64/nx64mat.pas | 13 +++++-------- compiler/x86_64/nx64set.pas | 14 ++++++-------- compiler/x86_64/rax64int.pas | 2 +- 129 files changed, 326 insertions(+), 410 deletions(-) diff --git a/compiler/aopt.pas b/compiler/aopt.pas index 92e9b2f332..35f74a6ed4 100644 --- a/compiler/aopt.pas +++ b/compiler/aopt.pas @@ -80,7 +80,7 @@ Unit aopt; verbose, cpubase, cgbase, - aoptda,aoptcpu,aoptcpud; + aoptcpu; Constructor TAsmOptimizer.create(_AsmL: TAsmList); Begin diff --git a/compiler/aoptbase.pas b/compiler/aoptbase.pas index 215afe0a46..7ff191d1b9 100644 --- a/compiler/aoptbase.pas +++ b/compiler/aoptbase.pas @@ -112,7 +112,7 @@ unit aoptbase; implementation uses - verbose,globtype,globals,aoptcpub; + verbose,globals,aoptcpub; constructor taoptbase.create; begin diff --git a/compiler/aoptda.pas b/compiler/aoptda.pas index e7e0030ae2..e818471d7c 100644 --- a/compiler/aoptda.pas +++ b/compiler/aoptda.pas @@ -29,7 +29,7 @@ Unit aoptda; uses cpubase,cgbase, - aasmbase,aasmtai,aasmdata,aasmcpu, + aasmtai,aasmdata,aasmcpu, aoptcpub, aoptbase; Type @@ -56,7 +56,7 @@ Unit aoptda; Implementation uses - globals, aoptobj; + globals; Procedure TAOptDFA.DoDFA; { Analyzes the Data Flow of an assembler list. Analyses the reg contents } diff --git a/compiler/aoptobj.pas b/compiler/aoptobj.pas index a393c88ccc..34f55db2f0 100644 --- a/compiler/aoptobj.pas +++ b/compiler/aoptobj.pas @@ -367,7 +367,6 @@ Unit AoptObj; cutils, globals, verbose, - procinfo, aoptutils; diff --git a/compiler/assemble.pas b/compiler/assemble.pas index 83f031fd32..72c35d0237 100644 --- a/compiler/assemble.pas +++ b/compiler/assemble.pas @@ -252,9 +252,7 @@ Implementation {$endif memdebug} script,fmodule,verbose, cpuinfo, - aasmcpu, - owar,owomflib - ; + aasmcpu; var CAssembler : array[tasm] of TAssemblerClass; diff --git a/compiler/blockutl.pas b/compiler/blockutl.pas index 9dbfb7d8e2..f4e2bfb91c 100644 --- a/compiler/blockutl.pas +++ b/compiler/blockutl.pas @@ -48,11 +48,11 @@ interface implementation uses - verbose,globtype,globals,cutils,constexp, + verbose,globtype,cutils,constexp, pass_1,pparautl,fmodule, aasmdata, nbas,ncon,nmem,nutils, - symbase,symconst,symtable,symsym,symcreat,objcutil,objcdef,defutil, + symbase,symconst,symtable,symsym,symcreat,objcutil,defutil, paramgr; diff --git a/compiler/cgobj.pas b/compiler/cgobj.pas index 83e26bf96f..9cf439b43c 100644 --- a/compiler/cgobj.pas +++ b/compiler/cgobj.pas @@ -552,7 +552,7 @@ implementation uses globals,systems, - verbose,paramgr,symtable,symsym, + verbose,paramgr,symsym, tgobj,cutils,procinfo; {***************************************************************************** diff --git a/compiler/compiler.pas b/compiler/compiler.pas index d29b014c55..52ae418b66 100644 --- a/compiler/compiler.pas +++ b/compiler/compiler.pas @@ -24,6 +24,9 @@ unit compiler; {$i fpcdefs.inc} +{ some units are implicitly needed by the compiler } +{$WARN 5023 off : Unit "$1" not used in $2} + interface uses @@ -44,7 +47,7 @@ uses {$ENDIF} verbose,comphook,systems, cutils,cfileutl,cclasses,globals,options,fmodule,parser,symtable, - assemble,link,dbgbase,import,export,tokens,pass_1,wpobase,wpo + assemble,link,dbgbase,import,export,tokens,wpo { cpu parameter handling } ,cpupara { procinfo stuff } diff --git a/compiler/cresstr.pas b/compiler/cresstr.pas index 185bba2662..a0440eab86 100644 --- a/compiler/cresstr.pas +++ b/compiler/cresstr.pas @@ -39,7 +39,7 @@ uses cutils,globtype,globals,systems, symbase,symconst,symtype,symdef,symsym,symtable, verbose,fmodule,ppu, - aasmbase,aasmtai,aasmdata,aasmcnst, + aasmtai,aasmdata,aasmcnst, aasmcpu; Type diff --git a/compiler/dbgbase.pas b/compiler/dbgbase.pas index eaf0786461..18eaf2e35a 100644 --- a/compiler/dbgbase.pas +++ b/compiler/dbgbase.pas @@ -29,7 +29,7 @@ interface cclasses, systems, parabase, - symconst,symbase,symdef,symtype,symsym,symtable, + symconst,symbase,symdef,symtype,symsym, fmodule, aasmtai,aasmdata; diff --git a/compiler/export.pas b/compiler/export.pas index 416fc63c59..12a535c376 100644 --- a/compiler/export.pas +++ b/compiler/export.pas @@ -29,7 +29,7 @@ uses cutils,cclasses, systems, symtype,symdef,symsym, - aasmbase,aasmdata; + aasmdata; type { export options } diff --git a/compiler/expunix.pas b/compiler/expunix.pas index 558c2e7b15..9c179818ae 100644 --- a/compiler/expunix.pas +++ b/compiler/expunix.pas @@ -27,10 +27,10 @@ unit expunix; interface uses - cutils,cclasses, + cclasses, systems, export, - symtype,symdef,symsym, + symdef,symsym, aasmbase; type @@ -55,15 +55,14 @@ implementation uses symconst, - globtype,globals, - aasmdata,aasmtai,aasmcpu, + globals, + aasmdata,aasmtai, fmodule, {$ifdef cpuhighleveltarget} symcreat, {$endif} - cgbase,cgutils,cpubase,cgobj, - cgcpu,hlcgobj,hlcgcpu, - ncgutil, + cgbase, + hlcgobj,hlcgcpu, verbose; diff --git a/compiler/fmodule.pas b/compiler/fmodule.pas index 9546af6541..c2dce8b017 100644 --- a/compiler/fmodule.pas +++ b/compiler/fmodule.pas @@ -44,9 +44,9 @@ interface uses cutils,cclasses,cfileutl, globtype,finput,ogbase,fpkg, - symbase,symconst,symsym, + symbase,symsym, wpobase, - aasmbase,aasmtai,aasmdata; + aasmbase,aasmdata; const diff --git a/compiler/fpcp.pas b/compiler/fpcp.pas index 1ab9314c5e..3ad2e75d32 100644 --- a/compiler/fpcp.pas +++ b/compiler/fpcp.pas @@ -67,7 +67,8 @@ implementation cfileutl,cutils, systems,globals,version, verbose, - entfile,fppu,ppu,pkgutil; + ppu, + entfile,pkgutil; { tpcppackage } diff --git a/compiler/globals.pas b/compiler/globals.pas index 726f82fa79..ee45dae59f 100644 --- a/compiler/globals.pas +++ b/compiler/globals.pas @@ -579,9 +579,10 @@ implementation macutils, {$endif} {$ifdef mswindows} - windirs, + windirs; +{$else} + ; {$endif} - comphook; {**************************************************************************** TLinkStrMap diff --git a/compiler/hlcg2ll.pas b/compiler/hlcg2ll.pas index f0453ab7f4..9b3b025211 100644 --- a/compiler/hlcg2ll.pas +++ b/compiler/hlcg2ll.pas @@ -34,10 +34,10 @@ unit hlcg2ll; interface uses - cclasses,globtype,constexp, + globtype,constexp, cpubase,cgbase,cgutils,parabase, aasmbase,aasmtai,aasmdata,aasmcpu, - symconst,symtype,symdef,rgobj, + symconst,symtype,symdef, node,hlcgobj ; @@ -329,9 +329,9 @@ unit hlcg2ll; implementation uses - globals,options,systems, - verbose,defutil,paramgr,symsym, - cgobj,tgobj,cutils,procinfo, + globals,systems, + verbose,defutil, + cgobj,tgobj,cutils, ncgutil; { thlcg2ll } diff --git a/compiler/hlcgobj.pas b/compiler/hlcgobj.pas index 6e7e0baf26..f520860417 100644 --- a/compiler/hlcgobj.pas +++ b/compiler/hlcgobj.pas @@ -675,15 +675,15 @@ implementation uses globals,systems, - fmodule,export, + fmodule, verbose,defutil,paramgr, symtable, nbas,ncon,nld,ncgrtti,pass_2, - cpuinfo,cgobj,cutils,procinfo, + cgobj,cutils,procinfo, {$ifdef x86} cgx86, {$endif x86} - ncgutil,ngenutil; + ncgutil; procedure destroy_hlcodegen; diff --git a/compiler/htypechk.pas b/compiler/htypechk.pas index cd2b78f88e..25473d5223 100644 --- a/compiler/htypechk.pas +++ b/compiler/htypechk.pas @@ -26,7 +26,7 @@ unit htypechk; interface uses - cclasses,cmsgs,tokens,cpuinfo, + cclasses,cmsgs,tokens, node,globtype, symconst,symtype,symdef,symsym,symbase, pgentype; diff --git a/compiler/i386/aoptcpu.pas b/compiler/i386/aoptcpu.pas index e5df97eb13..6df2abaedf 100644 --- a/compiler/i386/aoptcpu.pas +++ b/compiler/i386/aoptcpu.pas @@ -30,7 +30,7 @@ unit aoptcpu; uses cgbase, - cpubase, aoptobj, aoptcpub, aopt, aoptx86, + cpubase, aopt, aoptx86, Aasmbase,aasmtai,aasmdata; Type @@ -52,8 +52,6 @@ unit aoptcpu; uses verbose,globtype,globals, - cutils, - aoptbase, cpuinfo, aasmcpu, aoptutils, diff --git a/compiler/import.pas b/compiler/import.pas index c8bc844c50..e99acb8ae1 100644 --- a/compiler/import.pas +++ b/compiler/import.pas @@ -25,10 +25,7 @@ unit import; interface uses - cutils,cclasses, - systems, - aasmbase, - symdef,symsym; + systems; type timportlib=class diff --git a/compiler/link.pas b/compiler/link.pas index 13b2f6604b..57c26932eb 100644 --- a/compiler/link.pas +++ b/compiler/link.pas @@ -161,7 +161,7 @@ Implementation baseunix, {$endif hasUnix} script,globals,verbose,comphook,ppu,fpccrc, - aasmbase,aasmtai,aasmdata,aasmcpu, + aasmbase,aasmcpu, ogmap; var diff --git a/compiler/nadd.pas b/compiler/nadd.pas index 5e52dd421d..223b44e81f 100644 --- a/compiler/nadd.pas +++ b/compiler/nadd.pas @@ -127,7 +127,7 @@ implementation {$ifdef state_tracking} nstate, {$endif} - cpuinfo,procinfo; + cpuinfo; {***************************************************************************** diff --git a/compiler/nbas.pas b/compiler/nbas.pas index 39f84c03f8..c1dd1bc72b 100644 --- a/compiler/nbas.pas +++ b/compiler/nbas.pas @@ -27,8 +27,8 @@ interface uses globtype, - cpuinfo,cpubase,cgbase,cgutils, - aasmbase,aasmtai,aasmdata,aasmcpu, + cgbase,cgutils, + aasmtai,aasmdata,aasmcpu, node, symtype; @@ -302,11 +302,10 @@ interface implementation uses - cutils, verbose,globals,systems, symconst,symdef,defutil,defcmp, pass_1, - nutils,nld,ncal,nflw, + nutils,nld, procinfo ; diff --git a/compiler/ncgadd.pas b/compiler/ncgadd.pas index 3cde9f640b..f006e87fec 100644 --- a/compiler/ncgadd.pas +++ b/compiler/ncgadd.pas @@ -72,11 +72,11 @@ interface uses globtype,systems, - cutils,verbose,globals, - symconst,symdef,paramgr, - aasmbase,aasmtai,aasmdata,defutil, - procinfo,pass_2,tgobj, - nutils,ncon,nset,ncgutil,cgobj,cgutils, + verbose,globals, + symconst,symdef, + aasmbase,aasmdata,defutil, + pass_2,tgobj, + nutils,nset,ncgutil,cgobj,cgutils, hlcgobj ; diff --git a/compiler/ncgbas.pas b/compiler/ncgbas.pas index 541848e853..ce602e5558 100644 --- a/compiler/ncgbas.pas +++ b/compiler/ncgbas.pas @@ -71,11 +71,11 @@ interface implementation uses - globals,systems, + globals, cutils,verbose, aasmbase,aasmcpu, - symsym,symconst,symdef,defutil, - nflw,pass_2,ncgutil, + symsym,symconst,defutil, + pass_2,ncgutil, cgbase,cgobj,hlcgobj, procinfo, cpuinfo, diff --git a/compiler/ncgcal.pas b/compiler/ncgcal.pas index b670fbd5a1..52eb692d32 100644 --- a/compiler/ncgcal.pas +++ b/compiler/ncgcal.pas @@ -128,12 +128,10 @@ implementation uses systems, - cutils,verbose,globals, - cpuinfo, - symconst,symbase,symtable,symtype,symsym,defutil,paramgr, + verbose,globals, + symconst,symtable,symtype,symsym,defutil,paramgr, pass_2, - aasmbase,aasmtai, - nbas,nmem,nld,ncnv,nutils, + nld,ncnv, ncgutil,blockutl, cgobj,tgobj,hlcgobj, procinfo, diff --git a/compiler/ncgcnv.pas b/compiler/ncgcnv.pas index 7df651a5ed..1688a4214e 100644 --- a/compiler/ncgcnv.pas +++ b/compiler/ncgcnv.pas @@ -71,14 +71,13 @@ interface uses cutils,verbose,globtype,globals, - aasmbase,aasmtai,aasmdata,aasmcpu,symconst,symdef,symtable,paramgr, - nutils,ncon,ncal, + aasmbase,aasmdata,symconst,symdef,symtable, + nutils,ncon, cpubase,systems, - procinfo,pass_2, + pass_2, cgbase, cgutils,cgobj,hlcgobj, fmodule, - ncgutil, tgobj ; diff --git a/compiler/ncgcon.pas b/compiler/ncgcon.pas index ad48f1f445..9a85f664c4 100644 --- a/compiler/ncgcon.pas +++ b/compiler/ncgcon.pas @@ -29,7 +29,7 @@ interface uses aasmbase, symtype, - node,ncon; + ncon; type tcgrealconstnode = class(trealconstnode) @@ -73,10 +73,10 @@ implementation globtype,widestr,systems, verbose,globals,cutils, aasmcnst, - symconst,symdef,aasmtai,aasmdata,aasmcpu,defutil, + symconst,symdef,aasmtai,aasmdata,defutil, cpuinfo,cpubase, - cgbase,cgobj,cgutils, - ncgutil,hlcgobj,cclasses,tgobj + cgbase,cgutils, + hlcgobj,cclasses ; diff --git a/compiler/ncgflw.pas b/compiler/ncgflw.pas index 52b9ca3c17..b467677fd5 100644 --- a/compiler/ncgflw.pas +++ b/compiler/ncgflw.pas @@ -28,7 +28,7 @@ interface uses globtype, - aasmbase,aasmdata,node,nflw, + aasmbase,aasmdata,nflw, pass_2,cgutils,ncgutil; type @@ -125,11 +125,11 @@ implementation uses cutils, - verbose,globals,systems,constexp, + verbose,globals,systems, symconst,symdef,symsym,symtable,symtype,aasmtai,aasmcpu,defutil, procinfo,cgbase,parabase, fmodule, - cpubase,ncon, + cpubase, tgobj,paramgr, cgobj,hlcgobj,nutils ; diff --git a/compiler/ncginl.pas b/compiler/ncginl.pas index 55a889e7ea..b09e04238c 100644 --- a/compiler/ncginl.pas +++ b/compiler/ncginl.pas @@ -69,13 +69,13 @@ interface implementation uses - globtype,systems,constexp, - cutils,verbose,globals, - symconst,symtype,symdef,defutil,symsym, - aasmbase,aasmtai,aasmdata,aasmcpu,parabase, - cgbase,pass_1,pass_2, - cpuinfo,cpubase,paramgr,procinfo, - nbas,ncon,ncal,ncnv,nld,ncgrtti, + globtype,constexp, + verbose,globals, + symconst,symtype,symdef,defutil, + aasmbase,aasmdata, + cgbase,pass_2, + cpubase,procinfo, + ncon,ncal, tgobj,ncgutil, cgutils,cgobj,hlcgobj {$ifndef cpu64bitalu} diff --git a/compiler/ncgld.pas b/compiler/ncgld.pas index 0980a1ee04..eccef2b9ca 100644 --- a/compiler/ncgld.pas +++ b/compiler/ncgld.pas @@ -75,8 +75,8 @@ implementation aasmbase, cgbase,pass_2, procinfo, - cpubase,parabase,cpuinfo, - tgobj,ncgutil, + cpubase,parabase, + tgobj, cgobj,hlcgobj, ncgbas,ncgflw, wpobase; diff --git a/compiler/ncgmat.pas b/compiler/ncgmat.pas index 4cfeaa9c5e..d52f09e709 100644 --- a/compiler/ncgmat.pas +++ b/compiler/ncgmat.pas @@ -130,15 +130,11 @@ implementation uses globtype,systems, cutils,verbose,globals, - symtable,symconst,symdef,aasmbase,aasmtai,aasmdata,aasmcpu,defutil, + symtable,symconst,symdef,aasmbase,aasmdata,aasmcpu,defutil, parabase, pass_2, ncon, - tgobj,ncgutil,cgobj,cgutils,paramgr,hlcgobj,procinfo -{$ifndef cpu64bitalu} - ,cg64f32 -{$endif not cpu64bitalu} - ; + tgobj,cgobj,cgutils,paramgr,hlcgobj; {***************************************************************************** TCGUNARYMINUSNODE diff --git a/compiler/ncgmem.pas b/compiler/ncgmem.pas index 40f7e9bc67..58a60bbe21 100644 --- a/compiler/ncgmem.pas +++ b/compiler/ncgmem.pas @@ -27,7 +27,7 @@ unit ncgmem; interface uses - globtype,cgbase,cgutils,cpuinfo,cpubase, + globtype,cgbase,cgutils,cpubase, symtype, node,nmem; @@ -87,14 +87,12 @@ implementation uses systems, cutils,cclasses,verbose,globals,constexp,fmodule, - symconst,symbase,symdef,symsym,symcpu,symtable,defutil,paramgr, - aasmbase,aasmtai,aasmdata, + symconst,symbase,symdef,symsym,symtable,defutil,paramgr, + aasmbase,aasmdata, procinfo,pass_2,parabase, - pass_1,nld,ncon,nadd,ncnv,nutils, + ncon,nadd,nutils, cgobj,hlcgobj, - tgobj,ncgutil,objcgutl, - defcmp - ; + objcgutl; {***************************************************************************** diff --git a/compiler/ncgobjc.pas b/compiler/ncgobjc.pas index 5e3c995c13..97d99e0db3 100644 --- a/compiler/ncgobjc.pas +++ b/compiler/ncgobjc.pas @@ -42,7 +42,7 @@ implementation uses globtype,cclasses, - aasmbase,aasmdata,aasmtai, + aasmbase,aasmdata, cgbase,cgutils,defutil,objcgutl, symconst,symsym,symdef, node,nld,ncon, diff --git a/compiler/ncgopt.pas b/compiler/ncgopt.pas index d067a75981..fe08cff866 100644 --- a/compiler/ncgopt.pas +++ b/compiler/ncgopt.pas @@ -38,12 +38,12 @@ implementation uses globtype,globals, - pass_1,defutil,htypechk, - symdef,paramgr, - aasmbase,aasmtai,aasmdata, + pass_1,defutil, + symdef, + aasmbase,aasmdata, ncnv, ncon, pass_2, cgbase, cpubase, - tgobj, cgobj, hlcgobj, cgutils,ncgutil; + tgobj, cgobj, hlcgobj, cgutils; {***************************************************************************** diff --git a/compiler/ncgrtti.pas b/compiler/ncgrtti.pas index e55e9ec774..c8c14f5836 100644 --- a/compiler/ncgrtti.pas +++ b/compiler/ncgrtti.pas @@ -89,8 +89,7 @@ implementation symtable, aasmtai,aasmdata, defutil, - paramgr, - wpobase + paramgr ; diff --git a/compiler/ncgset.pas b/compiler/ncgset.pas index 6219d39d23..c0a2853e8a 100644 --- a/compiler/ncgset.pas +++ b/compiler/ncgset.pas @@ -89,12 +89,10 @@ interface implementation uses - systems, verbose, symconst,symdef,defutil, - paramgr, - procinfo,pass_2,tgobj, - nbas,ncon,nflw, + pass_2,tgobj, + ncon, ncgutil,hlcgobj; diff --git a/compiler/ncgutil.pas b/compiler/ncgutil.pas index ac68b8cd93..48e84c3528 100644 --- a/compiler/ncgutil.pas +++ b/compiler/ncgutil.pas @@ -26,11 +26,11 @@ unit ncgutil; interface uses - node,cpuinfo, + node, globtype, cpubase,cgbase,parabase,cgutils, aasmbase,aasmtai,aasmdata,aasmcpu, - symconst,symbase,symdef,symsym,symtype,symtable + symconst,symbase,symdef,symsym,symtype {$ifndef cpu64bitalu} ,cg64f32 {$endif not cpu64bitalu} @@ -104,14 +104,12 @@ interface implementation uses - version, cutils,cclasses, - globals,systems,verbose,export, - ppu,defutil, - procinfo,paramgr,fmodule, + globals,systems,verbose, + defutil, + procinfo,paramgr, dbgbase, - pass_1,pass_2, - nbas,ncon,nld,nmem,nutils,ngenutil, + nbas,ncon,nld,nmem,nutils, tgobj,cgobj,hlcgobj,hlcgcpu {$ifdef llvm} { override create_hlcodegen from hlcgcpu } diff --git a/compiler/ncgvmt.pas b/compiler/ncgvmt.pas index 3bf6ff5f76..e33c0cf984 100644 --- a/compiler/ncgvmt.pas +++ b/compiler/ncgvmt.pas @@ -110,16 +110,15 @@ implementation cutils,cclasses, globtype,globals,verbose,constexp, systems,fmodule, - symsym,symtable,symcreat,defutil, + symsym,symtable,symcreat, {$ifdef cpuhighleveltarget} pparautl, {$endif cpuhighleveltarget} aasmtai, wpobase, - nobj, cgbase,parabase,paramgr, {$ifndef cpuhighleveltarget} - cgobj,cgcpu,hlcgobj,hlcgcpu, + hlcgobj,hlcgcpu, {$endif not cpuhighleveltarget} ncgrtti; diff --git a/compiler/ncon.pas b/compiler/ncon.pas index e68bce1cf8..5c08d9813f 100644 --- a/compiler/ncon.pas +++ b/compiler/ncon.pas @@ -27,9 +27,8 @@ interface uses globtype,widestr,constexp, - cclasses, node, - aasmbase,aasmtai,aasmdata,cpuinfo,globals, + aasmbase,cpuinfo,globals, symconst,symtype,symdef,symsym; type @@ -192,7 +191,7 @@ implementation cutils, verbose,systems,sysutils, defcmp,defutil,procinfo, - cpubase,cgbase, + cgbase, nld; function genintconstnode(const v : TConstExprInt) : tordconstnode; diff --git a/compiler/nflw.pas b/compiler/nflw.pas index 2de76ee6f6..33ffb84ab1 100644 --- a/compiler/nflw.pas +++ b/compiler/nflw.pas @@ -244,7 +244,7 @@ implementation globtype,systems,constexp, cutils,verbose,globals, symconst,symtable,paramgr,defcmp,defutil,htypechk,pass_1, - ncal,nadd,ncon,nmem,nld,ncnv,nbas,cgobj,nutils,ninl,nset,ngenutil, + ncal,nadd,ncon,nmem,nld,ncnv,nbas,nutils,ninl,nset,ngenutil, pdecsub, {$ifdef state_tracking} nstate, diff --git a/compiler/ngenutil.pas b/compiler/ngenutil.pas index aaac65e82b..357cb86489 100644 --- a/compiler/ngenutil.pas +++ b/compiler/ngenutil.pas @@ -133,10 +133,10 @@ implementation uses verbose,version,globals,cutils,constexp, - scanner,systems,procinfo,fmodule,pparautl, + systems,procinfo,fmodule,pparautl, aasmbase,aasmtai,aasmcnst, - symbase,symtable,defutil,symcreat, - nadd,ncal,ncnv,ncon,nflw,ninl,nld,nmem,nobj,nutils,ncgutil, + symbase,symtable,defutil, + nadd,ncal,ncnv,ncon,nflw,ninl,nld,nmem,nutils, ppu, pass_1; diff --git a/compiler/ngtcon.pas b/compiler/ngtcon.pas index bcd657a43c..2c6ed63890 100644 --- a/compiler/ngtcon.pas +++ b/compiler/ngtcon.pas @@ -147,14 +147,14 @@ uses systems,tokens,verbose, cutils,globals,widestr,scanner, symtable, - aasmcpu,defutil,defcmp, + defutil,defcmp, { pass 1 } htypechk,procinfo, - nmat,nadd,ncal,nmem,nset,ncnv,ninl,ncon,nld,nflw, + nmem,ncnv,ninl,ncon,nld, { parser specific stuff } - pbase,pexpr,pdecvar, + pbase,pexpr, { codegen } - cpuinfo,cgbase,dbgbase, + cpuinfo,cgbase, wpobase ; diff --git a/compiler/ninl.pas b/compiler/ninl.pas index f554a7799c..5a7b6d1e1a 100644 --- a/compiler/ninl.pas +++ b/compiler/ninl.pas @@ -26,7 +26,7 @@ unit ninl; interface uses - node,htypechk,cpuinfo,symtype; + node,htypechk,symtype; {$i compinnr.inc} @@ -124,11 +124,11 @@ implementation verbose,globals,systems,constexp, globtype,cutils,fmodule, symconst,symdef,symsym,symcpu,symtable,paramgr,defcmp,defutil,symbase, + cpuinfo, pass_1, ncal,ncon,ncnv,nadd,nld,nbas,nflw,nmem,nmat,nutils, nobjc,objcdef, - cgbase,procinfo - ; + cgbase,procinfo; function geninlinenode(number : byte;is_const:boolean;l : tnode) : tinlinenode; diff --git a/compiler/nld.pas b/compiler/nld.pas index 23cff9440a..c524be9269 100644 --- a/compiler/nld.pas +++ b/compiler/nld.pas @@ -179,9 +179,9 @@ implementation verbose,globtype,globals,systems,constexp, symtable, defutil,defcmp, - htypechk,pass_1,procinfo,paramgr, cpuinfo, - ncon,ninl,ncnv,nmem,ncal,nadd,nutils, + htypechk,pass_1,procinfo,paramgr, + ncon,ninl,ncnv,nmem,ncal,nutils, cgbase ; diff --git a/compiler/nmat.pas b/compiler/nmat.pas index 75079d4956..7fc772cc6a 100644 --- a/compiler/nmat.pas +++ b/compiler/nmat.pas @@ -97,7 +97,7 @@ implementation systems, verbose,globals,cutils, globtype,constexp, - symconst,symtype,symdef,symtable, + symconst,symtype,symdef, defutil, htypechk,pass_1, cgbase, diff --git a/compiler/nmem.pas b/compiler/nmem.pas index a1c862344a..9224665e16 100644 --- a/compiler/nmem.pas +++ b/compiler/nmem.pas @@ -154,8 +154,8 @@ implementation uses globtype,systems,constexp, cutils,verbose,globals, - symconst,symbase,defutil,defcmp, - nadd,nbas,nflw,ninl,nutils,objcutil, + symconst,defutil,defcmp, + nadd,nbas,nflw,nutils,objcutil, wpobase, {$ifdef i8086} cpuinfo, diff --git a/compiler/nobj.pas b/compiler/nobj.pas index 19d6613500..18d793b190 100644 --- a/compiler/nobj.pas +++ b/compiler/nobj.pas @@ -57,14 +57,10 @@ interface implementation uses - SysUtils, - globals,verbose,systems,fmodule, + globals,verbose,systems, node, - symbase,symtable,symconst,symtype,defcmp,defutil, - symcpu, - dbgbase, - wpobase - ; + symbase,symtable,symconst,symtype,symcpu, + defcmp; {***************************************************************************** diff --git a/compiler/nobjc.pas b/compiler/nobjc.pas index a10f13a83c..6624c69777 100644 --- a/compiler/nobjc.pas +++ b/compiler/nobjc.pas @@ -57,14 +57,10 @@ var implementation uses - sysutils, - globtype,globals,cclasses,systems, + globtype,globals, verbose,pass_1, - defutil, - symtype,symtable,symdef,symconst,symsym, - paramgr, - nutils, - nbas,nld,ncnv,ncon,ncal,nmem, + symdef,symconst, + ncon,ncal, objcutil, cgbase; diff --git a/compiler/nset.pas b/compiler/nset.pas index f39fbaff5e..1af578b29e 100644 --- a/compiler/nset.pas +++ b/compiler/nset.pas @@ -28,7 +28,7 @@ interface uses cclasses,constexp, node,globtype,globals, - aasmbase,aasmtai,aasmdata,ncon,nflw,symtype; + aasmbase,ncon,nflw,symtype; type TLabelType = (ltOrdinal, ltConstString); @@ -130,12 +130,10 @@ interface implementation uses - systems, verbose, symconst,symdef,symsym,symtable,defutil,defcmp, htypechk,pass_1, - nadd,nbas,ncnv,nld,cgobj,cgbase, - widestr; + nadd,nbas,ncnv,nld,cgbase; {***************************************************************************** diff --git a/compiler/nutils.pas b/compiler/nutils.pas index e8b9b9d1c1..030122d535 100644 --- a/compiler/nutils.pas +++ b/compiler/nutils.pas @@ -156,7 +156,7 @@ implementation uses cutils,verbose,globals, symconst,symdef, - defutil,defcmp,htypechk, + defutil, nbas,ncon,ncnv,nld,nflw,nset,ncal,nadd,nmem,ninl, cpubase,cgbase,procinfo, pass_1; diff --git a/compiler/objcdef.pas b/compiler/objcdef.pas index 1f4890049e..2f519c55ca 100644 --- a/compiler/objcdef.pas +++ b/compiler/objcdef.pas @@ -28,7 +28,6 @@ unit objcdef; interface uses - node, symtype; { The internals of Objective-C's @encode() functionality: encode a @@ -55,7 +54,7 @@ implementation uses globtype, cutils,cclasses, - verbose,systems, + verbose, symtable,symconst,symsym,symdef, defutil,paramgr; diff --git a/compiler/objcutil.pas b/compiler/objcutil.pas index 32cf650ce0..e202ee45d9 100644 --- a/compiler/objcutil.pas +++ b/compiler/objcutil.pas @@ -53,13 +53,13 @@ implementation uses globtype, - cutils,cclasses, + cutils, pass_1, verbose,systems, - symtable,symconst,symsym, + symconst,symsym, objcdef, defutil,paramgr, - nbas,nmem,ncal,nld,ncon,ncnv, + nmem,ncal,nld,ncon,ncnv, export; diff --git a/compiler/ogbase.pas b/compiler/ogbase.pas index d27a23e9ba..ff1ffd8677 100644 --- a/compiler/ogbase.pas +++ b/compiler/ogbase.pas @@ -679,7 +679,7 @@ implementation uses SysUtils, - globals,verbose,fmodule,ogmap; + globals,verbose,ogmap; const SectionDataMaxGrow = 4096; diff --git a/compiler/ogcoff.pas b/compiler/ogcoff.pas index 75baa47b9e..b3a4cbbebe 100644 --- a/compiler/ogcoff.pas +++ b/compiler/ogcoff.pas @@ -31,7 +31,7 @@ interface { target } systems, { assembler } - cpuinfo,cpubase,aasmbase,assemble,link, + aasmbase,assemble, { output } ogbase, owbase; @@ -300,7 +300,8 @@ implementation {$endif win32} SysUtils, cutils,verbose,globals, - fmodule,aasmtai,aasmdata, + cpubase,cpuinfo, + fmodule, ogmap, owar, version diff --git a/compiler/ogelf.pas b/compiler/ogelf.pas index 792026830c..8719307f4f 100644 --- a/compiler/ogelf.pas +++ b/compiler/ogelf.pas @@ -31,7 +31,7 @@ interface { target } systems, { assembler } - cpuinfo,cpubase,aasmbase,aasmtai,aasmdata,assemble, + aasmbase,assemble, { ELF definitions } elfbase, { output } diff --git a/compiler/ogmap.pas b/compiler/ogmap.pas index 8d75a90613..328729a838 100644 --- a/compiler/ogmap.pas +++ b/compiler/ogmap.pas @@ -27,9 +27,9 @@ interface uses { common } - cclasses,globtype,systems, + globtype, { object writer } - aasmbase,ogbase + ogbase ; type @@ -57,9 +57,7 @@ interface implementation uses - cutils,cfileutl, - globals,verbose; - + cutils,cfileutl; const HexTbl : array[0..15] of char='0123456789abcdef'; diff --git a/compiler/omfbase.pas b/compiler/omfbase.pas index b97b48552b..a64c9b8044 100644 --- a/compiler/omfbase.pas +++ b/compiler/omfbase.pas @@ -1115,10 +1115,9 @@ interface implementation uses - cutils, - globals,globtype, - verbose, - cpuinfo; + cutils,globtype,globals, + cpuinfo, + verbose; { TOmfOrderedNameCollection } diff --git a/compiler/optconstprop.pas b/compiler/optconstprop.pas index cea941b3b2..5672d8fed0 100644 --- a/compiler/optconstprop.pas +++ b/compiler/optconstprop.pas @@ -55,7 +55,6 @@ unit optconstprop; implementation uses - fmodule, pass_1,procinfo, symsym, symconst, nutils, nbas, ncnv, nld, nflw, ncal, ninl; diff --git a/compiler/optdead.pas b/compiler/optdead.pas index f80889a98d..7b8dc63a55 100644 --- a/compiler/optdead.pas +++ b/compiler/optdead.pas @@ -29,7 +29,6 @@ unit optdead; uses globtype, cclasses, - symtype, wpobase; type diff --git a/compiler/optdeadstore.pas b/compiler/optdeadstore.pas index cda91e7d28..7fd259d995 100644 --- a/compiler/optdeadstore.pas +++ b/compiler/optdeadstore.pas @@ -36,10 +36,9 @@ unit optdeadstore; uses verbose,globtype,globals, - fmodule, procinfo,pass_1, nutils, - nbas,nld,nmem,nflw,nset, + nbas,nld, optbase, symsym,symconst; diff --git a/compiler/optdfa.pas b/compiler/optdfa.pas index df87cf2f1f..a7950f3068 100644 --- a/compiler/optdfa.pas +++ b/compiler/optdfa.pas @@ -53,14 +53,13 @@ unit optdfa; implementation uses - globtype,globals, + globtype, verbose, - cpuinfo, symconst,symdef,symsym, defutil, procinfo, nutils,htypechk, - nbas,nflw,ncon,ninl,ncal,nset,nld,nadd, + nbas,nflw,ncal,nset,nld,nadd, optbase; diff --git a/compiler/optvirt.pas b/compiler/optvirt.pas index d3526b5b31..ec73cf0413 100644 --- a/compiler/optvirt.pas +++ b/compiler/optvirt.pas @@ -170,9 +170,7 @@ unit optvirt; fmodule, symconst, symbase, - symtable, defcmp, - nobj, verbose; const diff --git a/compiler/owomflib.pas b/compiler/owomflib.pas index 633cd06faf..49cec38347 100644 --- a/compiler/owomflib.pas +++ b/compiler/owomflib.pas @@ -102,7 +102,6 @@ implementation uses SysUtils, cstreams, - globals, verbose, omfbase; diff --git a/compiler/parabase.pas b/compiler/parabase.pas index 59a7a01e0d..1ec514ce26 100644 --- a/compiler/parabase.pas +++ b/compiler/parabase.pas @@ -26,8 +26,8 @@ unit parabase; uses cclasses,globtype, - aasmbase,cpubase,cgbase,cgutils, - symtype, ppu; + cgbase,cgutils, + symtype; type TCGParaReference = record diff --git a/compiler/paramgr.pas b/compiler/paramgr.pas index 91ce724cf7..748ee40c14 100644 --- a/compiler/paramgr.pas +++ b/compiler/paramgr.pas @@ -28,10 +28,10 @@ unit paramgr; interface uses - cclasses,globtype, + globtype, cpubase,cgbase,cgutils, parabase, - aasmtai,aasmdata, + aasmdata, symconst,symtype,symsym,symdef; type @@ -175,8 +175,9 @@ implementation uses systems, - cgobj,hlcgobj,tgobj, - defutil,verbose; + cgobj,tgobj, + defutil,verbose, + hlcgobj; { true if the location in paraloc can be reused as localloc } function tparamanager.param_use_paraloc(const cgpara:tcgpara):boolean; diff --git a/compiler/parser.pas b/compiler/parser.pas index 43ad49f240..d230aeccc9 100644 --- a/compiler/parser.pas +++ b/compiler/parser.pas @@ -40,17 +40,16 @@ implementation {$ELSE} fksysutl, {$ENDIF} - cutils,cclasses, - globtype,version,tokens,systems,globals,verbose,switches,globstat, - symbase,symtable,symdef,symsym, + cclasses, + globtype,tokens,systems,globals,verbose,switches,globstat, + symbase,symtable,symdef, finput,fmodule,fppu, - aasmbase,aasmtai,aasmdata, - cgbase, + aasmdata, script,gendef, comphook, scanner,scandir, - pbase,ptype,psystem,pmodules,psub,ncgrtti,htypechk, - cresstr,cpuinfo,procinfo; + pbase,psystem,pmodules,psub,ncgrtti, + cpuinfo,procinfo; procedure initparser; diff --git a/compiler/pass_1.pas b/compiler/pass_1.pas index be6e5c82bd..b9f7f847ee 100644 --- a/compiler/pass_1.pas +++ b/compiler/pass_1.pas @@ -42,12 +42,13 @@ interface implementation uses - globtype,comphook,systems,cclasses, - cutils,globals, + globtype,comphook, + globals, procinfo, - cgbase,symdef + symdef {$ifdef extdebug} ,verbose,htypechk + ,cgbase {$endif extdebug} {$ifdef state_tracking} ,nstate diff --git a/compiler/pass_2.pas b/compiler/pass_2.pas index 95fe1dc288..0a47b82fb9 100644 --- a/compiler/pass_2.pas +++ b/compiler/pass_2.pas @@ -61,12 +61,14 @@ implementation {$ifdef EXTDEBUG} cutils, {$endif} - globtype,systems,verbose, + globtype,verbose, globals, - paramgr, - aasmtai,aasmdata, - cgbase, - nflw,cgobj; + aasmdata +{$ifdef EXTDEBUG} + ,cgbase + ,aasmtai +{$endif} + ; {***************************************************************************** SecondPass diff --git a/compiler/pbase.pas b/compiler/pbase.pas index 3c812adfc1..0c70457c5a 100644 --- a/compiler/pbase.pas +++ b/compiler/pbase.pas @@ -102,7 +102,7 @@ interface implementation uses - globals,htypechk,scanner,systems,verbose,fmodule; + globals,scanner,verbose,fmodule; {**************************************************************************** Token Parsing diff --git a/compiler/pdecl.pas b/compiler/pdecl.pas index 879727e446..b635340a76 100644 --- a/compiler/pdecl.pas +++ b/compiler/pdecl.pas @@ -56,9 +56,9 @@ implementation globals,tokens,verbose,widestr,constexp, systems,aasmdata,fmodule, { symtable } - symconst,symbase,symtype,symcpu,symtable,symcreat,defutil, + symconst,symbase,symtype,symcpu,symcreat,defutil, { pass 1 } - htypechk,ninl,ncon,nobj,ngenutil, + ninl,ncon,nobj,ngenutil, { parser } scanner, pbase,pexpr,ptype,ptconst,pdecsub,pdecvar,pdecobj,pgenutil, diff --git a/compiler/pdecobj.pas b/compiler/pdecobj.pas index bf5748e337..25d7a048fd 100644 --- a/compiler/pdecobj.pas +++ b/compiler/pdecobj.pas @@ -47,14 +47,14 @@ implementation sysutils,cutils, globals,verbose,systems,tokens, symbase,symsym,symtable,symcreat,defcmp, - node,nld,nmem,ncon,ncnv,ncal, + node,ncon, fmodule,scanner, - pbase,pexpr,pdecsub,pdecvar,ptype,pdecl,pgenutil,ppu, + pbase,pexpr,pdecsub,pdecvar,ptype,pdecl,pgenutil,ppu {$ifdef jvm} - pjvm, -{$endif} - parabase + ,pjvm; +{$else} ; +{$endif} const { Please leave this here, this module should NOT use diff --git a/compiler/pdecsub.pas b/compiler/pdecsub.pas index c6491eedbf..d5d5c30aa9 100644 --- a/compiler/pdecsub.pas +++ b/compiler/pdecsub.pas @@ -111,7 +111,7 @@ implementation { parameter handling } paramgr,cpupara, { pass 1 } - fmodule,node,htypechk,ncon,ppu,nld, + fmodule,node,htypechk,ncon,nld, objcutil, { parser } scanner, diff --git a/compiler/pdecvar.pas b/compiler/pdecvar.pas index 28c78cccb7..71bd00620f 100644 --- a/compiler/pdecvar.pas +++ b/compiler/pdecvar.pas @@ -61,15 +61,12 @@ implementation fmodule,htypechk, { pass 1 } node,pass_1,aasmbase,aasmdata, - ncon,nmat,nadd,ncal,nset,ncnv,ninl,nld,nflw,nmem,nutils, + ncon,nset,ncnv,nld,nutils, { codegen } - ncgutil,ngenutil, + ngenutil, { parser } scanner, - pbase,pexpr,ptype,ptconst,pdecsub, - { link } - import - ; + pbase,pexpr,ptype,ptconst,pdecsub; function read_property_dec(is_classproperty:boolean;astruct:tabstractrecorddef):tpropertysym; diff --git a/compiler/pexpr.pas b/compiler/pexpr.pas index 9b45a13187..5436d245cc 100644 --- a/compiler/pexpr.pas +++ b/compiler/pexpr.pas @@ -75,7 +75,7 @@ implementation { module } fmodule,ppu, { pass 1 } - pass_1,htypechk, + pass_1, nmat,nadd,nmem,nset,ncnv,ninl,ncon,nld,nflw,nbas,nutils, { parser } scanner, diff --git a/compiler/pgenutil.pas b/compiler/pgenutil.pas index 2155567a5e..0d61bf715d 100644 --- a/compiler/pgenutil.pas +++ b/compiler/pgenutil.pas @@ -69,9 +69,7 @@ uses symconst,symsym,symtable,defcmp,procinfo, { modules } fmodule, - { pass 1 } - htypechk, - node,nobj,nmem, + node,nobj, { parser } scanner, pbase,pexpr,pdecsub,ptype,psub; diff --git a/compiler/pinline.pas b/compiler/pinline.pas index ec76c9836a..ec0c44aaa2 100644 --- a/compiler/pinline.pas +++ b/compiler/pinline.pas @@ -28,8 +28,7 @@ interface uses symtype, node, - globals, - cpuinfo; + globals; function new_dispose_statement(is_new:boolean) : tnode; function new_function : tnode; @@ -46,8 +45,6 @@ interface implementation uses - { common } - cutils, { global } globtype,tokens,verbose,constexp, systems, @@ -55,13 +52,10 @@ implementation symbase,symconst,symdef,symsym,symtable,defutil, { pass 1 } pass_1,htypechk, - nmat,nadd,ncal,nmem,nset,ncnv,ninl,ncon,nld,nflw,nbas,nutils,ngenutil, + ncal,nmem,ncnv,ninl,ncon,nld,nbas,ngenutil, { parser } scanner, - pbase,pexpr, - { codegen } - cgbase - ; + pbase,pexpr; function new_dispose_statement(is_new:boolean) : tnode; diff --git a/compiler/pkgutil.pas b/compiler/pkgutil.pas index d2c8124649..78d5c571fa 100644 --- a/compiler/pkgutil.pas +++ b/compiler/pkgutil.pas @@ -48,7 +48,6 @@ implementation aasmbase,aasmdata,aasmcnst, symtype,symconst,symsym,symdef,symbase,symtable, psub,pdecsub, - ncgutil, ppu,entfile,fpcp, export; diff --git a/compiler/pmodules.pas b/compiler/pmodules.pas index c662cba6b2..b6a15797a2 100644 --- a/compiler/pmodules.pas +++ b/compiler/pmodules.pas @@ -33,17 +33,16 @@ implementation uses SysUtils, - globtype,version,systems,tokens, + globtype,systems,tokens, cutils,cfileutl,cclasses,comphook, globals,verbose,fmodule,finput,fppu,globstat,fpcp,fpkg, symconst,symbase,symtype,symdef,symsym,symtable,symcreat, wpoinfo, - aasmtai,aasmdata,aasmcpu,aasmbase, - cgbase,cgobj,ngenutil, + aasmtai,aasmdata,aasmbase,aasmcpu, + cgbase,ngenutil, nbas,nutils,ncgutil, - link,assemble,import,export,gendef,entfile,ppu,comprsrc,dbgbase, + link,assemble,import,export,gendef,ppu,comprsrc,dbgbase, cresstr,procinfo, - pexports, objcgutl, pkgutil, wpobase, diff --git a/compiler/ppu.pas b/compiler/ppu.pas index 5f4024bfdf..f4b9ffa8b1 100644 --- a/compiler/ppu.pas +++ b/compiler/ppu.pas @@ -26,7 +26,7 @@ unit ppu; interface uses - systems,globtype,constexp,cstreams,entfile; + constexp,entfile; { Also write the ppu if only crc if done, this can be used with ppudump to see the differences between the intf and implementation } @@ -150,8 +150,7 @@ implementation {$ifdef Test_Double_checksum} comphook, {$endif def Test_Double_checksum} - fpccrc, - cutils; + fpccrc; function swapendian_ppureal(d:ppureal):ppureal; diff --git a/compiler/procinfo.pas b/compiler/procinfo.pas index 9f03c8f0b4..97cd4a33f4 100644 --- a/compiler/procinfo.pas +++ b/compiler/procinfo.pas @@ -29,14 +29,12 @@ unit procinfo; { common } cclasses, { global } - globtype,globals,verbose, + globtype, { symtable } - symconst,symtype,symdef,symsym, + symconst,symdef,symsym, { aasm } - cpubase,cpuinfo,cgbase,cgutils, - aasmbase,aasmtai,aasmdata, - optutils - ; + cpubase,cgbase,cgutils, + aasmbase,aasmdata; const inherited_inlining_flags : tprocinfoflags = diff --git a/compiler/pstatmnt.pas b/compiler/pstatmnt.pas index f1f7ea60ce..8209fa8a66 100644 --- a/compiler/pstatmnt.pas +++ b/compiler/pstatmnt.pas @@ -44,23 +44,20 @@ implementation globtype,globals,verbose,constexp, systems, { aasm } - cpubase,aasmbase,aasmtai,aasmdata, + cpubase,aasmtai,aasmdata, { symtable } symconst,symbase,symtype,symdef,symsym,symtable,defutil,defcmp, - paramgr,symutil, + paramgr, { pass 1 } pass_1,htypechk, - nutils,ngenutil,nbas,nmat,nadd,ncal,nmem,nset,ncnv,ninl,ncon,nld,nflw, + nutils,ngenutil,nbas,ncal,nmem,nset,ncnv,ncon,nld,nflw, { parser } scanner, pbase,ptype,pexpr, { codegen } procinfo,cgbase, { assembler reader } - rabase, - { wide- and unicodestrings} - widestr - ; + rabase; function statement : tnode;forward; diff --git a/compiler/psub.pas b/compiler/psub.pas index 14147194e3..7be73f19b9 100644 --- a/compiler/psub.pas +++ b/compiler/psub.pas @@ -86,7 +86,7 @@ interface procedure read_proc(isclassmethod:boolean; usefwpd: tprocdef;isgeneric:boolean); { parses only the body of a non nested routine; needs a correctly setup pd } - procedure read_proc_body(pd:tprocdef);inline; + procedure read_proc_body(pd:tprocdef); procedure import_external_proc(pd:tprocdef); @@ -103,7 +103,7 @@ implementation { symtable } symconst,symbase,symsym,symtype,symtable,defutil,defcmp,symcreat, paramgr, - ppu,fmodule, + fmodule, { pass 1 } nutils,ngenutil,nld,ncal,ncon,nflw,nadd,ncnv,nmem, pass_1, @@ -116,9 +116,9 @@ implementation {$endif} { parser } scanner,gendef, - pbase,pstatmnt,pdecl,pdecsub,pexports,pgenutil,pparautl,pgentype, + pbase,pstatmnt,pdecl,pdecsub,pexports,pgenutil,pparautl, { codegen } - tgobj,cgbase,cgobj,cgutils,hlcgobj,hlcgcpu,dbgbase, + tgobj,cgbase,cgobj,hlcgobj,hlcgcpu,dbgbase, {$ifdef llvm} { override create_hlcodegen from hlcgcpu } hlcgllvm, @@ -2003,7 +2003,6 @@ implementation end; - procedure read_proc_body(old_current_procinfo:tprocinfo;pd:tprocdef); { Parses the procedure directives, then parses the procedure body, then diff --git a/compiler/psystem.pas b/compiler/psystem.pas index b77419ec91..5a06382132 100644 --- a/compiler/psystem.pas +++ b/compiler/psystem.pas @@ -43,10 +43,9 @@ implementation globals,globtype,verbose,constexp,cpuinfo, systems, symconst,symtype,symsym,symdef,symcpu,symtable, - aasmtai,aasmdata,aasmcpu, - ncgutil,ncgrtti,fmodule, - node,nbas,nflw,nset,ncon,ncnv,nld,nmem,ncal,nmat,nadd,ninl,nopt - ; + aasmtai,aasmcpu, + fmodule, + node,nbas,nflw,nset,ncon,ncnv,nld,nmem,ncal,nmat,nadd,ninl; procedure create_intern_symbols; diff --git a/compiler/ptconst.pas b/compiler/ptconst.pas index 471fd318c6..96529599a0 100644 --- a/compiler/ptconst.pas +++ b/compiler/ptconst.pas @@ -35,9 +35,9 @@ implementation uses globtype,systems,globals,verbose,cutils,tokens, aasmbase,aasmtai, - procinfo,fmodule, + fmodule, scanner,pbase,pdecvar, - node,nbas,ngtcon,ngenutil, + node,ngtcon, symconst,symbase,symdef ; diff --git a/compiler/ptype.pas b/compiler/ptype.pas index 3d3087fcd6..1866b26035 100644 --- a/compiler/ptype.pas +++ b/compiler/ptype.pas @@ -69,11 +69,9 @@ implementation { global } globals,tokens,verbose,constexp, systems, - { target } - paramgr,procinfo, { symtable } symconst,symsym,symtable,symcreat, - defutil,defcmp,objcdef, + defutil,defcmp, {$ifdef jvm} jvmdef, {$endif} @@ -81,7 +79,7 @@ implementation fmodule, { pass 1 } node, - nmat,nadd,ncal,nset,ncnv,ninl,ncon,nld,nflw, + nset,ncnv,ncon,nld, { parser } scanner, pbase,pexpr,pdecsub,pdecvar,pdecobj,pdecl,pgenutil diff --git a/compiler/rasm.pas b/compiler/rasm.pas index a10066c31c..ff5785c846 100644 --- a/compiler/rasm.pas +++ b/compiler/rasm.pas @@ -29,8 +29,7 @@ unit rasm; cclasses, rabase, aasmbase, - aasmtai,aasmdata, - systems, + aasmdata, cpubase, cgbase; diff --git a/compiler/rgobj.pas b/compiler/rgobj.pas index 2737019f2b..51008e25c2 100644 --- a/compiler/rgobj.pas +++ b/compiler/rgobj.pas @@ -36,10 +36,8 @@ unit rgobj; uses cutils, cpubase, - aasmbase,aasmtai,aasmdata,aasmsym,aasmcpu, - cclasses,globtype,cgbase,cgutils, - cpuinfo - ; + aasmtai,aasmdata,aasmsym,aasmcpu, + cclasses,globtype,cgbase,cgutils; type { @@ -292,7 +290,7 @@ unit rgobj; implementation uses - systems,fmodule,globals, + globals, verbose,tgobj,procinfo; diff --git a/compiler/symcreat.pas b/compiler/symcreat.pas index fe9faac6ce..97a0b2a5d1 100644 --- a/compiler/symcreat.pas +++ b/compiler/symcreat.pas @@ -140,7 +140,7 @@ implementation {$ifdef jvm} pjvm,jvmdef, {$endif jvm} - nbas,nld,nmem,ngenutil,ncon, + nbas,nld,nmem,ncon, defcmp, paramgr; diff --git a/compiler/symdef.pas b/compiler/symdef.pas index 8c2bf11a32..5c7cd91c4a 100644 --- a/compiler/symdef.pas +++ b/compiler/symdef.pas @@ -31,13 +31,11 @@ interface globtype,globals,tokens,constexp, { symtable } symconst,symbase,symtype, - { ppu } - ppu, { node } node, { aasm } - aasmbase,aasmtai, - cpubase,cpuinfo, + aasmtai, + cpuinfo, cgbase, parabase ; diff --git a/compiler/symsym.pas b/compiler/symsym.pas index da2b703429..6024d03ecc 100644 --- a/compiler/symsym.pas +++ b/compiler/symsym.pas @@ -31,12 +31,10 @@ interface globtype,globals,widestr,constexp, { symtable } symconst,symbase,symtype,symdef,defcmp, - { ppu } - ppu,finput, cclasses, { aasm } aasmbase, - cpuinfo,cpubase,cgbase,cgutils,parabase + cpuinfo,cgbase,cgutils,parabase ; type @@ -495,7 +493,7 @@ implementation { tree } node, { aasm } - aasmtai,aasmdata, + aasmdata, { codegen } paramgr, procinfo, diff --git a/compiler/symtype.pas b/compiler/symtype.pas index 5893966688..55cd1d6439 100644 --- a/compiler/symtype.pas +++ b/compiler/symtype.pas @@ -33,7 +33,7 @@ interface { symtable } symconst,symbase, { aasm } - aasmbase,ppu,cpuinfo + aasmbase,ppu ; type diff --git a/compiler/symutil.pas b/compiler/symutil.pas index e2372ea1cf..1c0bde5ea3 100644 --- a/compiler/symutil.pas +++ b/compiler/symutil.pas @@ -26,7 +26,7 @@ unit symutil; interface uses - symbase,symtype,symsym; + symbase,symsym; function is_funcret_sym(p:TSymEntry):boolean; @@ -36,8 +36,7 @@ interface implementation uses - cclasses, - globtype,cpuinfo,procinfo,constexp, + globtype,cpuinfo,constexp, symconst,widestr; diff --git a/compiler/syscinfo.pas b/compiler/syscinfo.pas index e147329c69..d175e97b56 100644 --- a/compiler/syscinfo.pas +++ b/compiler/syscinfo.pas @@ -26,7 +26,7 @@ unit syscinfo; interface uses - globtype, systems, tokens, symconst; + systems, tokens, symconst; type tsyscallinfo = record diff --git a/compiler/systems/i_bsd.pas b/compiler/systems/i_bsd.pas index 6cce4dbbad..e3382e8484 100644 --- a/compiler/systems/i_bsd.pas +++ b/compiler/systems/i_bsd.pas @@ -30,7 +30,7 @@ unit i_bsd; interface uses - systems, rescmn; + systems; const res_macho_info : tresinfo = diff --git a/compiler/systems/i_linux.pas b/compiler/systems/i_linux.pas index c82ad1fecb..7ffa6b21c6 100644 --- a/compiler/systems/i_linux.pas +++ b/compiler/systems/i_linux.pas @@ -26,7 +26,7 @@ unit i_linux; interface uses - systems, rescmn; + systems; const system_i386_linux_info : tsysteminfo = diff --git a/compiler/systems/t_aros.pas b/compiler/systems/t_aros.pas index 89efe9b0b5..9f76c78c19 100644 --- a/compiler/systems/t_aros.pas +++ b/compiler/systems/t_aros.pas @@ -27,7 +27,7 @@ unit t_aros; interface uses - rescmn, comprsrc, import, export, link, ogbase; + rescmn, comprsrc, import, link, ogbase; type diff --git a/compiler/systems/t_linux.pas b/compiler/systems/t_linux.pas index cfbce0afc1..0e5772f111 100644 --- a/compiler/systems/t_linux.pas +++ b/compiler/systems/t_linux.pas @@ -28,7 +28,7 @@ interface uses aasmdata, - symsym,symdef,ppu, + symsym, import,export,expunix,link; type @@ -77,10 +77,10 @@ implementation SysUtils, cutils,cfileutl,cclasses, verbose,systems,globtype,globals, - symconst,script, + script, fmodule, aasmbase,aasmtai,aasmcpu,cpubase, - cgbase,cgobj,cgutils,ogbase,ncgutil, + cgbase,ogbase, comprsrc, ogelf,owar, rescmn, i_linux diff --git a/compiler/systems/t_sunos.pas b/compiler/systems/t_sunos.pas index 9ee43b2290..4605c48e67 100644 --- a/compiler/systems/t_sunos.pas +++ b/compiler/systems/t_sunos.pas @@ -37,9 +37,8 @@ implementation sysutils, cutils,cfileutl,cclasses, verbose,systems,globtype,globals, - symconst,script, - fmodule,aasmbase,aasmtai,aasmdata,aasmcpu,cpubase,symsym,symdef, - cgobj, + script, + fmodule, import,export,expunix,link,comprsrc,rescmn,i_sunos,ogbase; type diff --git a/compiler/systems/t_win.pas b/compiler/systems/t_win.pas index 13b89004a7..c1fe019d4c 100644 --- a/compiler/systems/t_win.pas +++ b/compiler/systems/t_win.pas @@ -31,7 +31,7 @@ interface symconst,symdef,symsym, script,gendef, cpubase, - import,export,link,comprsrc,cgobj,i_win; + import,export,link,comprsrc,i_win; const @@ -96,7 +96,7 @@ implementation uses SysUtils, cfileutl, - cpuinfo,cgutils,dbgbase, + cgutils,dbgbase, owar,ogbase {$ifdef SUPPORT_OMF} ,ogomf diff --git a/compiler/tgobj.pas b/compiler/tgobj.pas index c6d91eb324..962912e743 100644 --- a/compiler/tgobj.pas +++ b/compiler/tgobj.pas @@ -32,11 +32,10 @@ unit tgobj; interface uses - cclasses, globals,globtype, symtype, - cpubase,cpuinfo,cgbase,cgutils, - aasmbase,aasmtai,aasmdata; + cpubase,cgbase,cgutils, + aasmtai,aasmdata; type ptemprecord = ^ttemprecord; @@ -135,10 +134,8 @@ implementation uses cutils, - systems,verbose, - procinfo, - symconst - ; + verbose, + procinfo; const diff --git a/compiler/wpoinfo.pas b/compiler/wpoinfo.pas index 627327362f..ed5362ca7a 100644 --- a/compiler/wpoinfo.pas +++ b/compiler/wpoinfo.pas @@ -28,8 +28,7 @@ interface uses globtype,cclasses, symtype, - wpobase, - ppu; + wpobase; type pderefarray = ^tderefarray; diff --git a/compiler/x86/aasmcpu.pas b/compiler/x86/aasmcpu.pas index 1cc6d93113..db83e3ab35 100644 --- a/compiler/x86/aasmcpu.pas +++ b/compiler/x86/aasmcpu.pas @@ -33,8 +33,7 @@ interface globtype,verbose, cpubase, cgbase,cgutils, - symtype, - aasmbase,aasmtai,aasmdata,aasmsym, + aasmbase,aasmtai,aasmsym, ogbase; const @@ -427,9 +426,7 @@ implementation cutils, globals, systems, - procinfo, itcpugas, - symsym, cpuinfo; diff --git a/compiler/x86/agx86att.pas b/compiler/x86/agx86att.pas index 0535e794c7..4a3f3467bb 100644 --- a/compiler/x86/agx86att.pas +++ b/compiler/x86/agx86att.pas @@ -28,9 +28,9 @@ unit agx86att; interface uses - cclasses,cpubase,systems, - globals,globtype,cgutils, - aasmbase,aasmtai,aasmdata,assemble,aggas; + cpubase,systems, + globtype,cgutils, + aasmtai,assemble,aggas; type Tx86ATTAssembler=class(TGNUassembler) diff --git a/compiler/x86/agx86int.pas b/compiler/x86/agx86int.pas index ff479b95fb..4f75c8b12d 100644 --- a/compiler/x86/agx86int.pas +++ b/compiler/x86/agx86int.pas @@ -51,7 +51,7 @@ implementation uses SysUtils, cutils,globtype,globals,systems,cclasses, - verbose,finput,fmodule,script,cpuinfo, + verbose,script,cpuinfo, itx86int, cgbase ; diff --git a/compiler/x86/cga.pas b/compiler/x86/cga.pas index a039e703b9..a813d54695 100644 --- a/compiler/x86/cga.pas +++ b/compiler/x86/cga.pas @@ -28,8 +28,8 @@ interface uses globtype, - cpuinfo,cpubase,cgbase,cgutils, - symconst,symtype,symdef,aasmbase,aasmtai,aasmdata,aasmcpu; + cpubase,cgbase,cgutils, + aasmbase,aasmdata,aasmcpu; procedure emit_none(i : tasmop;s : topsize); @@ -53,8 +53,7 @@ interface implementation uses - cutils, - systems,verbose, + verbose, cgobj,cgx86; diff --git a/compiler/x86/cgx86.pas b/compiler/x86/cgx86.pas index a854dd6826..d2e04e1ad5 100644 --- a/compiler/x86/cgx86.pas +++ b/compiler/x86/cgx86.pas @@ -31,7 +31,7 @@ unit cgx86; globtype, cgbase,cgutils,cgobj, aasmbase,aasmtai,aasmdata,aasmcpu, - cpubase,cpuinfo,rgobj,rgx86,rgcpu, + cpubase,cpuinfo,rgx86, symconst,symtype,symdef; type @@ -189,9 +189,9 @@ unit cgx86; uses globals,verbose,systems,cutils, - defutil,paramgr,procinfo, - tgobj,ncgutil, - fmodule,symsym,symcpu; + symcpu, + paramgr,procinfo, + tgobj,ncgutil; function UseAVX: boolean; begin diff --git a/compiler/x86/cpubase.pas b/compiler/x86/cpubase.pas index 8aca5d7be0..0d9ad64af4 100644 --- a/compiler/x86/cpubase.pas +++ b/compiler/x86/cpubase.pas @@ -34,8 +34,7 @@ unit cpubase; interface uses - cutils,cclasses, - globtype,globals, + globals, cgbase ; @@ -330,6 +329,7 @@ uses implementation uses + globtype, rgbase,verbose; const diff --git a/compiler/x86/itcpugas.pas b/compiler/x86/itcpugas.pas index 7cc708e9f1..b2ee555f52 100644 --- a/compiler/x86/itcpugas.pas +++ b/compiler/x86/itcpugas.pas @@ -112,7 +112,7 @@ interface implementation uses - cutils,verbose,rgbase; + cutils,rgbase; const {$if defined(x86_64)} diff --git a/compiler/x86/nx86add.pas b/compiler/x86/nx86add.pas index c590949af8..d42caa2726 100644 --- a/compiler/x86/nx86add.pas +++ b/compiler/x86/nx86add.pas @@ -67,13 +67,13 @@ unit nx86add; implementation uses - globtype,globals,systems, + globtype,globals, verbose,cutils, cpuinfo, - aasmbase,aasmtai,aasmdata,aasmcpu, + aasmbase,aasmdata,aasmcpu, symconst,symdef, cgobj,hlcgobj,cgx86,cga,cgutils, - paramgr,tgobj,ncgutil, + tgobj,ncgutil, ncon,nset,ninl, defutil; diff --git a/compiler/x86/nx86cnv.pas b/compiler/x86/nx86cnv.pas index 8c82e77d85..dda045242c 100644 --- a/compiler/x86/nx86cnv.pas +++ b/compiler/x86/nx86cnv.pas @@ -26,7 +26,7 @@ unit nx86cnv; interface uses - node,ncgcnv,defutil,defcmp; + node,ncgcnv,defutil; type tx86typeconvnode = class(tcgtypeconvnode) @@ -58,13 +58,14 @@ interface implementation uses - verbose,systems,globals,globtype, + verbose,globals,globtype, aasmbase,aasmtai,aasmdata,aasmcpu, symconst,symdef, - cgbase,cga,procinfo,pass_1,pass_2, - ncon,ncal,ncnv, - cpubase,cpuinfo, - cgutils,cgobj,hlcgobj,cgx86,ncgutil, + cgbase,cga,pass_1,pass_2, + cpuinfo, + ncnv, + cpubase, + cgutils,cgobj,hlcgobj,cgx86, tgobj; diff --git a/compiler/x86/nx86inl.pas b/compiler/x86/nx86inl.pas index c455232998..683d2615f7 100644 --- a/compiler/x86/nx86inl.pas +++ b/compiler/x86/nx86inl.pas @@ -78,14 +78,13 @@ implementation uses systems, globtype,globals, - cutils,verbose, - symconst, + verbose, defutil, - aasmbase,aasmtai,aasmdata,aasmcpu, + aasmbase,aasmdata,aasmcpu, symtype,symdef,symcpu, cgbase,pass_2, - cpuinfo,cpubase,paramgr,nutils, - nbas,ncon,ncal,ncnv,nld,ncgutil, + cpuinfo,cpubase,nutils, + ncal,ncgutil, tgobj, cga,cgutils,cgx86,cgobj,hlcgobj; diff --git a/compiler/x86/nx86mat.pas b/compiler/x86/nx86mat.pas index 473ace1ba8..a989334c6d 100644 --- a/compiler/x86/nx86mat.pas +++ b/compiler/x86/nx86mat.pas @@ -26,7 +26,7 @@ unit nx86mat; interface uses - node,nmat,ncgmat; + node,ncgmat; type tx86unaryminusnode = class(tcgunaryminusnode) @@ -52,14 +52,14 @@ interface uses globtype, - systems,constexp, + constexp, cutils,verbose,globals, symconst,symdef, aasmbase,aasmtai,aasmdata,defutil, cgbase,pass_1,pass_2, ncon, - cpubase,procinfo, - cga,ncgutil,cgobj,hlcgobj,cgx86,cgutils; + cpubase, + cga,cgobj,hlcgobj,cgx86,cgutils; {***************************************************************************** diff --git a/compiler/x86/nx86mem.pas b/compiler/x86/nx86mem.pas index 523c35fca1..5e6d35a2ea 100644 --- a/compiler/x86/nx86mem.pas +++ b/compiler/x86/nx86mem.pas @@ -26,9 +26,9 @@ unit nx86mem; interface uses globtype, - cgbase,cpuinfo,cpubase, + cgbase,cpubase, symtype, - node,nmem,ncgmem; + nmem,ncgmem; type tx86derefnode = class(tcgderefnode) @@ -43,9 +43,9 @@ implementation uses cutils,verbose, - aasmtai,aasmdata, + aasmdata, cgutils,cgobj, - symconst,symdef,symcpu; + symconst,symcpu; {***************************************************************************** TX86DEREFNODE diff --git a/compiler/x86/rax86.pas b/compiler/x86/rax86.pas index 7150fb6825..d6fbbb11bc 100644 --- a/compiler/x86/rax86.pas +++ b/compiler/x86/rax86.pas @@ -91,8 +91,8 @@ implementation uses globtype,globals,systems,verbose, procinfo, - cpuinfo,cgbase,cgutils, - itcpugas,cgx86, symsym, cutils; + cgbase,cgutils, + itcpugas,cgx86, cutils; {***************************************************************************** diff --git a/compiler/x86/rax86att.pas b/compiler/x86/rax86att.pas index 091168ab8d..c557725473 100644 --- a/compiler/x86/rax86att.pas +++ b/compiler/x86/rax86att.pas @@ -61,14 +61,14 @@ Implementation globtype,verbose, systems, { aasm } - aasmbase,aasmtai,aasmdata,aasmcpu, + aasmbase,aasmdata,aasmcpu, { symtable } symconst,symsym, { parser } scanner, procinfo, itcpugas, - rabase,paramgr, + paramgr, cgbase ; diff --git a/compiler/x86/rax86int.pas b/compiler/x86/rax86int.pas index 0b519c0706..9625a2babe 100644 --- a/compiler/x86/rax86int.pas +++ b/compiler/x86/rax86int.pas @@ -81,17 +81,23 @@ Unit Rax86int; cutils, { global } globals,verbose, - systems,cpuinfo, + systems, { aasm } - aasmtai,aasmdata,aasmcpu, + aasmdata,aasmcpu, +{$ifdef i8086} + aasmtai, +{$endif i8086} { symtable } - symconst,symbase,symtype,symsym,symdef,symtable,symcpu, + symconst,symbase,symtype,symsym,symdef, +{$ifdef i8086} + symcpu, +{$endif i8086} { parser } scanner,pbase, { register allocator } - rabase,rautils,itx86int, + rautils,itx86int, { codegen } - cgbase,cgobj,procinfo,paramgr + cgbase,procinfo,paramgr ; type diff --git a/compiler/x86/rgx86.pas b/compiler/x86/rgx86.pas index 3e7b3ff6b2..b6350bcbda 100644 --- a/compiler/x86/rgx86.pas +++ b/compiler/x86/rgx86.pas @@ -28,9 +28,8 @@ unit rgx86; interface uses - cclasses,globtype, - cpubase,cpuinfo,cgbase,cgutils, - aasmbase,aasmtai,aasmdata,aasmsym,aasmcpu, + cpubase,cgbase,cgutils, + aasmtai,aasmdata,aasmsym,aasmcpu, rgobj; type @@ -83,7 +82,6 @@ unit rgx86; implementation uses - systems, verbose; const diff --git a/compiler/x86_64/aoptcpu.pas b/compiler/x86_64/aoptcpu.pas index 42be321e3b..d599c7ac0e 100644 --- a/compiler/x86_64/aoptcpu.pas +++ b/compiler/x86_64/aoptcpu.pas @@ -27,7 +27,7 @@ unit aoptcpu; interface -uses cgbase, cpubase, aasmtai, aopt, aoptx86, aoptcpub; +uses cpubase, aasmtai, aopt, aoptx86; type TCpuAsmOptimizer = class(TX86AsmOptimizer) @@ -40,13 +40,8 @@ type implementation uses - globtype, globals, - cutils, - verbose, - cgutils, - aoptobj,aoptutils, - aasmbase, aasmdata, aasmcpu, - itcpugas; + globals, + aasmcpu; function TCpuAsmOptimizer.PrePeepHoleOptsCpu(var p : tai) : boolean; begin diff --git a/compiler/x86_64/cgcpu.pas b/compiler/x86_64/cgcpu.pas index 76bdc8565f..7dda93406a 100644 --- a/compiler/x86_64/cgcpu.pas +++ b/compiler/x86_64/cgcpu.pas @@ -28,9 +28,9 @@ unit cgcpu; uses cgbase,cgutils,cgobj,cgx86, aasmbase,aasmtai,aasmdata,aasmcpu, - cpubase,cpuinfo,cpupara,parabase, + cpubase,parabase, symdef, - node,symconst,rgx86,procinfo; + symconst,rgx86,procinfo; type tcgx86_64 = class(tcgx86) @@ -60,8 +60,8 @@ unit cgcpu; uses globtype,globals,verbose,systems,cutils,cclasses, - symsym,symtable,defutil,paramgr,fmodule,cpupi, - rgobj,tgobj,rgcpu,ncgutil; + symtable,paramgr,cpupi, + rgcpu,ncgutil; procedure Tcgx86_64.init_register_allocators; diff --git a/compiler/x86_64/cpupara.pas b/compiler/x86_64/cpupara.pas index 26477dd726..4292a7fb37 100644 --- a/compiler/x86_64/cpupara.pas +++ b/compiler/x86_64/cpupara.pas @@ -29,7 +29,6 @@ unit cpupara; globtype, cpubase,cgbase,cgutils, symconst,symtype,symsym,symdef, - aasmtai,aasmdata, parabase,paramgr; type diff --git a/compiler/x86_64/cputarg.pas b/compiler/x86_64/cputarg.pas index e8f7d5e4d1..537f94f8f6 100644 --- a/compiler/x86_64/cputarg.pas +++ b/compiler/x86_64/cputarg.pas @@ -21,9 +21,11 @@ } { This unit includes the x86-64 dependent target units. } unit cputarg; - {$i fpcdefs.inc} +{ this unit adds all target relevant units, so this hint is not usefull } +{$WARN 5023 off : Unit "$1" not used in $2} + interface diff --git a/compiler/x86_64/nx64add.pas b/compiler/x86_64/nx64add.pas index cbe00b8535..fa2ba69b70 100644 --- a/compiler/x86_64/nx64add.pas +++ b/compiler/x86_64/nx64add.pas @@ -38,8 +38,8 @@ interface uses globtype,globals,verbose, - aasmbase,aasmtai,aasmdata, - symdef,defutil, + aasmbase,aasmdata, + defutil, cgbase,cgutils,cga,cgobj,hlcgobj,cgx86, tgobj; diff --git a/compiler/x86_64/nx64cal.pas b/compiler/x86_64/nx64cal.pas index a3f07153e5..0d0be0735d 100644 --- a/compiler/x86_64/nx64cal.pas +++ b/compiler/x86_64/nx64cal.pas @@ -46,8 +46,8 @@ implementation globtype, systems,verbose,cutils, cpubase,cgbase,cgutils,cgobj, - symconst, symsym,symcpu,nld, - aasmbase,aasmtai,aasmdata,aasmcpu, + symconst,symcpu,nld, + aasmtai,aasmdata,aasmcpu, cpupi; procedure tx8664callnode.do_syscall; diff --git a/compiler/x86_64/nx64cnv.pas b/compiler/x86_64/nx64cnv.pas index a8cce014ba..d39de187fc 100644 --- a/compiler/x86_64/nx64cnv.pas +++ b/compiler/x86_64/nx64cnv.pas @@ -26,7 +26,7 @@ unit nx64cnv; interface uses - node,ncgcnv,defutil,defcmp,pass_1, + node,defutil,pass_1, nx86cnv; type @@ -59,14 +59,13 @@ interface implementation uses - verbose,systems,globals,globtype, + verbose,globals,globtype, aasmbase,aasmtai,aasmdata,aasmcpu, symconst,symdef, - cgbase,cga,procinfo,pass_2, - ncon,ncal,ncnv, + cgbase,cga, + ncnv, cpubase, - cgutils,cgobj,hlcgobj,cgx86,ncgutil, - tgobj; + cgutils,cgobj,hlcgobj,cgx86; function tx8664typeconvnode.first_int_to_real : tnode; diff --git a/compiler/x86_64/nx64flw.pas b/compiler/x86_64/nx64flw.pas index c3c67ae25b..eca904bcec 100644 --- a/compiler/x86_64/nx64flw.pas +++ b/compiler/x86_64/nx64flw.pas @@ -52,12 +52,12 @@ interface implementation uses - cutils,globtype,globals,verbose,systems, - nbas,ncal,nmem,nutils, - symconst,symbase,symtable,symsym,symdef, - cgbase,cgobj,cgcpu,cgutils,tgobj, + globtype,globals,verbose,systems, + nbas,ncal,nutils, + symconst,symsym,symdef, + cgbase,cgobj,cgutils,tgobj, cpubase,htypechk, - parabase,paramgr,pdecsub,pass_1,pass_2,ncgutil,cga, + pass_1,pass_2, aasmbase,aasmtai,aasmdata,aasmcpu,procinfo,cpupi; var diff --git a/compiler/x86_64/nx64mat.pas b/compiler/x86_64/nx64mat.pas index 7ddf2d335e..94f769373f 100644 --- a/compiler/x86_64/nx64mat.pas +++ b/compiler/x86_64/nx64mat.pas @@ -26,7 +26,7 @@ unit nx64mat; interface uses - node,nmat,ncgmat,nx86mat; + node,nmat,nx86mat; type tx8664shlshrnode = class(tshlshrnode) @@ -42,14 +42,11 @@ interface implementation uses - globtype,systems,constexp, - cutils,verbose,globals, - symconst,symdef,aasmbase,aasmtai,aasmdata,defutil, - pass_1,pass_2, + globtype,constexp, + aasmdata,defutil, + pass_2, ncon, - cpubase,cpuinfo, - cgbase,cgutils,cga,cgobj,hlcgobj,cgx86, - ncgutil; + cgbase,cgutils,cgobj,hlcgobj; {***************************************************************************** diff --git a/compiler/x86_64/nx64set.pas b/compiler/x86_64/nx64set.pas index 40ea831d43..10ec06a7d5 100644 --- a/compiler/x86_64/nx64set.pas +++ b/compiler/x86_64/nx64set.pas @@ -27,7 +27,7 @@ interface uses globtype, - node,nset,pass_1,nx86set; + nset,nx86set; type tx8664casenode = class(tx86casenode) @@ -41,13 +41,11 @@ implementation uses systems, verbose,globals,constexp, - symconst,symdef,defutil, - aasmbase,aasmtai,aasmdata,aasmcpu, - cgbase,pass_2, - ncon, - cpubase,cpuinfo,procinfo, - cga,cgutils,cgobj,ncgutil, - cgx86; + defutil, + aasmbase,aasmtai,aasmdata, + cgbase, + cpubase,procinfo, + cga,cgutils,cgobj; {***************************************************************************** diff --git a/compiler/x86_64/rax64int.pas b/compiler/x86_64/rax64int.pas index 0241cde5e6..4dc602640f 100644 --- a/compiler/x86_64/rax64int.pas +++ b/compiler/x86_64/rax64int.pas @@ -37,7 +37,7 @@ Unit rax64int; implementation uses - rabase,systems,rax86,aasmcpu; + rabase,systems; (* procedure tx8664intreader.handleopcode;