* more x86-64 fixes

compiler/i386/cgcpu.pas

@@ -40,7 +40,8 @@ unit cgcpu;
 
     type
       tcg386 = class(tcgx86)
-      end;
+         class function reg_cgsize(const reg: tregister): tcgsize; override;
+     end;
 
       tcg64f386 = class(tcg64f32)
         procedure a_op64_ref_reg(list : taasmoutput;op:TOpCG;const ref : treference;reg : tregister64);override;
@@ -59,6 +60,19 @@ unit cgcpu;
        rgobj,tgobj;
 
 
+    class function tcg386.reg_cgsize(const reg: tregister): tcgsize;
+      const
+        opsize_2_cgsize: array[topsize] of tcgsize = (OS_NO,
+          OS_8,OS_16,OS_32,OS_NO,OS_NO,OS_NO,
+          OS_32,OS_64,OS_64,
+          OS_F32,OS_F64,OS_F80,OS_F32,OS_F64,OS_NO,OS_NO,
+          OS_NO,OS_NO,OS_NO
+        );
+      begin
+        result := opsize_2_cgsize[reg2opsize(reg)];
+      end;
+
+
 { ************* 64bit operations ************ }
 
     procedure tcg64f386.get_64bit_ops(op:TOpCG;var op1,op2:TAsmOp);
@@ -193,7 +207,10 @@ begin
 end.
 {
   $Log$
-  Revision 1.37  2003-09-03 15:55:01  peter
+  Revision 1.38  2003-09-25 13:13:32  florian
+    * more x86-64 fixes
+
+  Revision 1.37  2003/09/03 15:55:01  peter
     * NEWRA branch merged
 
   Revision 1.36.2.1  2003/08/29 17:28:59  peter

compiler/regvars.pas

@@ -264,8 +264,12 @@ implementation
                        { reserve place on the FPU stack }
                        regvarinfo^.fpuregvars[i].localloc.register:=trgcpu(rg).correct_fpuregister(NR_ST0,i);
 {$else i386}
-                       regvarinfo^.fpuregvars[i].localloc.register:=fpuvarregs[i];
-                       rg.makeregvarother(regvarinfo^.fpuregvars[i].localloc.register);
+{$ifdef x86_64}
+{$endif x86_64}
+                       begin
+                         regvarinfo^.fpuregvars[i].localloc.register:=fpuvarregs[i];
+                         rg.makeregvarother(regvarinfo^.fpuregvars[i].localloc.register);
+                       end;
 {$endif i386}
                      end;
                   end;
@@ -608,7 +612,10 @@ end.
 
 {
   $Log$
-  Revision 1.66  2003-09-23 17:56:06  peter
+  Revision 1.67  2003-09-25 13:13:32  florian
+    * more x86-64 fixes
+
+  Revision 1.66  2003/09/23 17:56:06  peter
     * locals and paras are allocated in the code generation
     * tvarsym.localloc contains the location of para/local when
       generating code for the current procedure

compiler/x86/cgx86.pas

@@ -104,8 +104,6 @@ unit cgx86;
         procedure g_exception_reason_save_const(list : taasmoutput; const href : treference; a: aword);override;
         procedure g_exception_reason_load(list : taasmoutput; const href : treference);override;
 
-        class function reg_cgsize(const reg: tregister): tcgsize; override;
-
         { entry/exit code helpers }
         procedure g_copyvaluepara_openarray(list : taasmoutput;const ref, lenref:treference;elesize:integer);override;
         procedure g_interrupt_stackframe_entry(list : taasmoutput);override;
@@ -330,19 +328,6 @@ unit cgx86;
                               Assembler code
 ****************************************************************************}
 
-    class function tcgx86.reg_cgsize(const reg: tregister): tcgsize;
-      const
-        opsize_2_cgsize: array[topsize] of tcgsize = (OS_NO,
-          OS_8,OS_16,OS_32,OS_NO,OS_NO,OS_NO,
-          OS_32,OS_64,OS_64,
-          OS_F32,OS_F64,OS_F80,OS_F32,OS_F64,OS_NO,OS_NO,
-          OS_NO,OS_NO,OS_NO
-        );
-      begin
-        result := opsize_2_cgsize[reg2opsize(reg)];
-      end;
-
-
     { currently does nothing }
     procedure tcgx86.a_jmp_always(list : taasmoutput;l: tasmlabel);
      begin
@@ -1622,7 +1607,10 @@ unit cgx86;
 end.
 {
   $Log$
-  Revision 1.64  2003-09-11 11:55:00  florian
+  Revision 1.65  2003-09-25 13:13:32  florian
+    * more x86-64 fixes
+
+  Revision 1.64  2003/09/11 11:55:00  florian
     * improved arm code generation
     * move some protected and private field around
     * the temp. register for register parameters/arguments are now released

compiler/x86_64/cgcpu.pas

@@ -36,7 +36,8 @@ unit cgcpu;
 
     type
       tcgx86_64 = class(tcgx86)
-         procedure g_concatcopy(list : taasmoutput;const source,dest : treference;len : aword; delsource,loadref : boolean);override;
+        class function reg_cgsize(const reg: tregister): tcgsize; override;
+        procedure g_concatcopy(list : taasmoutput;const source,dest : treference;len : aword; delsource,loadref : boolean);override;
       end;
 
   implementation
@@ -46,6 +47,20 @@ unit cgcpu;
        symdef,symsym,defutil,paramgr,
        rgobj,tgobj,rgcpu;
 
+
+    class function tcgx86_64.reg_cgsize(const reg: tregister): tcgsize;
+      const
+        opsize_2_cgsize: array[topsize] of tcgsize = (OS_NO,
+          OS_8,OS_16,OS_32,OS_NO,OS_NO,OS_NO,OS_NO,OS_NO,OS_NO,
+          OS_32,OS_64,OS_64,
+          OS_F32,OS_F64,OS_F80,OS_F32,OS_F64,OS_NO,OS_NO,
+          OS_NO,OS_NO,OS_NO
+        );
+      begin
+        result := opsize_2_cgsize[reg2opsize(reg)];
+      end;
+
+
     procedure tcgx86_64.g_concatcopy(list : taasmoutput;const source,dest : treference;len : aword; delsource,loadref : boolean);
       var
          ecxpushed : boolean;
@@ -177,7 +192,10 @@ begin
 end.
 {
   $Log$
-  Revision 1.4  2003-04-30 15:45:35  florian
+  Revision 1.5  2003-09-25 13:13:32  florian
+    * more x86-64 fixes
+
+  Revision 1.4  2003/04/30 15:45:35  florian
     * merged more x86-64/i386 code
 
   Revision 1.3  2003/01/05 13:36:54  florian

compiler/x86_64/cpubase.inc

@@ -73,6 +73,8 @@ const
          (RS_EBX,RS_EDX,RS_ECX,RS_EAX);
 
       maxfpuvarregs = 8;
+      fpuvarregs : Array [1..maxfpuvarregs] of Tsuperregister =
+                (RS_MM8,RS_MM9,RS_MM10,RS_MM11,RS_MM12,RS_MM13,RS_MM14,RS_MM15);
 
 {*****************************************************************************
                                GDB Information
@@ -107,6 +109,7 @@ const
 *****************************************************************************}
 
       {# Stack pointer register }
+      RS_STACK_POINTER_REG = RS_RSP;
       NR_STACK_POINTER_REG = NR_RSP;
       {# Frame pointer register }
       RS_FRAME_POINTER_REG = RS_EBP;
@@ -155,7 +158,10 @@ const
 
 {
   $Log$
-  Revision 1.7  2003-09-24 17:12:02  florian
+  Revision 1.8  2003-09-25 13:13:32  florian
+    * more x86-64 fixes
+
+  Revision 1.7  2003/09/24 17:12:02  florian
     * several fixes for new reg allocator
 
   Revision 1.6  2003/06/03 13:01:59  daniel

compiler/x86_64/cpuswtch.pas

@@ -54,7 +54,7 @@ begin
                  '-' :
                    begin
                      initglobalswitches:=initglobalswitches-[cs_optimize,cs_fastoptimize,cs_slowoptimize,cs_littlesize,
-                       cs_regalloc,cs_uncertainopts];
+                       cs_regvars,cs_uncertainopts];
                      FillChar(ParaAlignment,sizeof(ParaAlignment),0);
                    end;
                  'a' :
@@ -66,7 +66,7 @@ begin
                  'G' : initglobalswitches:=initglobalswitches-[cs_littlesize];
                  'r' :
                    begin
-                     initglobalswitches:=initglobalswitches+[cs_regalloc];
+                     initglobalswitches:=initglobalswitches+[cs_regvars];
                      Simplify_ppu:=false;
                    end;
                  'u' : initglobalswitches:=initglobalswitches+[cs_uncertainopts];
@@ -101,7 +101,10 @@ initialization
 end.
 {
   $Log$
-  Revision 1.2  2002-08-10 14:53:38  carl
+  Revision 1.3  2003-09-25 13:13:32  florian
+    * more x86-64 fixes
+
+  Revision 1.2  2002/08/10 14:53:38  carl
     + moved target_cpu_string to cpuinfo
     * renamed asmmode enum.
     * assembler reader has now less ifdef's