Просмотр исходного кода

made m68k to compile again

git-svn-id: trunk@212 -
Károly Balogh 20 лет назад
Родитель
Сommit
62121a9029
5 измененных файлов с 12 добавлено и 11 удалено
  1. 4 4
      compiler/m68k/cgcpu.pas
  2. 1 1
      compiler/m68k/n68kmat.pas
  3. 0 1
      compiler/m68k/rgcpu.pas
  4. 2 1
      compiler/systems.pas
  5. 5 4
      compiler/systems/i_amiga.pas

+ 4 - 4
compiler/m68k/cgcpu.pas

@@ -88,8 +88,8 @@ unit cgcpu;
      end;
      end;
 
 
      tcg64f68k = class(tcg64f32)
      tcg64f68k = class(tcg64f32)
-       procedure a_op64_reg_reg(list : taasmoutput;op:TOpCG;regsrc,regdst : tregister64);override;
-       procedure a_op64_const_reg(list : taasmoutput;op:TOpCG;value : int64;regdst : tregister64);override;
+       procedure a_op64_reg_reg(list : taasmoutput;op:TOpCG; size: tcgsize; regsrc,regdst : tregister64);override;
+       procedure a_op64_const_reg(list : taasmoutput;op:TOpCG; size: tcgsize; value : int64;regdst : tregister64);override;
      end;
      end;
 
 
      { This function returns true if the reference+offset is valid.
      { This function returns true if the reference+offset is valid.
@@ -1200,7 +1200,7 @@ unit cgcpu;
 {****************************************************************************}
 {****************************************************************************}
 {                               TCG64F68K                                    }
 {                               TCG64F68K                                    }
 {****************************************************************************}
 {****************************************************************************}
- procedure tcg64f68k.a_op64_reg_reg(list : taasmoutput;op:TOpCG;regsrc,regdst : tregister64);
+ procedure tcg64f68k.a_op64_reg_reg(list : taasmoutput;op:TOpCG;size: tcgsize; regsrc,regdst : tregister64);
   var
   var
    hreg1, hreg2 : tregister;
    hreg1, hreg2 : tregister;
    opcode : tasmop;
    opcode : tasmop;
@@ -1262,7 +1262,7 @@ unit cgcpu;
   end;
   end;
 
 
 
 
- procedure tcg64f68k.a_op64_const_reg(list : taasmoutput;op:TOpCG;value : int64;regdst : tregister64);
+ procedure tcg64f68k.a_op64_const_reg(list : taasmoutput;op:TOpCG;size: tcgsize; value : int64;regdst : tregister64);
   var
   var
    lowvalue : cardinal;
    lowvalue : cardinal;
    highvalue : cardinal;
    highvalue : cardinal;

+ 1 - 1
compiler/m68k/n68kmat.pas

@@ -114,7 +114,7 @@ implementation
               secondpass(left);
               secondpass(left);
               location_copy(location,left.location);
               location_copy(location,left.location);
               location_force_reg(exprasmlist,location,OS_64,false);
               location_force_reg(exprasmlist,location,OS_64,false);
-              cg64.a_op64_loc_reg(exprasmlist,OP_NOT,location,
+              cg64.a_op64_loc_reg(exprasmlist,OP_NOT,OS_64,location,
                 joinreg64(location.register64.reglo,location.register64.reghi));
                 joinreg64(location.register64.reglo,location.register64.reghi));
            end
            end
          else
          else

+ 0 - 1
compiler/m68k/rgcpu.pas

@@ -20,7 +20,6 @@
  ****************************************************************************
  ****************************************************************************
 }
 }
 
 
-{$i fpcdefs.inc}
 unit rgcpu;
 unit rgcpu;
 
 
 {$i fpcdefs.inc}
 {$i fpcdefs.inc}

+ 2 - 1
compiler/systems.pas

@@ -111,7 +111,8 @@ interface
              system_i386_watcom,        { 32 }
              system_i386_watcom,        { 32 }
              system_powerpc_MorphOS,    { 33 }
              system_powerpc_MorphOS,    { 33 }
              system_x86_64_freebsd,     { 34 }
              system_x86_64_freebsd,     { 34 }
-             system_i386_netwlibc       { 35 }
+             system_i386_netwlibc,      { 35 }
+	     system_powerpc_Amiga	{ 36 }
        );
        );
 
 
        tasm = (as_none
        tasm = (as_none

+ 5 - 4
compiler/systems/i_amiga.pas

@@ -85,7 +85,8 @@ unit i_amiga;
             first_parm_offset : 8;
             first_parm_offset : 8;
             stacksize    : 262144;
             stacksize    : 262144;
             DllScanSupported:false;
             DllScanSupported:false;
-            use_function_relative_addresses : true
+            use_function_relative_addresses : true;
+	    abi : abi_default;
           );
           );
 
 
        system_powerpc_amiga_info : tsysteminfo =
        system_powerpc_amiga_info : tsysteminfo =
@@ -97,8 +98,6 @@ unit i_amiga;
             cpu          : cpu_powerpc;
             cpu          : cpu_powerpc;
             unit_env     : '';
             unit_env     : '';
             extradefines : '';
             extradefines : '';
-            sourceext    : '.pp';
-            pasext       : '.pas';
             exeext       : '';
             exeext       : '';
             defext       : '.def';
             defext       : '.def';
             scriptext    : '.sh';
             scriptext    : '.sh';
@@ -117,6 +116,7 @@ unit i_amiga;
             staticClibext : '.a';
             staticClibext : '.a';
             staticClibprefix : 'lib';
             staticClibprefix : 'lib';
             sharedClibprefix : '';
             sharedClibprefix : '';
+	    p_ext_support : false;
             Cprefix      : '';
             Cprefix      : '';
             newline      : #10;
             newline      : #10;
             dirsep       : '/';
             dirsep       : '/';
@@ -147,7 +147,8 @@ unit i_amiga;
             first_parm_offset : 8;
             first_parm_offset : 8;
             stacksize    : 262144;
             stacksize    : 262144;
             DllScanSupported:false;
             DllScanSupported:false;
-            use_function_relative_addresses : true
+            use_function_relative_addresses : true;
+	    abi : abi_powerpc_sysv;
           );
           );
 
 
   implementation
   implementation