* removed some unit dependencies

compiler/i386/cgcpu.pas

@@ -31,7 +31,7 @@ unit cgcpu;
     uses
        cginfo,cgbase,cgobj,cg64f32,cgx86,
        aasmbase,aasmtai,aasmcpu,
-       cpubase,cpuinfo,cpupara,
+       cpubase,cpuinfo,
        node,symconst
 {$ifdef delphi}
        ,dmisc
@@ -56,7 +56,7 @@ unit cgcpu;
     uses
        globtype,globals,verbose,systems,cutils,
        symdef,symsym,defutil,paramgr,
-       rgobj,tgobj,rgcpu;
+       rgobj,tgobj;
 
 
 { ************* 64bit operations ************ }
@@ -174,7 +174,10 @@ begin
 end.
 {
   $Log$
-  Revision 1.32  2002-11-25 17:43:26  peter
+  Revision 1.33  2003-05-22 21:32:28  peter
+    * removed some unit dependencies
+
+  Revision 1.32  2002/11/25 17:43:26  peter
     * splitted defbase in defutil,symutil,defcmp
     * merged isconvertable and is_equal into compare_defs(_ext)
     * made operator search faster by walking the list only once

compiler/i386/cpupi.pas

@@ -29,16 +29,18 @@ unit cpupi;
   interface
 
     uses
-       cgbase;
+       psub;
 
     type
-       ti386procinfo = class(tprocinfo)
+       ti386procinfo = class(tcgprocinfo)
           procedure allocate_interrupt_stackframe;override;
        end;
 
 
   implementation
 
+    uses
+      cgbase;
 
     procedure ti386procinfo.allocate_interrupt_stackframe;
       begin
@@ -53,7 +55,10 @@ begin
 end.
 {
   $Log$
-  Revision 1.3  2003-04-27 11:21:35  peter
+  Revision 1.4  2003-05-22 21:32:29  peter
+    * removed some unit dependencies
+
+  Revision 1.3  2003/04/27 11:21:35  peter
     * aktprocdef renamed to current_procdef
     * procinfo renamed to current_procinfo
     * procinfo will now be stored in current_module so it can be

compiler/i386/n386add.pas

@@ -60,9 +60,8 @@ interface
       symconst,symdef,paramgr,
       aasmbase,aasmtai,aasmcpu,defutil,htypechk,
       cgbase,pass_2,regvars,
-      cpupara,
       ncon,nset,
-      cga,ncgutil,tgobj,rgobj,rgcpu,cgobj,cg64f32;
+      cga,ncgutil,tgobj,rgobj,cgobj,cg64f32,rgcpu;
 
 {*****************************************************************************
                                   Helpers
@@ -1664,7 +1663,10 @@ begin
 end.
 {
   $Log$
-  Revision 1.66  2003-04-26 09:12:55  peter
+  Revision 1.67  2003-05-22 21:32:29  peter
+    * removed some unit dependencies
+
+  Revision 1.66  2003/04/26 09:12:55  peter
     * add string returns in LOC_REFERENCE
 
   Revision 1.65  2003/04/23 20:16:04  peter

compiler/i386/n386cal.pas

@@ -58,7 +58,7 @@ implementation
       cpubase,paramgr,
       aasmbase,aasmtai,aasmcpu,
       node,ncal,nbas,nmem,nld,ncnv,
-      ncgutil,cga,cgobj,tgobj,rgobj,rgcpu,cgcpu,cpuinfo;
+      ncgutil,cga,cgobj,tgobj,rgobj,cpuinfo;
 
 
 {*****************************************************************************
@@ -201,7 +201,10 @@ begin
 end.
 {
   $Log$
-  Revision 1.90  2003-04-23 14:42:08  daniel
+  Revision 1.91  2003-05-22 21:32:29  peter
+    * removed some unit dependencies
+
+  Revision 1.90  2003/04/23 14:42:08  daniel
     * Further register allocator work. Compiler now smaller with new
       allocator than without.
     * Somebody forgot to adjust ppu version number

compiler/i386/n386mat.pas

@@ -58,7 +58,7 @@ implementation
       cginfo,cgbase,pass_1,pass_2,
       ncon,
       cpubase,cpuinfo,
-      cga,tgobj,ncgutil,cgobj,rgobj,rgcpu;
+      cga,tgobj,ncgutil,cgobj,rgobj;
 
 {*****************************************************************************
                              TI386MODDIVNODE
@@ -1183,7 +1183,10 @@ begin
 end.
 {
   $Log$
-  Revision 1.53  2003-04-22 23:50:23  peter
+  Revision 1.54  2003-05-22 21:32:29  peter
+    * removed some unit dependencies
+
+  Revision 1.53  2003/04/22 23:50:23  peter
     * firstpass uses expectloc
     * checks if there are differences between the expectloc and
       location.loc from secondpass in EXTDEBUG

compiler/i386/n386set.pas

@@ -54,7 +54,8 @@ implementation
       cginfo,cgbase,pass_2,
       ncon,
       cpubase,cpuinfo,
-      cga,cgx86,cgobj,tgobj,ncgutil,rgobj;
+      cga,cgobj,tgobj,ncgutil,rgobj,
+      cgx86;
 
 
 {*****************************************************************************
@@ -738,7 +739,10 @@ begin
 end.
 {
   $Log$
-  Revision 1.57  2003-04-27 11:21:35  peter
+  Revision 1.58  2003-05-22 21:32:29  peter
+    * removed some unit dependencies
+
+  Revision 1.57  2003/04/27 11:21:35  peter
     * aktprocdef renamed to current_procdef
     * procinfo renamed to current_procinfo
     * procinfo will now be stored in current_module so it can be

compiler/i386/ra386att.pas

@@ -48,7 +48,8 @@ Implementation
        nbas,
        { parser }
        scanner,
-       rax86,agx86att,rautils
+       itx86att,
+       rax86,rautils
        ;
 
 type
@@ -2133,7 +2134,10 @@ finalization
 end.
 {
   $Log$
-  Revision 1.43  2003-04-30 15:45:35  florian
+  Revision 1.44  2003-05-22 21:32:29  peter
+    * removed some unit dependencies
+
+  Revision 1.43  2003/04/30 15:45:35  florian
     * merged more x86-64/i386 code
 
   Revision 1.42  2003/04/25 12:04:31  florian

compiler/x86/aasmcpu.pas

@@ -89,10 +89,16 @@ interface
       OT_REG_AL    = $00211001;    { REG_ACCUM | BITSxx  }
       OT_REG_AX    = $00211002;    { ditto  }
       OT_REG_EAX   = $00211004;    { and again  }
+{$ifdef x86_64}
+      OT_REG_RAX   = $00211008;
+{$endif x86_64}
       OT_REG_COUNT = $00221000;  { counter: CL, CX or ECX  }
       OT_REG_CL    = $00221001;    { REG_COUNT | BITSxx  }
       OT_REG_CX    = $00221002;    { ditto  }
       OT_REG_ECX   = $00221004;    { another one  }
+{$ifdef x86_64}
+      OT_REG_RCX   = $00221008;
+{$endif x86_64}
       OT_REG_DX    = $00241002;
 
       OT_REG_SREG  = $00081002;  { any segment register  }
@@ -218,7 +224,7 @@ implementation
 
      uses
        cutils,
-       agx86att;
+       itx86att;
 
 {*****************************************************************************
                               Instruction table
@@ -308,7 +314,7 @@ implementation
        { Convert reg to operand type }
        reg2type : array[firstreg..lastreg] of longint = (OT_NONE,
          OT_REG_RAX,OT_REG_RCX,OT_REG64,OT_REG64,OT_REG64,OT_REG64,OT_REG64,OT_REG64,
-         OT_REG64,OT_REG64,OT_REG64,OT_REG64,OT_REG64,OT_REG64,OT_REG64,OT_REG64,OT_REG_RIP,
+         OT_REG64,OT_REG64,OT_REG64,OT_REG64,OT_REG64,OT_REG64,OT_REG64,OT_REG64,OT_REG64,
          OT_REG_EAX,OT_REG_ECX,OT_REG32,OT_REG32,OT_REG32,OT_REG32,OT_REG32,OT_REG32,
          OT_REG32,OT_REG32,OT_REG32,OT_REG32,OT_REG32,OT_REG32,OT_REG32,OT_REG32,
          OT_REG_AX,OT_REG_CX,OT_REG_DX,OT_REG16,OT_REG16,OT_REG16,OT_REG16,OT_REG16,
@@ -325,6 +331,11 @@ implementation
          OT_XMMREG,OT_XMMREG,OT_XMMREG,OT_XMMREG,OT_XMMREG,OT_XMMREG,OT_XMMREG,OT_XMMREG,
          OT_XMMREG,OT_XMMREG,OT_XMMREG,OT_XMMREG,OT_XMMREG,OT_XMMREG,OT_XMMREG,OT_XMMREG
        );
+
+      subreg2type:array[R_SUBL..R_SUBQ] of longint = (
+        OT_REG8,OT_REG8,OT_REG16,OT_REG32,OT_REG64
+      );
+
 {$else x86_64}
        { Intel style operands ! }
        opsize_2_type:array[0..2,topsize] of longint=(
@@ -2013,7 +2024,13 @@ implementation
 end.
 {
   $Log$
-  Revision 1.1  2003-04-25 12:43:40  florian
+  Revision 1.3  2003-05-22 21:33:31  peter
+    * removed some unit dependencies
+
+  Revision 1.2  2002/04/25 16:12:09  florian
+    * fixed more problems with cpubase and x86-64
+
+  Revision 1.1  2003/04/25 12:43:40  florian
     * merged i386/aasmcpu and x86_64/aasmcpu to x86/aasmcpu
 
   Revision 1.18  2003/04/25 12:04:31  florian

compiler/x86/agx86att.pas

@@ -31,7 +31,7 @@ interface
     uses
       cclasses,cpubase,
       globals,
-      aasmbase,aasmtai,aasmcpu,assemble,aggas;
+      aasmbase,aasmtai,assemble,aggas;
 
     type
       Tx86ATTAssembler=class(TGNUassembler)
@@ -43,125 +43,14 @@ interface
         procedure WriteInstruction(hp: tai);override;
       end;
 
-    TAttSuffix = (AttSufNONE,AttSufINT,AttSufFPU,AttSufFPUint);
-
-    const
-{$ifdef x86_64}
-      gas_op2str:op2strtable={$i x64att.inc}
-      gas_needsuffix:array[tasmop] of TAttSuffix={$i x64atts.inc}
-{$else x86_64}
-      gas_op2str:op2strtable={$i i386att.inc}
-      gas_needsuffix:array[tasmop] of TAttSuffix={$i i386atts.inc}
-{$endif x86_64}
-
-      gas_reg2str : reg2strtable = ('',
-      {$ifdef x86_64}
-         '%rax','%rcx','%rdx','%rbx','%rsp','%rbp','%rsi','%rdi',
-         '%r8','%r9','%r10','%r11','%r12','%r13','%r14','%r15','%rip',
-      {$endif x86_64}
-        '%eax','%ecx','%edx','%ebx','%esp','%ebp','%esi','%edi',
-      {$ifdef x86_64}
-         '%r8d','%r9d','%r10d','%r11d','%r12d','%r13d','%r14d','%r15d',
-      {$endif x86_64}
-        '%ax','%cx','%dx','%bx','%sp','%bp','%si','%di',
-      {$ifdef x86_64}
-         '%r8w','%r9w','%r10w','%r11w','%r12w','%r13w','%r14w','%r15w',
-      {$endif x86_64}
-        '%al','%cl','%dl','%bl',
-      {$ifdef x86_64}
-        '%spl','%bpl','%sil','%dil',
-        '%r8b','%r9b','%r10b','%r11b','%r12b','%r13b','%r14b','%r15b',
-      {$endif x86_64}
-        '%ah','%ch','%bh','%dh',
-      {$ifdef x86_64}
-      {$endif x86_64}
-        '%cs','%ds','%es','%ss','%fs','%gs',
-        '%st','%st(0)','%st(1)','%st(2)','%st(3)','%st(4)','%st(5)','%st(6)','%st(7)',
-        '%dr0','%dr1','%dr2','%dr3','%dr6','%dr7',
-        '%cr0','%cr2','%cr3','%cr4',
-        '%tr3','%tr4','%tr5','%tr6','%tr7',
-        '%mm0','%mm1','%mm2','%mm3','%mm4','%mm5','%mm6','%mm7',
-        '%xmm0','%xmm1','%xmm2','%xmm3','%xmm4','%xmm5','%xmm6','%xmm7'
-      {$ifdef x86_64}
-        ,'%xmm8','%xmm9','%xmm10','%xmm11','%xmm12','%xmm13','%xmm14','%xmm15'
-      {$endif x86_64}
-       );
-
-     regname_count=45;
-     regname_count_bsstart=32;
-
-     gas_regname2regnum:array[0..regname_count-1] of regname2regnumrec=(
-        (name:'%ah';     number:NR_AH),
-        (name:'%al';     number:NR_AL),
-        (name:'%ax';     number:NR_AX),
-        (name:'%bh';     number:NR_BH),
-        (name:'%bl';     number:NR_BL),
-        (name:'%bp';     number:NR_BP),
-        (name:'%bx';     number:NR_BX),
-        (name:'%ch';     number:NR_CH),
-        (name:'%cl';     number:NR_CL),
-        (name:'%cs';     number:NR_CS),
-        (name:'%cr0';    number:NR_CR0),
-        (name:'%cr2';    number:NR_CR2),
-        (name:'%cr3';    number:NR_CR3),
-        (name:'%cr4';    number:NR_CR4),
-        (name:'%cx';     number:NR_CX),
-        (name:'%dh';     number:NR_DH),
-        (name:'%dl';     number:NR_DL),
-        (name:'%di';     number:NR_DI),
-        (name:'%dr0';    number:NR_DR0),
-        (name:'%dr1';    number:NR_DR1),
-        (name:'%dr2';    number:NR_DR2),
-        (name:'%dr3';    number:NR_DR3),
-        (name:'%dr6';    number:NR_DR6),
-        (name:'%dr7';    number:NR_DR7),
-        (name:'%ds';     number:NR_DS),
-        (name:'%dx';     number:NR_DX),
-        (name:'%eax';    number:NR_EAX),
-        (name:'%ebp';    number:NR_EBP),
-        (name:'%ebx';    number:NR_EBX),
-        (name:'%ecx';    number:NR_ECX),
-        (name:'%edi';    number:NR_EDI),
-        (name:'%edx';    number:NR_EDX),
-        (name:'%es';     number:NR_ES),
-        (name:'%esi';    number:NR_ESI),
-        (name:'%esp';    number:NR_ESP),
-        (name:'%fs';     number:NR_FS),
-        (name:'%gs';     number:NR_GS),
-        (name:'%si';     number:NR_SI),
-        (name:'%sp';     number:NR_SP),
-        (name:'%ss';     number:NR_SS),
-        (name:'%tr3';    number:NR_DR0),
-        (name:'%tr4';    number:NR_DR1),
-        (name:'%tr5';    number:NR_DR2),
-        (name:'%tr6';    number:NR_DR6),
-        (name:'%tr7';    number:NR_DR7)
-     );
-
-{$ifdef x86_64}
-     gas_opsize2str : array[topsize] of string[2] = ('',
-       'b','w','l','bw','bl','wl','bq','wq','lq',
-       's','l','q',
-       's','l','t','d','q','v','x',
-       '','',''
-     );
-{$else x86_64}
-     gas_opsize2str : array[topsize] of string[2] = ('',
-       'b','w','l','bw','bl','wl',
-       's','l','q',
-       's','l','t','d','q','v','',
-       '','',''
-     );
-{$endif x86_64}
-
-     function gas_regnum_search(const s:string):Tnewregister;
-
 
   implementation
 
     uses
       cutils,systems,
-      verbose;
+      verbose,
+      itx86att,
+      aasmcpu;
 
 
 {****************************************************************************
@@ -458,7 +347,10 @@ initialization
 end.
 {
   $Log$
-  Revision 1.1  2003-04-25 12:04:31  florian
+  Revision 1.2  2003-05-22 21:33:31  peter
+    * removed some unit dependencies
+
+  Revision 1.1  2003/04/25 12:04:31  florian
     * merged agx64att and ag386att to x86/agx86att
 
   Revision 1.31  2003/03/23 23:33:10  hajny

compiler/x86/cga.pas

@@ -63,7 +63,7 @@ implementation
     uses
        cutils,
        systems,globals,verbose,
-       cgbase,cgobj,tgobj,rgobj,rgcpu;
+       cgbase,cgobj,tgobj,rgobj;
 
 
 {*****************************************************************************
@@ -190,7 +190,10 @@ implementation
 end.
 {
   $Log$
-  Revision 1.1  2003-04-30 20:53:32  florian
+  Revision 1.2  2003-05-22 21:33:31  peter
+    * removed some unit dependencies
+
+  Revision 1.1  2003/04/30 20:53:32  florian
     * error when address of an abstract method is taken
     * fixed some x86-64 problems
     * merged some more x86-64 and i386 code

compiler/x86/cgx86.pas

@@ -33,7 +33,7 @@ unit cgx86;
     uses
        cginfo,cgbase,cgobj,
        aasmbase,aasmtai,aasmcpu,
-       cpubase,cpuinfo,cpupara,
+       cpubase,cpuinfo,
        node,symconst;
 
     type
@@ -1941,7 +1941,10 @@ unit cgx86;
 end.
 {
   $Log$
-  Revision 1.46  2003-05-16 14:33:31  peter
+  Revision 1.47  2003-05-22 21:33:31  peter
+    * removed some unit dependencies
+
+  Revision 1.46  2003/05/16 14:33:31  peter
     * regvar fixes
 
   Revision 1.45  2003/05/15 18:58:54  peter

compiler/x86/nx86cnv.pas

@@ -63,7 +63,7 @@ implementation
       cginfo,cgbase,pass_2,
       ncon,ncal,ncnv,
       cpubase,
-      cgobj,cga,tgobj,rgobj,rgcpu,ncgutil;
+      cgobj,cga,tgobj,rgobj,ncgutil;
 
 
     procedure tx86typeconvnode.second_int_to_bool;
@@ -167,6 +167,9 @@ implementation
 end.
 {
   $Log$
-  Revision 1.1  2003-05-01 08:02:42  florian
+  Revision 1.2  2003-05-22 21:33:31  peter
+    * removed some unit dependencies
+
+  Revision 1.1  2003/05/01 08:02:42  florian
     * i386 and x86-64 share second_int_to_bool, moved to nx86cnv.pas
 }

compiler/x86/radirect.pas

@@ -51,7 +51,7 @@ interface
        { codegen }
        cgbase,
        { constants }
-       agx86att,
+       itx86att,
        cpubase
        ;
 
@@ -361,7 +361,10 @@ initialization
 end.
 {
   $Log$
-  Revision 1.4  2003-05-15 18:58:54  peter
+  Revision 1.5  2003-05-22 21:33:31  peter
+    * removed some unit dependencies
+
+  Revision 1.4  2003/05/15 18:58:54  peter
     * removed selfpointer_offset, vmtpointer_offset
     * tvarsym.adjusted_address
     * address in localsymtable is now in the real direction

compiler/x86/rax86.pas

@@ -84,7 +84,8 @@ implementation
 
 uses
   globtype,globals,systems,verbose,
-  cpuinfo,agx86att;
+  cpuinfo,
+  itx86att;
 
 {$define ATTOP}
 {$define INTELOP}
@@ -683,7 +684,10 @@ end;
 end.
 {
   $Log$
-  Revision 1.1  2003-04-30 15:45:35  florian
+  Revision 1.2  2003-05-22 21:33:31  peter
+    * removed some unit dependencies
+
+  Revision 1.1  2003/04/30 15:45:35  florian
     * merged more x86-64/i386 code
 
   Revision 1.30  2003/04/25 12:04:31  florian