diff options
-rw-r--r-- | compiler/aasmbase.pas | 1 | ||||
-rw-r--r-- | compiler/aasmdata.pas | 7 | ||||
-rw-r--r-- | compiler/aasmtai.pas | 3 | ||||
-rw-r--r-- | compiler/aggas.pas | 6 | ||||
-rw-r--r-- | compiler/cgobj.pas | 9 | ||||
-rw-r--r-- | compiler/defutil.pas | 7 | ||||
-rw-r--r-- | compiler/hlcgobj.pas | 4 | ||||
-rw-r--r-- | compiler/htypechk.pas | 4 | ||||
-rw-r--r-- | compiler/ncgflw.pas | 4 | ||||
-rw-r--r-- | compiler/ncgld.pas | 5 | ||||
-rw-r--r-- | compiler/ncnv.pas | 4 | ||||
-rw-r--r-- | compiler/nld.pas | 6 | ||||
-rw-r--r-- | compiler/node.pas | 6 | ||||
-rw-r--r-- | compiler/optcse.pas | 6 | ||||
-rw-r--r-- | compiler/options.pas | 3 | ||||
-rw-r--r-- | compiler/pdecl.pas | 12 | ||||
-rw-r--r-- | compiler/pdecsub.pas | 9 | ||||
-rw-r--r-- | compiler/pexpr.pas | 4 | ||||
-rw-r--r-- | compiler/psub.pas | 13 | ||||
-rw-r--r-- | compiler/symdef.pas | 8 | ||||
-rw-r--r-- | compiler/symtable.pas | 13 |
21 files changed, 50 insertions, 84 deletions
diff --git a/compiler/aasmbase.pas b/compiler/aasmbase.pas index 9f02a47118..1104f3ff83 100644 --- a/compiler/aasmbase.pas +++ b/compiler/aasmbase.pas @@ -208,7 +208,6 @@ interface implementation uses - SysUtils, verbose; diff --git a/compiler/aasmdata.pas b/compiler/aasmdata.pas index 0dfc44e775..0710b7a60f 100644 --- a/compiler/aasmdata.pas +++ b/compiler/aasmdata.pas @@ -33,11 +33,10 @@ interface uses cutils,cclasses, - globtype,globals,systems, - cpuinfo,cpubase, - cgbase,cgutils, + globtype,systems, + cgbase, symtype, - aasmbase,ogbase; + aasmbase; type { Type of AsmLists. The order is important for the layout of the diff --git a/compiler/aasmtai.pas b/compiler/aasmtai.pas index bfa2e0baa4..ae342949ee 100644 --- a/compiler/aasmtai.pas +++ b/compiler/aasmtai.pas @@ -829,8 +829,7 @@ implementation uses SysUtils, verbose, - globals, - fmodule; + globals; const pputaimarker = 254; diff --git a/compiler/aggas.pas b/compiler/aggas.pas index 47e97cd74e..1b33020bea 100644 --- a/compiler/aggas.pas +++ b/compiler/aggas.pas @@ -29,9 +29,8 @@ unit aggas; interface uses - cclasses, globtype,globals, - aasmbase,aasmtai,aasmdata,aasmcpu, + aasmbase,aasmtai,aasmdata, assemble; type @@ -104,8 +103,7 @@ implementation uses SysUtils, cutils,cfileutl,systems, - fmodule,finput,verbose, - itcpugas,cpubase; + fmodule,verbose,cpubase; const line_length = 70; diff --git a/compiler/cgobj.pas b/compiler/cgobj.pas index 23b1102baa..4974ff7964 100644 --- a/compiler/cgobj.pas +++ b/compiler/cgobj.pas @@ -36,7 +36,7 @@ unit cgobj; interface uses - cclasses,globtype,constexp, + globtype,constexp, cpubase,cgbase,cgutils,parabase, aasmbase,aasmtai,aasmdata,aasmcpu, symconst,symtype,symdef,rgobj @@ -573,10 +573,9 @@ unit cgobj; implementation uses - globals,options,systems, - verbose,defutil,paramgr,symsym, - tgobj,cutils,procinfo, - ncgrtti; + globals,systems, + verbose,paramgr,symsym, + tgobj,cutils,procinfo; {***************************************************************************** basic functionallity diff --git a/compiler/defutil.pas b/compiler/defutil.pas index b9c750e691..3faec7189d 100644 --- a/compiler/defutil.pas +++ b/compiler/defutil.pas @@ -26,9 +26,8 @@ unit defutil; interface uses - cclasses, - globtype,globals,constexp,node, - symconst,symbase,symtype,symdef, + globtype,globals,constexp, + symconst,symtype,symdef, cgbase,cpubase; type @@ -286,7 +285,7 @@ interface implementation uses - systems,verbose; + verbose; { returns true, if def uses FPU } function is_fpu(def : tdef) : boolean; diff --git a/compiler/hlcgobj.pas b/compiler/hlcgobj.pas index 16056e3ed4..624a6a1403 100644 --- a/compiler/hlcgobj.pas +++ b/compiler/hlcgobj.pas @@ -37,7 +37,7 @@ unit hlcgobj; cclasses,globtype,constexp, cpubase,cgbase,cgutils,parabase, aasmbase,aasmtai,aasmdata,aasmcpu, - symconst,symtype,symdef,rgobj, + symconst,symtype,symdef, node ; @@ -555,7 +555,7 @@ unit hlcgobj; implementation uses - globals,options,systems, + globals,systems, fmodule,export, verbose,defutil,paramgr, symbase,symsym,symtable, diff --git a/compiler/htypechk.pas b/compiler/htypechk.pas index f34dabfd66..ade7e72ab7 100644 --- a/compiler/htypechk.pas +++ b/compiler/htypechk.pas @@ -181,13 +181,11 @@ interface implementation uses - sysutils, systems,constexp,globals, cutils,verbose, symtable, defutil,defcmp, - nbas,ncnv,nld,nmem,ncal,nmat,ninl,nutils,ncon, - cgbase,procinfo + nbas,ncnv,nld,nmem,ncal,nmat,ninl,nutils,procinfo ; type diff --git a/compiler/ncgflw.pas b/compiler/ncgflw.pas index 10aa87c691..d9ae036957 100644 --- a/compiler/ncgflw.pas +++ b/compiler/ncgflw.pas @@ -95,10 +95,8 @@ implementation verbose,globals,systems,globtype,constexp, symconst,symdef,symsym,symtable,aasmtai,aasmdata,aasmcpu,defutil, procinfo,cgbase,pass_2,parabase, - cpubase,cpuinfo, - nld,ncon, + cpubase,ncon, tgobj,paramgr, - regvars, cgutils,cgobj,hlcgobj,nutils ; diff --git a/compiler/ncgld.pas b/compiler/ncgld.pas index ef13169b52..454b662d94 100644 --- a/compiler/ncgld.pas +++ b/compiler/ncgld.pas @@ -69,9 +69,8 @@ implementation systems, verbose,globals,constexp, nutils, - symtable,symconst,symdef,symsym,defutil,paramgr, - ncnv,ncon,nmem,nbas,ncgrtti, - aasmbase,aasmtai,aasmcpu, + symtable,symconst,symdef,symsym,defutil,paramgr,ncon,nbas,ncgrtti, + aasmbase, cgbase,pass_2, procinfo, cpubase,parabase, diff --git a/compiler/ncnv.pas b/compiler/ncnv.pas index 70a3793199..f0eb969bb6 100644 --- a/compiler/ncnv.pas +++ b/compiler/ncnv.pas @@ -294,8 +294,8 @@ implementation uses globtype,systems,constexp, cutils,verbose,globals,widestr, - symconst,symdef,symsym,symbase,symtable, - ncon,ncal,nset,nadd,ninl,nmem,nmat,nbas,nutils, + symconst,symdef,symsym,symtable, + ncon,ncal,nset,nadd,nmem,nmat,nbas,nutils, cgbase,procinfo, htypechk,pass_1,cpuinfo; diff --git a/compiler/nld.pas b/compiler/nld.pas index 281a932edc..b6f76015ad 100644 --- a/compiler/nld.pas +++ b/compiler/nld.pas @@ -173,13 +173,13 @@ interface implementation uses - cutils,verbose,globtype,globals,systems,constexp, + verbose,globtype,globals,systems,constexp, symnot,symtable, defutil,defcmp, htypechk,pass_1,procinfo,paramgr, cpuinfo, - ncon,ninl,ncnv,nmem,ncal,nutils,nbas, - cgobj,cgbase + ncon,ninl,ncnv,nmem,ncal,nutils, + cgbase ; {***************************************************************************** diff --git a/compiler/node.pas b/compiler/node.pas index cf3db31674..b398c01711 100644 --- a/compiler/node.pas +++ b/compiler/node.pas @@ -27,9 +27,7 @@ interface uses cclasses, - globtype,globals, - cpubase,cgbase,cgutils, - aasmbase, + globtype,globals,cgbase,cgutils, symtype, optbase; @@ -482,7 +480,7 @@ interface implementation uses - cutils,verbose,ppu,comphook, + verbose,ppu,comphook, symconst, nutils,nflw, defutil; diff --git a/compiler/optcse.pas b/compiler/optcse.pas index 0c708c044a..79b52e7afa 100644 --- a/compiler/optcse.pas +++ b/compiler/optcse.pas @@ -48,12 +48,10 @@ unit optcse; uses globtype,globals, cutils,cclasses, - verbose, nutils, - procinfo, - nbas,nld,ninl,ncal,ncnv,nadd,nmem, + nbas,nld,ninl,ncal,nadd,nmem, pass_1, - symconst,symtype,symdef,symsym, + symconst,symdef,symsym, defutil, optbase; diff --git a/compiler/options.pas b/compiler/options.pas index 45980ea2cf..fe72ad988f 100644 --- a/compiler/options.pas +++ b/compiler/options.pas @@ -26,7 +26,7 @@ unit options; interface uses - CClasses,cfileutl, + cfileutl, globtype,globals,verbose,systems,cpuinfo, comprsrc; Type @@ -90,7 +90,6 @@ uses cutils,cmsgs, comphook, symtable,scanner,rabase, - wpobase, symconst, i_bsd; diff --git a/compiler/pdecl.pas b/compiler/pdecl.pas index 1b6d25b6e1..cbab610dab 100644 --- a/compiler/pdecl.pas +++ b/compiler/pdecl.pas @@ -50,21 +50,15 @@ interface implementation uses - SysUtils, { common } cutils, { global } globals,tokens,verbose,widestr,constexp, - systems, - { aasm } - aasmbase,aasmtai,aasmdata,fmodule, + systems,aasmdata,fmodule, { symtable } - symconst,symbase,symtype,symtable,symcreat,paramgr,defutil, + symconst,symbase,symtype,symtable,symcreat,defutil, { pass 1 } - htypechk, - nmat,nadd,ncal,nset,ncnv,ninl,ncon,nld,nflw,nobj, - { codegen } - ncgutil,ngenutil, + htypechk,ninl,ncon,nobj,ngenutil, { parser } scanner, pbase,pexpr,ptype,ptconst,pdecsub,pdecvar,pdecobj,pgenutil, diff --git a/compiler/pdecsub.pas b/compiler/pdecsub.pas index 2bc562c405..a0a822c5ca 100644 --- a/compiler/pdecsub.pas +++ b/compiler/pdecsub.pas @@ -96,13 +96,14 @@ implementation cutils,cclasses, { global } globtype,globals,verbose,constexp, - systems,fpccrc, + systems, cpuinfo, { symtable } - symbase,symtable,symcreat,defutil,defcmp,paramgr,cpupara, + symbase,symtable,defutil,defcmp, + { parameter handling } + paramgr,cpupara, { pass 1 } - fmodule,node,htypechk, - nmat,nadd,ncal,nset,ncnv,ninl,ncon,nld,nflw, + fmodule,node,htypechk,ncon, objcutil, { parser } scanner, diff --git a/compiler/pexpr.pas b/compiler/pexpr.pas index 87f289d523..ff886617d4 100644 --- a/compiler/pexpr.pas +++ b/compiler/pexpr.pas @@ -70,9 +70,7 @@ implementation nmat,nadd,nmem,nset,ncnv,ninl,ncon,nld,nflw,nbas,nutils, { parser } scanner, - pbase,pinline,ptype,pgenutil, - { codegen } - cgbase,procinfo,cpuinfo + pbase,pinline,ptype,pgenutil,procinfo,cpuinfo ; { sub_expr(opmultiply) is need to get -1 ** 4 to be diff --git a/compiler/psub.pas b/compiler/psub.pas index d7af972708..156cd25258 100644 --- a/compiler/psub.pas +++ b/compiler/psub.pas @@ -26,7 +26,7 @@ unit psub; interface uses - cclasses,globals, + globals, node,nbas, symdef,procinfo,optdfa; @@ -90,9 +90,7 @@ implementation cutils, { global } globtype,tokens,verbose,comphook,constexp, - systems, - { aasm } - cpuinfo,cpubase,aasmbase,aasmtai,aasmdata, + systems,cpubase,aasmbase,aasmtai,aasmdata, { symtable } symconst,symbase,symsym,symtype,symtable,defutil,symcreat, paramgr, @@ -108,15 +106,14 @@ implementation pass_2, {$endif} { parser } - scanner,import,gendef, + scanner,gendef, pbase,pstatmnt,pdecl,pdecsub,pexports,pgenutil,pparautl, { codegen } - tgobj,cgbase,cgobj,cgcpu,hlcgobj,hlcgcpu,dbgbase, + tgobj,cgbase,cgobj,hlcgobj,hlcgcpu,dbgbase, ncgutil,regvars, optbase, opttail, - optcse,optloop, - optutils + optcse,optloop {$if defined(arm) or defined(avr) or defined(fpc_compiler_has_fixup_jmps)} ,aasmcpu {$endif arm} diff --git a/compiler/symdef.pas b/compiler/symdef.pas index 64d6cc30f8..2e06403038 100644 --- a/compiler/symdef.pas +++ b/compiler/symdef.pas @@ -36,9 +36,9 @@ interface { node } node, { aasm } - aasmbase,aasmtai,aasmdata, + aasmbase,aasmtai, cpubase,cpuinfo, - cgbase,cgutils, + cgbase, parabase ; @@ -1010,9 +1010,9 @@ implementation { global } verbose, { target } - systems,aasmcpu,paramgr, + systems,paramgr, { symtable } - symsym,symtable,symutil,defutil,objcdef, + symsym,symtable,defutil,objcdef, {$ifdef jvm} jvmdef, {$endif} diff --git a/compiler/symtable.pas b/compiler/symtable.pas index 273a9454fb..f50a12143e 100644 --- a/compiler/symtable.pas +++ b/compiler/symtable.pas @@ -26,16 +26,11 @@ interface uses { common } - cutils,cclasses, - { global } - cpuinfo,globtype,tokens, + cutils,cclasses,globtype,tokens, { symtable } symconst,symbase,symtype,symdef,symsym, { ppu } - ppu, - { assembler } - aasmtai,aasmdata - ; + ppu; {**************************************************************************** @@ -346,10 +341,8 @@ implementation uses { global } verbose,globals, - { target } - systems, { symtable } - symutil,defcmp,defutil, + symutil,defutil, { module } fmodule, { codegen } |