فهرست منبع

* renamed all paramanagers to tcpuparamanager so the llvm paramanager can
derive from them without ifdefs

git-svn-id: branches/hlcgllvm@26039 -

Jonas Maebe 11 سال پیش
والد
کامیت
99de108c68

+ 13 - 13
compiler/aarch64/cpupara.pas

@@ -33,7 +33,7 @@ unit cpupara;
        symconst,symbase,symtype,symdef,parabase,paramgr;
        symconst,symbase,symtype,symdef,parabase,paramgr;
 
 
     type
     type
-       taarch64paramanager = class(tparamanager)
+       tcpuparamanager = class(tparamanager)
           function get_volatile_registers_int(calloption : tproccalloption):tcpuregisterset;override;
           function get_volatile_registers_int(calloption : tproccalloption):tcpuregisterset;override;
           function get_volatile_registers_fpu(calloption : tproccalloption):tcpuregisterset;override;
           function get_volatile_registers_fpu(calloption : tproccalloption):tcpuregisterset;override;
           function get_volatile_registers_mm(calloption : tproccalloption):tcpuregisterset;override;
           function get_volatile_registers_mm(calloption : tproccalloption):tcpuregisterset;override;
@@ -57,25 +57,25 @@ unit cpupara;
        defutil,symsym,symtable;
        defutil,symsym,symtable;
 
 
 
 
-    function taarch64paramanager.get_volatile_registers_int(calloption : tproccalloption):tcpuregisterset;
+    function tcpuparamanager.get_volatile_registers_int(calloption : tproccalloption):tcpuregisterset;
       begin
       begin
         result:=VOLATILE_INTREGISTERS
         result:=VOLATILE_INTREGISTERS
       end;
       end;
 
 
 
 
-    function taarch64paramanager.get_volatile_registers_fpu(calloption : tproccalloption):tcpuregisterset;
+    function tcpuparamanager.get_volatile_registers_fpu(calloption : tproccalloption):tcpuregisterset;
       begin
       begin
         result:=[];
         result:=[];
       end;
       end;
 
 
 
 
-    function taarch64paramanager.get_volatile_registers_mm(calloption: tproccalloption): tcpuregisterset;
+    function tcpuparamanager.get_volatile_registers_mm(calloption: tproccalloption): tcpuregisterset;
       begin
       begin
         result:=VOLATILE_MMREGISTERS;
         result:=VOLATILE_MMREGISTERS;
       end;
       end;
 
 
 
 
-    procedure taarch64paramanager.getintparaloc(pd : tabstractprocdef; nr : longint; var cgpara : tcgpara);
+    procedure tcpuparamanager.getintparaloc(pd : tabstractprocdef; nr : longint; var cgpara : tcgpara);
       var
       var
         paraloc : pcgparalocation;
         paraloc : pcgparalocation;
         def : tdef;
         def : tdef;
@@ -164,7 +164,7 @@ unit cpupara;
       end;
       end;
 
 
 
 
-    function taarch64paramanager.push_addr_param(varspez:tvarspez;def : tdef;calloption : tproccalloption) : boolean;
+    function tcpuparamanager.push_addr_param(varspez:tvarspez;def : tdef;calloption : tproccalloption) : boolean;
       begin
       begin
         result:=false;
         result:=false;
         if varspez in [vs_var,vs_out,vs_constref] then
         if varspez in [vs_var,vs_out,vs_constref] then
@@ -195,7 +195,7 @@ unit cpupara;
       end;
       end;
 
 
 
 
-    function taarch64paramanager.ret_in_param(def:tdef;pd:tabstractprocdef):boolean;
+    function tcpuparamanager.ret_in_param(def:tdef;pd:tabstractprocdef):boolean;
       var
       var
         i: longint;
         i: longint;
         sym: tsym;
         sym: tsym;
@@ -278,7 +278,7 @@ unit cpupara;
       end;
       end;
 
 
 
 
-    procedure taarch64paramanager.init_values(var curintreg, curfloatreg, curmmreg: tsuperregister; var cur_stack_offset: aword; var sparesinglereg: tregister);
+    procedure tcpuparamanager.init_values(var curintreg, curfloatreg, curmmreg: tsuperregister; var cur_stack_offset: aword; var sparesinglereg: tregister);
       begin
       begin
         curintreg:=RS_R0;
         curintreg:=RS_R0;
         curfloatreg:=RS_F0;
         curfloatreg:=RS_F0;
@@ -288,7 +288,7 @@ unit cpupara;
       end;
       end;
 
 
 
 
-    function taarch64paramanager.create_paraloc_info_intern(p : tabstractprocdef; side: tcallercallee; paras: tparalist;
+    function tcpuparamanager.create_paraloc_info_intern(p : tabstractprocdef; side: tcallercallee; paras: tparalist;
         var curintreg, curfloatreg, curmmreg: tsuperregister; var cur_stack_offset: aword; var sparesinglereg: tregister; isvariadic: boolean):longint;
         var curintreg, curfloatreg, curmmreg: tsuperregister; var cur_stack_offset: aword; var sparesinglereg: tregister; isvariadic: boolean):longint;
 
 
       var
       var
@@ -571,7 +571,7 @@ unit cpupara;
       end;
       end;
 
 
 
 
-    function  taarch64paramanager.get_funcretloc(p : tabstractprocdef; side: tcallercallee; forcetempdef: tdef): tcgpara;
+    function  tcpuparamanager.get_funcretloc(p : tabstractprocdef; side: tcallercallee; forcetempdef: tdef): tcgpara;
       var
       var
         paraloc : pcgparalocation;
         paraloc : pcgparalocation;
         retcgsize  : tcgsize;
         retcgsize  : tcgsize;
@@ -674,7 +674,7 @@ unit cpupara;
       end;
       end;
 
 
 
 
-    function taarch64paramanager.create_paraloc_info(p : tabstractprocdef; side: tcallercallee):longint;
+    function tcpuparamanager.create_paraloc_info(p : tabstractprocdef; side: tcallercallee):longint;
       var
       var
         cur_stack_offset: aword;
         cur_stack_offset: aword;
         curintreg, curfloatreg, curmmreg: tsuperregister;
         curintreg, curfloatreg, curmmreg: tsuperregister;
@@ -688,7 +688,7 @@ unit cpupara;
      end;
      end;
 
 
 
 
-    function taarch64paramanager.create_varargs_paraloc_info(p : tabstractprocdef; varargspara:tvarargsparalist):longint;
+    function tcpuparamanager.create_varargs_paraloc_info(p : tabstractprocdef; varargspara:tvarargsparalist):longint;
       var
       var
         cur_stack_offset: aword;
         cur_stack_offset: aword;
         curintreg, curfloatreg, curmmreg: tsuperregister;
         curintreg, curfloatreg, curmmreg: tsuperregister;
@@ -705,5 +705,5 @@ unit cpupara;
       end;
       end;
 
 
 begin
 begin
-   paramanager:=taarch64paramanager.create;
+   paramanager:=tcpuparamanager.create;
 end.
 end.

+ 5 - 5
compiler/alpha/cpupara.pas

@@ -31,7 +31,7 @@ unit cpupara;
        symconst,symbase,symtype,symdef,paramgr;
        symconst,symbase,symtype,symdef,paramgr;
 
 
     type
     type
-       talphaparamanager = class(tparamanager)
+       tcpuparamanager = class(tparamanager)
           function getintparaloc(nr : longint) : tparalocation;override;
           function getintparaloc(nr : longint) : tparalocation;override;
           procedure create_param_loc_info(p : tabstractprocdef);override;
           procedure create_param_loc_info(p : tabstractprocdef);override;
           function getfuncretparaloc(p : tabstractprocdef) : tparalocation;override;
           function getfuncretparaloc(p : tabstractprocdef) : tparalocation;override;
@@ -45,7 +45,7 @@ unit cpupara;
        cpuinfo,cginfo,cgbase,
        cpuinfo,cginfo,cgbase,
        defbase;
        defbase;
 
 
-    function talphaparamanager.getintparaloc(nr : longint) : tparalocation;
+    function tcpuparamanager.getintparaloc(nr : longint) : tparalocation;
 
 
       begin
       begin
          fillchar(result,sizeof(tparalocation),0);
          fillchar(result,sizeof(tparalocation),0);
@@ -119,7 +119,7 @@ unit cpupara;
          end;
          end;
       end;
       end;
 
 
-    procedure talphaparamanager.create_param_loc_info(p : tabstractprocdef);
+    procedure tcpuparamanager.create_param_loc_info(p : tabstractprocdef);
 
 
       var
       var
          nextintreg,nextfloatreg,nextmmreg : tregister;
          nextintreg,nextfloatreg,nextmmreg : tregister;
@@ -246,7 +246,7 @@ unit cpupara;
            end;
            end;
       end;
       end;
 
 
-    function talphaparamanager.getfuncretparaloc(p : tabstractprocdef) : tparalocation;
+    function tcpuparamanager.getfuncretparaloc(p : tabstractprocdef) : tparalocation;
       begin
       begin
          case p.returndef.typ of
          case p.returndef.typ of
             orddef,
             orddef,
@@ -286,5 +286,5 @@ unit cpupara;
 
 
 
 
 begin
 begin
-   paramanager:=talphaparamanager.create;
+   paramanager:=tcpuparamanager.create;
 end.
 end.

+ 13 - 13
compiler/arm/cpupara.pas

@@ -32,7 +32,7 @@ unit cpupara;
        symconst,symtype,symdef,parabase,paramgr;
        symconst,symtype,symdef,parabase,paramgr;
 
 
     type
     type
-       tarmparamanager = class(tparamanager)
+       tcpuparamanager = class(tparamanager)
           function get_volatile_registers_int(calloption : tproccalloption):tcpuregisterset;override;
           function get_volatile_registers_int(calloption : tproccalloption):tcpuregisterset;override;
           function get_volatile_registers_fpu(calloption : tproccalloption):tcpuregisterset;override;
           function get_volatile_registers_fpu(calloption : tproccalloption):tcpuregisterset;override;
           function get_volatile_registers_mm(calloption : tproccalloption):tcpuregisterset;override;
           function get_volatile_registers_mm(calloption : tproccalloption):tcpuregisterset;override;
@@ -57,7 +57,7 @@ unit cpupara;
        defutil,symsym,symtable;
        defutil,symsym,symtable;
 
 
 
 
-    function tarmparamanager.get_volatile_registers_int(calloption : tproccalloption):tcpuregisterset;
+    function tcpuparamanager.get_volatile_registers_int(calloption : tproccalloption):tcpuregisterset;
       begin
       begin
         if (target_info.system<>system_arm_darwin) then
         if (target_info.system<>system_arm_darwin) then
           result:=VOLATILE_INTREGISTERS
           result:=VOLATILE_INTREGISTERS
@@ -66,19 +66,19 @@ unit cpupara;
       end;
       end;
 
 
 
 
-    function tarmparamanager.get_volatile_registers_fpu(calloption : tproccalloption):tcpuregisterset;
+    function tcpuparamanager.get_volatile_registers_fpu(calloption : tproccalloption):tcpuregisterset;
       begin
       begin
         result:=VOLATILE_FPUREGISTERS;
         result:=VOLATILE_FPUREGISTERS;
       end;
       end;
 
 
 
 
-    function tarmparamanager.get_volatile_registers_mm(calloption: tproccalloption): tcpuregisterset;
+    function tcpuparamanager.get_volatile_registers_mm(calloption: tproccalloption): tcpuregisterset;
       begin
       begin
         result:=VOLATILE_MMREGISTERS;
         result:=VOLATILE_MMREGISTERS;
       end;
       end;
 
 
 
 
-    procedure tarmparamanager.getintparaloc(pd : tabstractprocdef; nr : longint; var cgpara : tcgpara);
+    procedure tcpuparamanager.getintparaloc(pd : tabstractprocdef; nr : longint; var cgpara : tcgpara);
       var
       var
         paraloc : pcgparalocation;
         paraloc : pcgparalocation;
         psym : tparavarsym;
         psym : tparavarsym;
@@ -177,7 +177,7 @@ unit cpupara;
       end;
       end;
 
 
 
 
-    function tarmparamanager.push_addr_param(varspez:tvarspez;def : tdef;calloption : tproccalloption) : boolean;
+    function tcpuparamanager.push_addr_param(varspez:tvarspez;def : tdef;calloption : tproccalloption) : boolean;
       begin
       begin
         result:=false;
         result:=false;
         if varspez in [vs_var,vs_out,vs_constref] then
         if varspez in [vs_var,vs_out,vs_constref] then
@@ -208,7 +208,7 @@ unit cpupara;
       end;
       end;
 
 
 
 
-    function tarmparamanager.ret_in_param(def:tdef;pd:tabstractprocdef):boolean;
+    function tcpuparamanager.ret_in_param(def:tdef;pd:tabstractprocdef):boolean;
       var
       var
         i: longint;
         i: longint;
         sym: tsym;
         sym: tsym;
@@ -291,7 +291,7 @@ unit cpupara;
       end;
       end;
 
 
 
 
-    procedure tarmparamanager.init_values(p : tabstractprocdef; side: tcallercallee;
+    procedure tcpuparamanager.init_values(p : tabstractprocdef; side: tcallercallee;
       var curintreg, curfloatreg, curmmreg: tsuperregister; var cur_stack_offset: aword; var sparesinglereg: tregister);
       var curintreg, curfloatreg, curmmreg: tsuperregister; var cur_stack_offset: aword; var sparesinglereg: tregister);
       begin
       begin
         curintreg:=RS_R0;
         curintreg:=RS_R0;
@@ -306,7 +306,7 @@ unit cpupara;
       end;
       end;
 
 
 
 
-    function tarmparamanager.create_paraloc_info_intern(p : tabstractprocdef; side: tcallercallee; paras: tparalist;
+    function tcpuparamanager.create_paraloc_info_intern(p : tabstractprocdef; side: tcallercallee; paras: tparalist;
         var curintreg, curfloatreg, curmmreg: tsuperregister; var cur_stack_offset: aword; var sparesinglereg: tregister; isvariadic: boolean):longint;
         var curintreg, curfloatreg, curmmreg: tsuperregister; var cur_stack_offset: aword; var sparesinglereg: tregister; isvariadic: boolean):longint;
 
 
       var
       var
@@ -613,7 +613,7 @@ unit cpupara;
       end;
       end;
 
 
 
 
-    function  tarmparamanager.get_funcretloc(p : tabstractprocdef; side: tcallercallee; forcetempdef: tdef): tcgpara;
+    function  tcpuparamanager.get_funcretloc(p : tabstractprocdef; side: tcallercallee; forcetempdef: tdef): tcgpara;
       var
       var
         paraloc : pcgparalocation;
         paraloc : pcgparalocation;
         retcgsize  : tcgsize;
         retcgsize  : tcgsize;
@@ -729,7 +729,7 @@ unit cpupara;
       end;
       end;
 
 
 
 
-    function tarmparamanager.create_paraloc_info(p : tabstractprocdef; side: tcallercallee):longint;
+    function tcpuparamanager.create_paraloc_info(p : tabstractprocdef; side: tcallercallee):longint;
       var
       var
         cur_stack_offset: aword;
         cur_stack_offset: aword;
         curintreg, curfloatreg, curmmreg: tsuperregister;
         curintreg, curfloatreg, curmmreg: tsuperregister;
@@ -743,7 +743,7 @@ unit cpupara;
      end;
      end;
 
 
 
 
-    function tarmparamanager.create_varargs_paraloc_info(p : tabstractprocdef; varargspara:tvarargsparalist):longint;
+    function tcpuparamanager.create_varargs_paraloc_info(p : tabstractprocdef; varargspara:tvarargsparalist):longint;
       var
       var
         cur_stack_offset: aword;
         cur_stack_offset: aword;
         curintreg, curfloatreg, curmmreg: tsuperregister;
         curintreg, curfloatreg, curmmreg: tsuperregister;
@@ -760,5 +760,5 @@ unit cpupara;
       end;
       end;
 
 
 begin
 begin
-   paramanager:=tarmparamanager.create;
+   paramanager:=tcpuparamanager.create;
 end.
 end.

+ 14 - 14
compiler/avr/cpupara.pas

@@ -33,7 +33,7 @@ unit cpupara;
        symconst,symbase,symtype,symdef,parabase,paramgr;
        symconst,symbase,symtype,symdef,parabase,paramgr;
 
 
     type
     type
-       tavrparamanager = class(tparamanager)
+       tcpuparamanager = class(tparamanager)
           function get_volatile_registers_int(calloption : tproccalloption):tcpuregisterset;override;
           function get_volatile_registers_int(calloption : tproccalloption):tcpuregisterset;override;
           function get_volatile_registers_fpu(calloption : tproccalloption):tcpuregisterset;override;
           function get_volatile_registers_fpu(calloption : tproccalloption):tcpuregisterset;override;
           function push_addr_param(varspez:tvarspez;def : tdef;calloption : tproccalloption) : boolean;override;
           function push_addr_param(varspez:tvarspez;def : tdef;calloption : tproccalloption) : boolean;override;
@@ -56,19 +56,19 @@ unit cpupara;
        defutil,symsym;
        defutil,symsym;
 
 
 
 
-    function tavrparamanager.get_volatile_registers_int(calloption : tproccalloption):tcpuregisterset;
+    function tcpuparamanager.get_volatile_registers_int(calloption : tproccalloption):tcpuregisterset;
       begin
       begin
         result:=VOLATILE_INTREGISTERS;
         result:=VOLATILE_INTREGISTERS;
       end;
       end;
 
 
 
 
-    function tavrparamanager.get_volatile_registers_fpu(calloption : tproccalloption):tcpuregisterset;
+    function tcpuparamanager.get_volatile_registers_fpu(calloption : tproccalloption):tcpuregisterset;
       begin
       begin
         result:=VOLATILE_FPUREGISTERS;
         result:=VOLATILE_FPUREGISTERS;
       end;
       end;
 
 
 
 
-    procedure tavrparamanager.getintparaloc(pd : tabstractprocdef; nr : longint; var cgpara : tcgpara);
+    procedure tcpuparamanager.getintparaloc(pd : tabstractprocdef; nr : longint; var cgpara : tcgpara);
       var
       var
         paraloc : pcgparalocation;
         paraloc : pcgparalocation;
         psym: tparavarsym;
         psym: tparavarsym;
@@ -156,7 +156,7 @@ unit cpupara;
       end;
       end;
 
 
 
 
-    function tavrparamanager.push_addr_param(varspez:tvarspez;def : tdef;calloption : tproccalloption) : boolean;
+    function tcpuparamanager.push_addr_param(varspez:tvarspez;def : tdef;calloption : tproccalloption) : boolean;
       begin
       begin
         result:=false;
         result:=false;
         if varspez in [vs_var,vs_out,vs_constref] then
         if varspez in [vs_var,vs_out,vs_constref] then
@@ -185,7 +185,7 @@ unit cpupara;
       end;
       end;
 
 
 
 
-    function tavrparamanager.ret_in_param(def:tdef;pd:tabstractprocdef):boolean;
+    function tcpuparamanager.ret_in_param(def:tdef;pd:tabstractprocdef):boolean;
       begin
       begin
         if handle_common_ret_in_param(def,pd,result) then
         if handle_common_ret_in_param(def,pd,result) then
           exit;
           exit;
@@ -207,7 +207,7 @@ unit cpupara;
       end;
       end;
 
 
 
 
-    procedure tavrparamanager.init_values(var curintreg, curfloatreg, curmmreg: tsuperregister; var cur_stack_offset: aword);
+    procedure tcpuparamanager.init_values(var curintreg, curfloatreg, curmmreg: tsuperregister; var cur_stack_offset: aword);
       begin
       begin
         curintreg:=RS_R25;
         curintreg:=RS_R25;
         curfloatreg:=RS_INVALID;
         curfloatreg:=RS_INVALID;
@@ -216,8 +216,8 @@ unit cpupara;
       end;
       end;
 
 
 
 
-    { TODO : fix tavrparamanager.create_paraloc_info_intern }
-    function tavrparamanager.create_paraloc_info_intern(p : tabstractprocdef; side: tcallercallee; paras: tparalist;
+    { TODO : fix tcpuparamanager.create_paraloc_info_intern }
+    function tcpuparamanager.create_paraloc_info_intern(p : tabstractprocdef; side: tcallercallee; paras: tparalist;
         var curintreg, curfloatreg, curmmreg: tsuperregister; var cur_stack_offset: aword):longint;
         var curintreg, curfloatreg, curmmreg: tsuperregister; var cur_stack_offset: aword):longint;
 
 
       var
       var
@@ -415,7 +415,7 @@ unit cpupara;
       end;
       end;
 
 
 
 
-    function tavrparamanager.create_paraloc_info(p : tabstractprocdef; side: tcallercallee):longint;
+    function tcpuparamanager.create_paraloc_info(p : tabstractprocdef; side: tcallercallee):longint;
       var
       var
         cur_stack_offset: aword;
         cur_stack_offset: aword;
         curintreg, curfloatreg, curmmreg: tsuperregister;
         curintreg, curfloatreg, curmmreg: tsuperregister;
@@ -429,8 +429,8 @@ unit cpupara;
      end;
      end;
 
 
 
 
-    { TODO : fix tavrparamanager.get_funcretloc }
-    function  tavrparamanager.get_funcretloc(p : tabstractprocdef; side: tcallercallee; forcetempdef: tdef): tcgpara;
+    { TODO : fix tcpuparamanager.get_funcretloc }
+    function  tcpuparamanager.get_funcretloc(p : tabstractprocdef; side: tcallercallee; forcetempdef: tdef): tcgpara;
       var
       var
         retcgsize : tcgsize;
         retcgsize : tcgsize;
         paraloc : pcgparalocation;
         paraloc : pcgparalocation;
@@ -504,7 +504,7 @@ unit cpupara;
       end;
       end;
 
 
 
 
-    function tavrparamanager.create_varargs_paraloc_info(p : tabstractprocdef; varargspara:tvarargsparalist):longint;
+    function tcpuparamanager.create_varargs_paraloc_info(p : tabstractprocdef; varargspara:tvarargsparalist):longint;
       var
       var
         cur_stack_offset: aword;
         cur_stack_offset: aword;
         curintreg, curfloatreg, curmmreg: tsuperregister;
         curintreg, curfloatreg, curmmreg: tsuperregister;
@@ -520,5 +520,5 @@ unit cpupara;
       end;
       end;
 
 
 begin
 begin
-   paramanager:=tavrparamanager.create;
+   paramanager:=tcpuparamanager.create;
 end.
 end.

+ 17 - 17
compiler/i386/cpupara.pas

@@ -32,7 +32,7 @@ unit cpupara;
        parabase,paramgr;
        parabase,paramgr;
 
 
     type
     type
-       ti386paramanager = class(tparamanager)
+       tcpuparamanager = class(tparamanager)
           function param_use_paraloc(const cgpara:tcgpara):boolean;override;
           function param_use_paraloc(const cgpara:tcgpara):boolean;override;
           function ret_in_param(def:tdef;pd:tabstractprocdef):boolean;override;
           function ret_in_param(def:tdef;pd:tabstractprocdef):boolean;override;
           function push_addr_param(varspez:tvarspez;def : tdef;calloption : tproccalloption) : boolean;override;
           function push_addr_param(varspez:tvarspez;def : tdef;calloption : tproccalloption) : boolean;override;
@@ -68,10 +68,10 @@ unit cpupara;
         parasupregs : array[0..2] of tsuperregister = (RS_EAX,RS_EDX,RS_ECX);
         parasupregs : array[0..2] of tsuperregister = (RS_EAX,RS_EDX,RS_ECX);
 
 
 {****************************************************************************
 {****************************************************************************
-                                TI386PARAMANAGER
+                                tcpuparamanager
 ****************************************************************************}
 ****************************************************************************}
 
 
-    function ti386paramanager.param_use_paraloc(const cgpara:tcgpara):boolean;
+    function tcpuparamanager.param_use_paraloc(const cgpara:tcgpara):boolean;
       var
       var
         paraloc : pcgparalocation;
         paraloc : pcgparalocation;
       begin
       begin
@@ -92,7 +92,7 @@ unit cpupara;
       end;
       end;
 
 
 
 
-    function ti386paramanager.ret_in_param(def:tdef;pd:tabstractprocdef):boolean;
+    function tcpuparamanager.ret_in_param(def:tdef;pd:tabstractprocdef):boolean;
       var
       var
         size: longint;
         size: longint;
       begin
       begin
@@ -153,7 +153,7 @@ unit cpupara;
       end;
       end;
 
 
 
 
-    function ti386paramanager.push_addr_param(varspez:tvarspez;def : tdef;calloption : tproccalloption) : boolean;
+    function tcpuparamanager.push_addr_param(varspez:tvarspez;def : tdef;calloption : tproccalloption) : boolean;
       begin
       begin
         result:=false;
         result:=false;
         { var,out,constref always require address }
         { var,out,constref always require address }
@@ -226,7 +226,7 @@ unit cpupara;
       end;
       end;
 
 
 
 
-    function ti386paramanager.get_para_align(calloption : tproccalloption):byte;
+    function tcpuparamanager.get_para_align(calloption : tproccalloption):byte;
       begin
       begin
         if calloption=pocall_oldfpccall then
         if calloption=pocall_oldfpccall then
           begin
           begin
@@ -240,7 +240,7 @@ unit cpupara;
       end;
       end;
 
 
 
 
-    function ti386paramanager.get_volatile_registers_int(calloption : tproccalloption):tcpuregisterset;
+    function tcpuparamanager.get_volatile_registers_int(calloption : tproccalloption):tcpuregisterset;
       begin
       begin
         case calloption of
         case calloption of
           pocall_internproc :
           pocall_internproc :
@@ -262,19 +262,19 @@ unit cpupara;
       end;
       end;
 
 
 
 
-    function ti386paramanager.get_volatile_registers_fpu(calloption : tproccalloption):tcpuregisterset;
+    function tcpuparamanager.get_volatile_registers_fpu(calloption : tproccalloption):tcpuregisterset;
       begin
       begin
         result:=[0..first_fpu_imreg-1];
         result:=[0..first_fpu_imreg-1];
       end;
       end;
 
 
 
 
-    function ti386paramanager.get_volatile_registers_mm(calloption : tproccalloption):tcpuregisterset;
+    function tcpuparamanager.get_volatile_registers_mm(calloption : tproccalloption):tcpuregisterset;
       begin
       begin
         result:=[0..first_mm_imreg-1];
         result:=[0..first_mm_imreg-1];
       end;
       end;
 
 
 
 
-    procedure ti386paramanager.getintparaloc(pd : tabstractprocdef; nr : longint; var cgpara : tcgpara);
+    procedure tcpuparamanager.getintparaloc(pd : tabstractprocdef; nr : longint; var cgpara : tcgpara);
       var
       var
         paraloc : pcgparalocation;
         paraloc : pcgparalocation;
         psym: tparavarsym;
         psym: tparavarsym;
@@ -321,7 +321,7 @@ unit cpupara;
       end;
       end;
 
 
 
 
-    function  ti386paramanager.get_funcretloc(p : tabstractprocdef; side: tcallercallee; forcetempdef: tdef): TCGPara;
+    function  tcpuparamanager.get_funcretloc(p : tabstractprocdef; side: tcallercallee; forcetempdef: tdef): TCGPara;
       var
       var
         retcgsize  : tcgsize;
         retcgsize  : tcgsize;
         paraloc : pcgparalocation;
         paraloc : pcgparalocation;
@@ -412,7 +412,7 @@ unit cpupara;
       end;
       end;
 
 
 
 
-    procedure ti386paramanager.create_stdcall_paraloc_info(p : tabstractprocdef; side: tcallercallee;paras:tparalist;var parasize:longint);
+    procedure tcpuparamanager.create_stdcall_paraloc_info(p : tabstractprocdef; side: tcallercallee;paras:tparalist;var parasize:longint);
       var
       var
         i  : integer;
         i  : integer;
         hp : tparavarsym;
         hp : tparavarsym;
@@ -561,7 +561,7 @@ unit cpupara;
       end;
       end;
 
 
 
 
-    procedure ti386paramanager.create_register_paraloc_info(p : tabstractprocdef; side: tcallercallee;paras:tparalist;
+    procedure tcpuparamanager.create_register_paraloc_info(p : tabstractprocdef; side: tcallercallee;paras:tparalist;
                                                             var parareg,parasize:longint);
                                                             var parareg,parasize:longint);
       var
       var
         hp : tparavarsym;
         hp : tparavarsym;
@@ -734,7 +734,7 @@ unit cpupara;
       end;
       end;
 
 
 
 
-    function ti386paramanager.create_paraloc_info(p : tabstractprocdef; side: tcallercallee):longint;
+    function tcpuparamanager.create_paraloc_info(p : tabstractprocdef; side: tcallercallee):longint;
       var
       var
         parasize,
         parasize,
         parareg : longint;
         parareg : longint;
@@ -762,7 +762,7 @@ unit cpupara;
       end;
       end;
 
 
 
 
-    function ti386paramanager.create_varargs_paraloc_info(p : tabstractprocdef; varargspara:tvarargsparalist):longint;
+    function tcpuparamanager.create_varargs_paraloc_info(p : tabstractprocdef; varargspara:tvarargsparalist):longint;
       var
       var
         parasize : longint;
         parasize : longint;
       begin
       begin
@@ -775,7 +775,7 @@ unit cpupara;
       end;
       end;
 
 
 
 
-    procedure ti386paramanager.createtempparaloc(list: TAsmList;calloption : tproccalloption;parasym : tparavarsym;can_use_final_stack_loc : boolean;var cgpara:TCGPara);
+    procedure tcpuparamanager.createtempparaloc(list: TAsmList;calloption : tproccalloption;parasym : tparavarsym;can_use_final_stack_loc : boolean;var cgpara:TCGPara);
       begin
       begin
         { Never a need for temps when value is pushed (calls inside parameters
         { Never a need for temps when value is pushed (calls inside parameters
           will simply allocate even more stack space for their parameters) }
           will simply allocate even more stack space for their parameters) }
@@ -786,5 +786,5 @@ unit cpupara;
 
 
 
 
 begin
 begin
-   paramanager:=ti386paramanager.create;
+   paramanager:=tcpuparamanager.create;
 end.
 end.

+ 17 - 17
compiler/i8086/cpupara.pas

@@ -32,7 +32,7 @@ unit cpupara;
        parabase,paramgr;
        parabase,paramgr;
 
 
     type
     type
-       ti8086paramanager = class(tparamanager)
+       tcpuparamanager = class(tparamanager)
           function param_use_paraloc(const cgpara:tcgpara):boolean;override;
           function param_use_paraloc(const cgpara:tcgpara):boolean;override;
           function ret_in_param(def:tdef;pd:tabstractprocdef):boolean;override;
           function ret_in_param(def:tdef;pd:tabstractprocdef):boolean;override;
           function push_addr_param(varspez:tvarspez;def : tdef;calloption : tproccalloption) : boolean;override;
           function push_addr_param(varspez:tvarspez;def : tdef;calloption : tproccalloption) : boolean;override;
@@ -74,10 +74,10 @@ unit cpupara;
         parasupregs : array[0..2] of tsuperregister = (RS_AX,RS_DX,RS_CX);
         parasupregs : array[0..2] of tsuperregister = (RS_AX,RS_DX,RS_CX);
 
 
 {****************************************************************************
 {****************************************************************************
-                                ti8086paramanager
+                                tcpuparamanager
 ****************************************************************************}
 ****************************************************************************}
 
 
-    function ti8086paramanager.param_use_paraloc(const cgpara:tcgpara):boolean;
+    function tcpuparamanager.param_use_paraloc(const cgpara:tcgpara):boolean;
       var
       var
         paraloc : pcgparalocation;
         paraloc : pcgparalocation;
       begin
       begin
@@ -98,7 +98,7 @@ unit cpupara;
       end;
       end;
 
 
 
 
-    function ti8086paramanager.ret_in_param(def:tdef;pd:tabstractprocdef):boolean;
+    function tcpuparamanager.ret_in_param(def:tdef;pd:tabstractprocdef):boolean;
       var
       var
         size: longint;
         size: longint;
       begin
       begin
@@ -115,7 +115,7 @@ unit cpupara;
       end;
       end;
 
 
 
 
-    function ti8086paramanager.push_addr_param(varspez:tvarspez;def : tdef;calloption : tproccalloption) : boolean;
+    function tcpuparamanager.push_addr_param(varspez:tvarspez;def : tdef;calloption : tproccalloption) : boolean;
       begin
       begin
         result:=false;
         result:=false;
         { var,out,constref always require address }
         { var,out,constref always require address }
@@ -188,13 +188,13 @@ unit cpupara;
       end;
       end;
 
 
 
 
-    function ti8086paramanager.get_para_align(calloption : tproccalloption):byte;
+    function tcpuparamanager.get_para_align(calloption : tproccalloption):byte;
       begin
       begin
         result:=std_param_align;
         result:=std_param_align;
       end;
       end;
 
 
 
 
-    function ti8086paramanager.get_volatile_registers_int(calloption : tproccalloption):tcpuregisterset;
+    function tcpuparamanager.get_volatile_registers_int(calloption : tproccalloption):tcpuregisterset;
       begin
       begin
         case calloption of
         case calloption of
           pocall_internproc :
           pocall_internproc :
@@ -215,19 +215,19 @@ unit cpupara;
       end;
       end;
 
 
 
 
-    function ti8086paramanager.get_volatile_registers_fpu(calloption : tproccalloption):tcpuregisterset;
+    function tcpuparamanager.get_volatile_registers_fpu(calloption : tproccalloption):tcpuregisterset;
       begin
       begin
         result:=[0..first_fpu_imreg-1];
         result:=[0..first_fpu_imreg-1];
       end;
       end;
 
 
 
 
-    function ti8086paramanager.get_volatile_registers_mm(calloption : tproccalloption):tcpuregisterset;
+    function tcpuparamanager.get_volatile_registers_mm(calloption : tproccalloption):tcpuregisterset;
       begin
       begin
         result:=[0..first_mm_imreg-1];
         result:=[0..first_mm_imreg-1];
       end;
       end;
 
 
 
 
-    procedure ti8086paramanager.getintparaloc(pd : tabstractprocdef; nr : longint; var cgpara : tcgpara);
+    procedure tcpuparamanager.getintparaloc(pd : tabstractprocdef; nr : longint; var cgpara : tcgpara);
       var
       var
         paraloc : pcgparalocation;
         paraloc : pcgparalocation;
         psym: tparavarsym;
         psym: tparavarsym;
@@ -274,7 +274,7 @@ unit cpupara;
       end;
       end;
 
 
 
 
-    function  ti8086paramanager.get_funcretloc(p : tabstractprocdef; side: tcallercallee; forcetempdef: tdef): TCGPara;
+    function  tcpuparamanager.get_funcretloc(p : tabstractprocdef; side: tcallercallee; forcetempdef: tdef): TCGPara;
       var
       var
         retcgsize  : tcgsize;
         retcgsize  : tcgsize;
         paraloc : pcgparalocation;
         paraloc : pcgparalocation;
@@ -405,7 +405,7 @@ unit cpupara;
       end;
       end;
 
 
 
 
-    procedure ti8086paramanager.create_stdcall_paraloc_info(p : tabstractprocdef; side: tcallercallee;paras:tparalist;var parasize:longint);
+    procedure tcpuparamanager.create_stdcall_paraloc_info(p : tabstractprocdef; side: tcallercallee;paras:tparalist;var parasize:longint);
       var
       var
         i  : integer;
         i  : integer;
         hp : tparavarsym;
         hp : tparavarsym;
@@ -562,7 +562,7 @@ unit cpupara;
       end;
       end;
 
 
 
 
-    procedure ti8086paramanager.create_register_paraloc_info(p : tabstractprocdef; side: tcallercallee;paras:tparalist;
+    procedure tcpuparamanager.create_register_paraloc_info(p : tabstractprocdef; side: tcallercallee;paras:tparalist;
                                                             var parareg,parasize:longint);
                                                             var parareg,parasize:longint);
       var
       var
         hp : tparavarsym;
         hp : tparavarsym;
@@ -743,7 +743,7 @@ unit cpupara;
       end;
       end;
 
 
 
 
-    function ti8086paramanager.create_paraloc_info(p : tabstractprocdef; side: tcallercallee):longint;
+    function tcpuparamanager.create_paraloc_info(p : tabstractprocdef; side: tcallercallee):longint;
       var
       var
         parasize,
         parasize,
         parareg : longint;
         parareg : longint;
@@ -771,7 +771,7 @@ unit cpupara;
       end;
       end;
 
 
 
 
-    function ti8086paramanager.create_varargs_paraloc_info(p : tabstractprocdef; varargspara:tvarargsparalist):longint;
+    function tcpuparamanager.create_varargs_paraloc_info(p : tabstractprocdef; varargspara:tvarargsparalist):longint;
       var
       var
         parasize : longint;
         parasize : longint;
       begin
       begin
@@ -784,7 +784,7 @@ unit cpupara;
       end;
       end;
 
 
 
 
-    procedure ti8086paramanager.createtempparaloc(list: TAsmList;calloption : tproccalloption;parasym : tparavarsym;can_use_final_stack_loc : boolean;var cgpara:TCGPara);
+    procedure tcpuparamanager.createtempparaloc(list: TAsmList;calloption : tproccalloption;parasym : tparavarsym;can_use_final_stack_loc : boolean;var cgpara:TCGPara);
       begin
       begin
         { Never a need for temps when value is pushed (calls inside parameters
         { Never a need for temps when value is pushed (calls inside parameters
           will simply allocate even more stack space for their parameters) }
           will simply allocate even more stack space for their parameters) }
@@ -795,5 +795,5 @@ unit cpupara;
 
 
 
 
 begin
 begin
-   paramanager:=ti8086paramanager.create;
+   paramanager:=tcpuparamanager.create;
 end.
 end.

+ 16 - 16
compiler/jvm/cpupara.pas

@@ -32,9 +32,9 @@ interface
 
 
     type
     type
 
 
-      { TJVMParaManager }
+      { tcpuparamanager }
 
 
-      TJVMParaManager=class(TParaManager)
+      tcpuparamanager=class(TParaManager)
         function  push_high_param(varspez:tvarspez;def : tdef;calloption : tproccalloption) : boolean;override;
         function  push_high_param(varspez:tvarspez;def : tdef;calloption : tproccalloption) : boolean;override;
         function  keep_para_array_range(varspez: tvarspez; def: tdef; calloption: tproccalloption): boolean; override;
         function  keep_para_array_range(varspez: tvarspez; def: tdef; calloption: tproccalloption): boolean; override;
         function  push_addr_param(varspez:tvarspez;def : tdef;calloption : tproccalloption) : boolean;override;
         function  push_addr_param(varspez:tvarspez;def : tdef;calloption : tproccalloption) : boolean;override;
@@ -64,13 +64,13 @@ implementation
       hlcgobj;
       hlcgobj;
 
 
 
 
-    procedure TJVMParaManager.GetIntParaLoc(pd : tabstractprocdef; nr : longint; var cgpara : tcgpara);
+    procedure tcpuparamanager.GetIntParaLoc(pd : tabstractprocdef; nr : longint; var cgpara : tcgpara);
       begin
       begin
         { not yet implemented/used }
         { not yet implemented/used }
         internalerror(2010121001);
         internalerror(2010121001);
       end;
       end;
 
 
-    function TJVMParaManager.push_high_param(varspez: tvarspez; def: tdef; calloption: tproccalloption): boolean;
+    function tcpuparamanager.push_high_param(varspez: tvarspez; def: tdef; calloption: tproccalloption): boolean;
       begin
       begin
         { we don't need a separate high parameter, since all arrays in Java
         { we don't need a separate high parameter, since all arrays in Java
           have an implicit associated length }
           have an implicit associated length }
@@ -82,7 +82,7 @@ implementation
       end;
       end;
 
 
 
 
-    function TJVMParaManager.keep_para_array_range(varspez: tvarspez; def: tdef; calloption: tproccalloption): boolean;
+    function tcpuparamanager.keep_para_array_range(varspez: tvarspez; def: tdef; calloption: tproccalloption): boolean;
       begin
       begin
         { even though these don't need a high parameter (see push_high_param),
         { even though these don't need a high parameter (see push_high_param),
           we do have to keep the original parameter's array length because it's
           we do have to keep the original parameter's array length because it's
@@ -96,7 +96,7 @@ implementation
 
 
 
 
     { true if a parameter is too large to copy and only the address is pushed }
     { true if a parameter is too large to copy and only the address is pushed }
-    function TJVMParaManager.push_addr_param(varspez:tvarspez;def : tdef;calloption : tproccalloption) : boolean;
+    function tcpuparamanager.push_addr_param(varspez:tvarspez;def : tdef;calloption : tproccalloption) : boolean;
       begin
       begin
         result:=
         result:=
           jvmimplicitpointertype(def) or
           jvmimplicitpointertype(def) or
@@ -105,7 +105,7 @@ implementation
       end;
       end;
 
 
 
 
-    function TJVMParaManager.push_copyout_param(varspez: tvarspez; def: tdef; calloption: tproccalloption): boolean;
+    function tcpuparamanager.push_copyout_param(varspez: tvarspez; def: tdef; calloption: tproccalloption): boolean;
       begin
       begin
         { in principle also for vs_constref, but since we can't have real
         { in principle also for vs_constref, but since we can't have real
           references, that won't make a difference }
           references, that won't make a difference }
@@ -115,7 +115,7 @@ implementation
       end;
       end;
 
 
 
 
-    function TJVMParaManager.push_size(varspez: tvarspez; def: tdef; calloption: tproccalloption): longint;
+    function tcpuparamanager.push_size(varspez: tvarspez; def: tdef; calloption: tproccalloption): longint;
       begin
       begin
         { all aggregate types are emulated using indirect pointer types }
         { all aggregate types are emulated using indirect pointer types }
         if def.typ in [arraydef,recorddef,setdef,stringdef] then
         if def.typ in [arraydef,recorddef,setdef,stringdef] then
@@ -125,7 +125,7 @@ implementation
       end;
       end;
 
 
 
 
-    function TJVMParaManager.get_funcretloc(p : tabstractprocdef; side: tcallercallee; forcetempdef: tdef): tcgpara;
+    function tcpuparamanager.get_funcretloc(p : tabstractprocdef; side: tcallercallee; forcetempdef: tdef): tcgpara;
       var
       var
         paraloc : pcgparalocation;
         paraloc : pcgparalocation;
         retcgsize  : tcgsize;
         retcgsize  : tcgsize;
@@ -178,13 +178,13 @@ implementation
         paraloc^.def:=result.def;
         paraloc^.def:=result.def;
       end;
       end;
 
 
-    function TJVMParaManager.param_use_paraloc(const cgpara: tcgpara): boolean;
+    function tcpuparamanager.param_use_paraloc(const cgpara: tcgpara): boolean;
       begin
       begin
         { all parameters are copied by the VM to local variable locations }
         { all parameters are copied by the VM to local variable locations }
         result:=true;
         result:=true;
       end;
       end;
 
 
-    function TJVMParaManager.ret_in_param(def:tdef;pd:tabstractprocdef):boolean;
+    function tcpuparamanager.ret_in_param(def:tdef;pd:tabstractprocdef):boolean;
       begin
       begin
         { not as efficient as returning in param for jvmimplicitpointertypes,
         { not as efficient as returning in param for jvmimplicitpointertypes,
           but in the latter case the routines are harder to use from Java
           but in the latter case the routines are harder to use from Java
@@ -193,14 +193,14 @@ implementation
         Result:=false;
         Result:=false;
       end;
       end;
 
 
-    function TJVMParaManager.is_stack_paraloc(paraloc: pcgparalocation): boolean;
+    function tcpuparamanager.is_stack_paraloc(paraloc: pcgparalocation): boolean;
       begin
       begin
         { all parameters are passed on the evaluation stack }
         { all parameters are passed on the evaluation stack }
         result:=true;
         result:=true;
       end;
       end;
 
 
 
 
-    function TJVMParaManager.create_varargs_paraloc_info(p : tabstractprocdef; varargspara:tvarargsparalist):longint;
+    function tcpuparamanager.create_varargs_paraloc_info(p : tabstractprocdef; varargspara:tvarargsparalist):longint;
       var
       var
         parasize : longint;
         parasize : longint;
       begin
       begin
@@ -213,7 +213,7 @@ implementation
       end;
       end;
 
 
 
 
-    procedure TJVMParaManager.create_paraloc_info_intern(p : tabstractprocdef; side: tcallercallee;paras:tparalist;
+    procedure tcpuparamanager.create_paraloc_info_intern(p : tabstractprocdef; side: tcallercallee;paras:tparalist;
                                                            var parasize:longint);
                                                            var parasize:longint);
       var
       var
         paraloc      : pcgparalocation;
         paraloc      : pcgparalocation;
@@ -288,7 +288,7 @@ implementation
       end;
       end;
 
 
 
 
-    function TJVMParaManager.create_paraloc_info(p : tabstractprocdef; side: tcallercallee):longint;
+    function tcpuparamanager.create_paraloc_info(p : tabstractprocdef; side: tcallercallee):longint;
       var
       var
         parasize : longint;
         parasize : longint;
       begin
       begin
@@ -302,5 +302,5 @@ implementation
 
 
 
 
 begin
 begin
-   ParaManager:=TJVMParaManager.create;
+   ParaManager:=tcpuparamanager.create;
 end.
 end.

+ 14 - 14
compiler/m68k/cpupara.pas

@@ -40,7 +40,7 @@ unit cpupara;
          and if the calling conventions for the helper routines of the
          and if the calling conventions for the helper routines of the
          rtl are used.
          rtl are used.
        }
        }
-       tm68kparamanager = class(tparamanager)
+       tcpuparamanager = class(tparamanager)
           procedure getintparaloc(pd : tabstractprocdef; nr : longint; var cgpara : tcgpara);override;
           procedure getintparaloc(pd : tabstractprocdef; nr : longint; var cgpara : tcgpara);override;
           function create_paraloc_info(p : tabstractprocdef; side: tcallercallee):longint;override;
           function create_paraloc_info(p : tabstractprocdef; side: tcallercallee):longint;override;
           function push_addr_param(varspez:tvarspez;def : tdef;calloption : tproccalloption) : boolean;override;
           function push_addr_param(varspez:tvarspez;def : tdef;calloption : tproccalloption) : boolean;override;
@@ -66,7 +66,7 @@ unit cpupara;
        cpuinfo,
        cpuinfo,
        defutil;
        defutil;
 
 
-    procedure tm68kparamanager.getintparaloc(pd : tabstractprocdef; nr : longint; var cgpara : tcgpara);
+    procedure tcpuparamanager.getintparaloc(pd : tabstractprocdef; nr : longint; var cgpara : tcgpara);
       var
       var
         paraloc : pcgparalocation;
         paraloc : pcgparalocation;
         psym: tparavarsym;
         psym: tparavarsym;
@@ -158,7 +158,7 @@ unit cpupara;
 
 
 
 
 { TODO: copied from ppc cg, needs work}
 { TODO: copied from ppc cg, needs work}
-    function tm68kparamanager.push_addr_param(varspez:tvarspez;def : tdef;calloption : tproccalloption) : boolean;
+    function tcpuparamanager.push_addr_param(varspez:tvarspez;def : tdef;calloption : tproccalloption) : boolean;
       begin
       begin
         result:=false;
         result:=false;
         { var,out,constref always require address }
         { var,out,constref always require address }
@@ -189,14 +189,14 @@ unit cpupara;
         end;
         end;
       end;
       end;
 
 
-    procedure tm68kparamanager.init_values(var curintreg, curfloatreg: tsuperregister; var cur_stack_offset: aword);
+    procedure tcpuparamanager.init_values(var curintreg, curfloatreg: tsuperregister; var cur_stack_offset: aword);
       begin
       begin
         cur_stack_offset:=8;
         cur_stack_offset:=8;
         curintreg:=RS_D0;
         curintreg:=RS_D0;
         curfloatreg:=RS_FP0;
         curfloatreg:=RS_FP0;
       end;
       end;
 
 
-    function tm68kparamanager.get_funcretloc(p : tabstractprocdef; side: tcallercallee; forcetempdef: tdef): tcgpara;
+    function tcpuparamanager.get_funcretloc(p : tabstractprocdef; side: tcallercallee; forcetempdef: tdef): tcgpara;
       var
       var
         paraloc : pcgparalocation;
         paraloc : pcgparalocation;
         retcgsize  : tcgsize;
         retcgsize  : tcgsize;
@@ -250,7 +250,7 @@ unit cpupara;
           end;
           end;
       end;
       end;
 
 
-    function tm68kparamanager.create_paraloc_info(p : tabstractprocdef; side: tcallercallee):longint;
+    function tcpuparamanager.create_paraloc_info(p : tabstractprocdef; side: tcallercallee):longint;
       var
       var
         cur_stack_offset: aword;
         cur_stack_offset: aword;
         curintreg, curfloatreg: tsuperregister;
         curintreg, curfloatreg: tsuperregister;
@@ -262,7 +262,7 @@ unit cpupara;
         create_funcretloc_info(p,side);
         create_funcretloc_info(p,side);
       end;
       end;
 
 
-    function tm68kparamanager.create_paraloc_info_intern(p : tabstractprocdef; side: tcallercallee; paras: tparalist;
+    function tcpuparamanager.create_paraloc_info_intern(p : tabstractprocdef; side: tcallercallee; paras: tparalist;
                                var curintreg, curfloatreg: tsuperregister; var cur_stack_offset: aword):longint;
                                var curintreg, curfloatreg: tsuperregister; var cur_stack_offset: aword):longint;
       var
       var
         paraloc      : pcgparalocation;
         paraloc      : pcgparalocation;
@@ -445,7 +445,7 @@ unit cpupara;
       end;
       end;
 }
 }
 
 
-    function tm68kparamanager.parsefuncretloc(p : tabstractprocdef; const s : string) : boolean;
+    function tcpuparamanager.parsefuncretloc(p : tabstractprocdef; const s : string) : boolean;
       begin
       begin
         result:=false;
         result:=false;
         case target_info.system of
         case target_info.system of
@@ -494,7 +494,7 @@ unit cpupara;
         end;
         end;
       end;
       end;
 
 
-    function tm68kparamanager.get_volatile_registers_int(calloption:tproccalloption):tcpuregisterset;
+    function tcpuparamanager.get_volatile_registers_int(calloption:tproccalloption):tcpuregisterset;
       begin
       begin
         { d0 and d1 are considered volatile (ToDo: results in "procedure too
         { d0 and d1 are considered volatile (ToDo: results in "procedure too
           complex when compiling unicodedata.pas) }
           complex when compiling unicodedata.pas) }
@@ -503,14 +503,14 @@ unit cpupara;
       end;
       end;
 
 
 
 
-    function tm68kparamanager.get_volatile_registers_address(calloption:tproccalloption):tcpuregisterset;
+    function tcpuparamanager.get_volatile_registers_address(calloption:tproccalloption):tcpuregisterset;
       begin
       begin
         { a0 and a1 are considered volatile }
         { a0 and a1 are considered volatile }
         Result:=[RS_A0,RS_A1];
         Result:=[RS_A0,RS_A1];
       end;
       end;
 
 
 
 
-    function tm68kparamanager.parseparaloc(p : tparavarsym;const s : string) : boolean;
+    function tcpuparamanager.parseparaloc(p : tparavarsym;const s : string) : boolean;
       var
       var
         paraloc : pcgparalocation;
         paraloc : pcgparalocation;
       begin
       begin
@@ -570,7 +570,7 @@ unit cpupara;
       end;
       end;
 
 
 
 
-    procedure tm68kparamanager.createtempparaloc(list: TAsmList;calloption : tproccalloption;parasym : tparavarsym;can_use_final_stack_loc : boolean;var cgpara:TCGPara);
+    procedure tcpuparamanager.createtempparaloc(list: TAsmList;calloption : tproccalloption;parasym : tparavarsym;can_use_final_stack_loc : boolean;var cgpara:TCGPara);
       var
       var
         paraloc : pcgparalocation;
         paraloc : pcgparalocation;
       begin
       begin
@@ -582,7 +582,7 @@ unit cpupara;
         inherited createtempparaloc(list,calloption,parasym,can_use_final_stack_loc,cgpara);
         inherited createtempparaloc(list,calloption,parasym,can_use_final_stack_loc,cgpara);
       end;
       end;
 
 
-    function tm68kparamanager.create_varargs_paraloc_info(p : tabstractprocdef; varargspara:tvarargsparalist):longint;
+    function tcpuparamanager.create_varargs_paraloc_info(p : tabstractprocdef; varargspara:tvarargsparalist):longint;
       var
       var
         cur_stack_offset: aword;
         cur_stack_offset: aword;
         curintreg, curfloatreg: tsuperregister;
         curintreg, curfloatreg: tsuperregister;
@@ -599,5 +599,5 @@ unit cpupara;
 
 
 
 
 begin
 begin
-  paramanager:=tm68kparamanager.create;
+  paramanager:=tcpuparamanager.create;
 end.
 end.

+ 12 - 12
compiler/mips/cpupara.pas

@@ -67,7 +67,7 @@ interface
       parasupregs : tparasupregs = (RS_R4, RS_R5, RS_R6, RS_R7, RS_R8, RS_R9);
       parasupregs : tparasupregs = (RS_R4, RS_R5, RS_R6, RS_R7, RS_R8, RS_R9);
 
 
     type
     type
-      TMIPSParaManager=class(TParaManager)
+      tcpuparamanager=class(TParaManager)
         function  push_addr_param(varspez:tvarspez;def : tdef;calloption : tproccalloption) : boolean;override;
         function  push_addr_param(varspez:tvarspez;def : tdef;calloption : tproccalloption) : boolean;override;
         function  get_volatile_registers_int(calloption : tproccalloption):TCpuRegisterSet;override;
         function  get_volatile_registers_int(calloption : tproccalloption):TCpuRegisterSet;override;
         function  get_volatile_registers_fpu(calloption : tproccalloption):TCpuRegisterSet;override;
         function  get_volatile_registers_fpu(calloption : tproccalloption):TCpuRegisterSet;override;
@@ -92,14 +92,14 @@ implementation
 
 
 
 
 
 
-    function TMIPSParaManager.get_volatile_registers_int(calloption : tproccalloption):TCpuRegisterSet;
+    function tcpuparamanager.get_volatile_registers_int(calloption : tproccalloption):TCpuRegisterSet;
       begin
       begin
         { O32 ABI values }
         { O32 ABI values }
         result:=[RS_R1..RS_R15,RS_R24..RS_R25,RS_R31];
         result:=[RS_R1..RS_R15,RS_R24..RS_R25,RS_R31];
       end;
       end;
 
 
 
 
-    function TMIPSParaManager.get_volatile_registers_fpu(calloption : tproccalloption):TCpuRegisterSet;
+    function tcpuparamanager.get_volatile_registers_fpu(calloption : tproccalloption):TCpuRegisterSet;
       begin
       begin
         { O32 ABI values }
         { O32 ABI values }
         result:=[RS_F0..RS_F19];
         result:=[RS_F0..RS_F19];
@@ -108,14 +108,14 @@ implementation
 
 
     { whether "def" must be treated as record when used as function result,
     { whether "def" must be treated as record when used as function result,
       i.e. its address passed in a0 }
       i.e. its address passed in a0 }
-    function TMIPSParaManager.is_abi_record(def: tdef): boolean;
+    function tcpuparamanager.is_abi_record(def: tdef): boolean;
       begin
       begin
         result:=(def.typ=recorddef) or
         result:=(def.typ=recorddef) or
           ((def.typ=procvardef) and not tprocvardef(def).is_addressonly);
           ((def.typ=procvardef) and not tprocvardef(def).is_addressonly);
       end;
       end;
 
 
 
 
-    function TMIPSParaManager.param_use_paraloc(const cgpara: tcgpara): boolean;
+    function tcpuparamanager.param_use_paraloc(const cgpara: tcgpara): boolean;
       var
       var
         paraloc: pcgparalocation;
         paraloc: pcgparalocation;
       begin
       begin
@@ -127,7 +127,7 @@ implementation
 
 
 
 
     { true if a parameter is too large to copy and only the address is pushed }
     { true if a parameter is too large to copy and only the address is pushed }
-    function TMIPSParaManager.push_addr_param(varspez:tvarspez;def : tdef;calloption : tproccalloption) : boolean;
+    function tcpuparamanager.push_addr_param(varspez:tvarspez;def : tdef;calloption : tproccalloption) : boolean;
       begin
       begin
         result:=false;
         result:=false;
         { var,out,constref always require address }
         { var,out,constref always require address }
@@ -161,7 +161,7 @@ implementation
       end;
       end;
 
 
 
 
-    function TMIPSParaManager.get_funcretloc(p : tabstractprocdef; side: tcallercallee; forcetempdef: tdef): tcgpara;
+    function tcpuparamanager.get_funcretloc(p : tabstractprocdef; side: tcallercallee; forcetempdef: tdef): tcgpara;
       var
       var
         paraloc : pcgparalocation;
         paraloc : pcgparalocation;
         retcgsize  : tcgsize;
         retcgsize  : tcgsize;
@@ -234,7 +234,7 @@ implementation
       end;
       end;
 
 
 
 
-    procedure TMIPSParaManager.create_paraloc_info_intern(p : tabstractprocdef; side: tcallercallee;paras:tparalist);
+    procedure tcpuparamanager.create_paraloc_info_intern(p : tabstractprocdef; side: tcallercallee;paras:tparalist);
       var
       var
         paraloc      : pcgparalocation;
         paraloc      : pcgparalocation;
         i,j          : integer;
         i,j          : integer;
@@ -373,7 +373,7 @@ implementation
                   begin
                   begin
                     { This should be the first parameter }
                     { This should be the first parameter }
                     //if (intparareg<>1) then
                     //if (intparareg<>1) then
-                    //  Comment(V_Warning,'intparareg should be one for funcret in TMipsParaManager.create_paraloc_info_intern');
+                    //  Comment(V_Warning,'intparareg should be one for funcret in tcpuparamanager.create_paraloc_info_intern');
                     paraloc^.loc:=LOC_REGISTER;
                     paraloc^.loc:=LOC_REGISTER;
                     paraloc^.register:=newreg(R_INTREGISTER,parasupregs[0],R_SUBWHOLE);
                     paraloc^.register:=newreg(R_INTREGISTER,parasupregs[0],R_SUBWHOLE);
                     inc(intparasize,align(tcgsize2size[paraloc^.size],sizeof(aint)));
                     inc(intparasize,align(tcgsize2size[paraloc^.size],sizeof(aint)));
@@ -480,7 +480,7 @@ implementation
       end;
       end;
 
 
 
 
-    function TMIPSParaManager.create_varargs_paraloc_info(p : tabstractprocdef; varargspara:tvarargsparalist):longint;
+    function tcpuparamanager.create_varargs_paraloc_info(p : tabstractprocdef; varargspara:tvarargsparalist):longint;
       begin
       begin
         intparareg:=0;
         intparareg:=0;
         intparasize:=0;
         intparasize:=0;
@@ -501,7 +501,7 @@ implementation
 
 
 
 
 
 
-    function TMIPSParaManager.create_paraloc_info(p : tabstractprocdef; side: tcallercallee):longint;
+    function tcpuparamanager.create_paraloc_info(p : tabstractprocdef; side: tcallercallee):longint;
       begin
       begin
         intparareg:=0;
         intparareg:=0;
         intparasize:=0;
         intparasize:=0;
@@ -515,5 +515,5 @@ implementation
 
 
 
 
 begin
 begin
-   ParaManager:=TMIPSParaManager.create;
+   ParaManager:=tcpuparamanager.create;
 end.
 end.

+ 6 - 6
compiler/pdecsub.pas

@@ -1788,8 +1788,8 @@ begin
           else
           else
             Message(parser_e_32bitint_or_pointer_variable_expected);
             Message(parser_e_32bitint_or_pointer_variable_expected);
         end;
         end;
-      (paramanager as tm68kparamanager).create_funcretloc_info(pd,calleeside);
-      (paramanager as tm68kparamanager).create_funcretloc_info(pd,callerside);
+      (paramanager as tcpuparamanager).create_funcretloc_info(pd,calleeside);
+      (paramanager as tcpuparamanager).create_funcretloc_info(pd,callerside);
 
 
       v:=get_intconst;
       v:=get_intconst;
       if (v<low(Tprocdef(pd).extnumber)) or (v>high(Tprocdef(pd).extnumber)) then
       if (v<low(Tprocdef(pd).extnumber)) or (v>high(Tprocdef(pd).extnumber)) then
@@ -1819,8 +1819,8 @@ begin
             Message(parser_e_32bitint_or_pointer_variable_expected);
             Message(parser_e_32bitint_or_pointer_variable_expected);
         end;
         end;
 
 
-      (paramanager as tppcparamanager).create_funcretloc_info(pd,calleeside);
-      (paramanager as tppcparamanager).create_funcretloc_info(pd,callerside);
+      (paramanager as tcpuparamanager).create_funcretloc_info(pd,calleeside);
+      (paramanager as tcpuparamanager).create_funcretloc_info(pd,callerside);
 
 
       v:=get_intconst;
       v:=get_intconst;
       if (v<low(Tprocdef(pd).extnumber)) or (v>high(Tprocdef(pd).extnumber)) then
       if (v<low(Tprocdef(pd).extnumber)) or (v>high(Tprocdef(pd).extnumber)) then
@@ -1911,8 +1911,8 @@ begin
           else
           else
             Message(parser_e_32bitint_or_pointer_variable_expected);
             Message(parser_e_32bitint_or_pointer_variable_expected);
         end;
         end;
-      (paramanager as tppcparamanager).create_funcretloc_info(pd,calleeside);
-      (paramanager as tppcparamanager).create_funcretloc_info(pd,callerside);
+      (paramanager as tcpuparamanager).create_funcretloc_info(pd,calleeside);
+      (paramanager as tcpuparamanager).create_funcretloc_info(pd,callerside);
 
 
       v:=get_intconst;
       v:=get_intconst;
       if (v<low(Tprocdef(pd).extnumber)) or (v>high(Tprocdef(pd).extnumber)) then
       if (v<low(Tprocdef(pd).extnumber)) or (v>high(Tprocdef(pd).extnumber)) then

+ 12 - 12
compiler/powerpc/cpupara.pas

@@ -32,7 +32,7 @@ unit cpupara;
        paramgr,parabase,cgbase,cgutils;
        paramgr,parabase,cgbase,cgutils;
 
 
     type
     type
-       tppcparamanager = class(tparamanager)
+       tcpuparamanager = class(tparamanager)
           function get_volatile_registers_int(calloption : tproccalloption):tcpuregisterset;override;
           function get_volatile_registers_int(calloption : tproccalloption):tcpuregisterset;override;
           function get_volatile_registers_fpu(calloption : tproccalloption):tcpuregisterset;override;
           function get_volatile_registers_fpu(calloption : tproccalloption):tcpuregisterset;override;
           function push_addr_param(varspez:tvarspez;def : tdef;calloption : tproccalloption) : boolean;override;
           function push_addr_param(varspez:tvarspez;def : tdef;calloption : tproccalloption) : boolean;override;
@@ -56,7 +56,7 @@ unit cpupara;
        procinfo,cpupi;
        procinfo,cpupi;
 
 
 
 
-    function tppcparamanager.get_volatile_registers_int(calloption : tproccalloption):tcpuregisterset;
+    function tcpuparamanager.get_volatile_registers_int(calloption : tproccalloption):tcpuregisterset;
       begin
       begin
         if (target_info.system = system_powerpc_darwin) then
         if (target_info.system = system_powerpc_darwin) then
           result := [RS_R0,RS_R2..RS_R12]
           result := [RS_R0,RS_R2..RS_R12]
@@ -65,7 +65,7 @@ unit cpupara;
       end;
       end;
 
 
 
 
-    function tppcparamanager.get_volatile_registers_fpu(calloption : tproccalloption):tcpuregisterset;
+    function tcpuparamanager.get_volatile_registers_fpu(calloption : tproccalloption):tcpuregisterset;
       begin
       begin
         case target_info.abi of
         case target_info.abi of
           abi_powerpc_aix,
           abi_powerpc_aix,
@@ -77,7 +77,7 @@ unit cpupara;
       end;
       end;
 
 
 
 
-    procedure tppcparamanager.getintparaloc(pd : tabstractprocdef; nr : longint; var cgpara : tcgpara);
+    procedure tcpuparamanager.getintparaloc(pd : tabstractprocdef; nr : longint; var cgpara : tcgpara);
       var
       var
         paraloc : pcgparalocation;
         paraloc : pcgparalocation;
         psym : tparavarsym;
         psym : tparavarsym;
@@ -181,7 +181,7 @@ unit cpupara;
       end;
       end;
 
 
 
 
-    function tppcparamanager.push_addr_param(varspez:tvarspez;def : tdef;calloption : tproccalloption) : boolean;
+    function tcpuparamanager.push_addr_param(varspez:tvarspez;def : tdef;calloption : tproccalloption) : boolean;
       begin
       begin
         result:=false;
         result:=false;
         { var,out,constref always require address }
         { var,out,constref always require address }
@@ -236,7 +236,7 @@ unit cpupara;
       end;
       end;
 
 
 
 
-    procedure tppcparamanager.init_values(var curintreg, curfloatreg, curmmreg: tsuperregister; var cur_stack_offset: aword);
+    procedure tcpuparamanager.init_values(var curintreg, curfloatreg, curmmreg: tsuperregister; var cur_stack_offset: aword);
       begin
       begin
         case target_info.abi of
         case target_info.abi of
           abi_powerpc_aix:
           abi_powerpc_aix:
@@ -252,7 +252,7 @@ unit cpupara;
       end;
       end;
 
 
 
 
-    function tppcparamanager.get_funcretloc(p : tabstractprocdef; side: tcallercallee; forcetempdef: tdef): tcgpara;
+    function tcpuparamanager.get_funcretloc(p : tabstractprocdef; side: tcallercallee; forcetempdef: tdef): tcgpara;
       var
       var
         paraloc : pcgparalocation;
         paraloc : pcgparalocation;
         retcgsize  : tcgsize;
         retcgsize  : tcgsize;
@@ -306,7 +306,7 @@ unit cpupara;
       end;
       end;
 
 
 
 
-    function tppcparamanager.create_paraloc_info(p : tabstractprocdef; side: tcallercallee):longint;
+    function tcpuparamanager.create_paraloc_info(p : tabstractprocdef; side: tcallercallee):longint;
 
 
       var
       var
         cur_stack_offset: aword;
         cur_stack_offset: aword;
@@ -321,7 +321,7 @@ unit cpupara;
 
 
 
 
 
 
-    function tppcparamanager.create_paraloc_info_intern(p : tabstractprocdef; side: tcallercallee; paras:tparalist;
+    function tcpuparamanager.create_paraloc_info_intern(p : tabstractprocdef; side: tcallercallee; paras:tparalist;
                var curintreg, curfloatreg, curmmreg: tsuperregister; var cur_stack_offset: aword; varargsparas: boolean):longint;
                var curintreg, curfloatreg, curmmreg: tsuperregister; var cur_stack_offset: aword; varargsparas: boolean):longint;
       var
       var
          stack_offset: longint;
          stack_offset: longint;
@@ -609,7 +609,7 @@ unit cpupara;
       end;
       end;
 
 
 
 
-    function tppcparamanager.create_varargs_paraloc_info(p : tabstractprocdef; varargspara:tvarargsparalist):longint;
+    function tcpuparamanager.create_varargs_paraloc_info(p : tabstractprocdef; varargspara:tvarargsparalist):longint;
       var
       var
         cur_stack_offset: aword;
         cur_stack_offset: aword;
         parasize, l: longint;
         parasize, l: longint;
@@ -654,7 +654,7 @@ unit cpupara;
       end;
       end;
 
 
 
 
-    function tppcparamanager.parseparaloc(p : tparavarsym;const s : string) : boolean;
+    function tcpuparamanager.parseparaloc(p : tparavarsym;const s : string) : boolean;
       var
       var
         paraloc : pcgparalocation;
         paraloc : pcgparalocation;
         paracgsize : tcgsize;
         paracgsize : tcgsize;
@@ -731,5 +731,5 @@ unit cpupara;
       end;
       end;
 
 
 begin
 begin
-   paramanager:=tppcparamanager.create;
+   paramanager:=tcpuparamanager.create;
 end.
 end.

+ 12 - 12
compiler/powerpc64/cpupara.pas

@@ -32,7 +32,7 @@ uses
   paramgr, parabase, cgbase, cgutils;
   paramgr, parabase, cgbase, cgutils;
 
 
 type
 type
-  tppcparamanager = class(tparamanager)
+  tcpuparamanager = class(tparamanager)
     function get_volatile_registers_int(calloption: tproccalloption):
     function get_volatile_registers_int(calloption: tproccalloption):
       tcpuregisterset; override;
       tcpuregisterset; override;
     function get_volatile_registers_fpu(calloption: tproccalloption):
     function get_volatile_registers_fpu(calloption: tproccalloption):
@@ -63,7 +63,7 @@ uses
   defutil,symtable,
   defutil,symtable,
   procinfo, cpupi;
   procinfo, cpupi;
 
 
-function tppcparamanager.get_volatile_registers_int(calloption:
+function tcpuparamanager.get_volatile_registers_int(calloption:
   tproccalloption): tcpuregisterset;
   tproccalloption): tcpuregisterset;
 begin
 begin
   result := [RS_R0,RS_R3..RS_R12];
   result := [RS_R0,RS_R3..RS_R12];
@@ -71,13 +71,13 @@ begin
     include(result,RS_R2);
     include(result,RS_R2);
 end;
 end;
 
 
-function tppcparamanager.get_volatile_registers_fpu(calloption:
+function tcpuparamanager.get_volatile_registers_fpu(calloption:
   tproccalloption): tcpuregisterset;
   tproccalloption): tcpuregisterset;
 begin
 begin
   result := [RS_F0..RS_F13];
   result := [RS_F0..RS_F13];
 end;
 end;
 
 
-procedure tppcparamanager.getintparaloc(pd : tabstractprocdef; nr: longint; var cgpara: tcgpara);
+procedure tcpuparamanager.getintparaloc(pd : tabstractprocdef; nr: longint; var cgpara: tcgpara);
 var
 var
   paraloc: pcgparalocation;
   paraloc: pcgparalocation;
   psym: tparavarsym;
   psym: tparavarsym;
@@ -160,7 +160,7 @@ begin
   end;
   end;
 end;
 end;
 
 
-function tppcparamanager.push_addr_param(varspez: tvarspez; def: tdef;
+function tcpuparamanager.push_addr_param(varspez: tvarspez; def: tdef;
   calloption: tproccalloption): boolean;
   calloption: tproccalloption): boolean;
 begin
 begin
   result := false;
   result := false;
@@ -198,7 +198,7 @@ begin
   end;
   end;
 end;
 end;
 
 
-procedure tppcparamanager.init_values(var curintreg, curfloatreg, curmmreg:
+procedure tcpuparamanager.init_values(var curintreg, curfloatreg, curmmreg:
   tsuperregister; var cur_stack_offset: aword);
   tsuperregister; var cur_stack_offset: aword);
 begin
 begin
   { register parameter save area begins at 48(r2) }
   { register parameter save area begins at 48(r2) }
@@ -208,7 +208,7 @@ begin
   curmmreg := RS_M2;
   curmmreg := RS_M2;
 end;
 end;
 
 
-function tppcparamanager.get_funcretloc(p : tabstractprocdef; side:
+function tcpuparamanager.get_funcretloc(p : tabstractprocdef; side:
   tcallercallee; forcetempdef: tdef): tcgpara;
   tcallercallee; forcetempdef: tdef): tcgpara;
 var
 var
   paraloc : pcgparalocation;
   paraloc : pcgparalocation;
@@ -239,7 +239,7 @@ begin
      end;
      end;
 end;
 end;
 
 
-function tppcparamanager.create_paraloc_info(p: tabstractprocdef; side:
+function tcpuparamanager.create_paraloc_info(p: tabstractprocdef; side:
   tcallercallee): longint;
   tcallercallee): longint;
 var
 var
   cur_stack_offset: aword;
   cur_stack_offset: aword;
@@ -253,7 +253,7 @@ begin
   create_funcretloc_info(p, side);
   create_funcretloc_info(p, side);
 end;
 end;
 
 
-function tppcparamanager.create_paraloc_info_intern(p: tabstractprocdef; side:
+function tcpuparamanager.create_paraloc_info_intern(p: tabstractprocdef; side:
   tcallercallee; paras: tparalist;
   tcallercallee; paras: tparalist;
   var curintreg, curfloatreg, curmmreg: tsuperregister; var cur_stack_offset:
   var curintreg, curfloatreg, curmmreg: tsuperregister; var cur_stack_offset:
   aword; isVararg : boolean): longint;
   aword; isVararg : boolean): longint;
@@ -485,7 +485,7 @@ begin
   result := stack_offset;
   result := stack_offset;
 end;
 end;
 
 
-function tppcparamanager.create_varargs_paraloc_info(p: tabstractprocdef;
+function tcpuparamanager.create_varargs_paraloc_info(p: tabstractprocdef;
   varargspara: tvarargsparalist): longint;
   varargspara: tvarargsparalist): longint;
 var
 var
   cur_stack_offset: aword;
   cur_stack_offset: aword;
@@ -527,7 +527,7 @@ begin
     include(varargspara.varargsinfo, va_uses_float_reg);
     include(varargspara.varargsinfo, va_uses_float_reg);
 end;
 end;
 
 
-function tppcparamanager.parseparaloc(p: tparavarsym; const s: string): boolean;
+function tcpuparamanager.parseparaloc(p: tparavarsym; const s: string): boolean;
 begin
 begin
   { not supported/required for PowerPC64-linux target }
   { not supported/required for PowerPC64-linux target }
   internalerror(200404182);
   internalerror(200404182);
@@ -536,6 +536,6 @@ end;
 
 
 
 
 begin
 begin
-  paramanager := tppcparamanager.create;
+  paramanager := tcpuparamanager.create;
 end.
 end.
 
 

+ 10 - 10
compiler/sparc/cpupara.pas

@@ -31,7 +31,7 @@ interface
       symconst,symbase,symsym,symtype,symdef,paramgr,parabase,cgbase,cgutils;
       symconst,symbase,symsym,symtype,symdef,paramgr,parabase,cgbase,cgutils;
 
 
     type
     type
-      TSparcParaManager=class(TParaManager)
+      tcpuparamanager=class(TParaManager)
         function  push_addr_param(varspez:tvarspez;def : tdef;calloption : tproccalloption) : boolean;override;
         function  push_addr_param(varspez:tvarspez;def : tdef;calloption : tproccalloption) : boolean;override;
         function  get_volatile_registers_int(calloption : tproccalloption):TCpuRegisterSet;override;
         function  get_volatile_registers_int(calloption : tproccalloption):TCpuRegisterSet;override;
         function  get_volatile_registers_fpu(calloption : tproccalloption):TCpuRegisterSet;override;
         function  get_volatile_registers_fpu(calloption : tproccalloption):TCpuRegisterSet;override;
@@ -62,19 +62,19 @@ implementation
       parainsupregs  : tparasupregs = (RS_I0,RS_I1,RS_I2,RS_I3,RS_I4,RS_I5);
       parainsupregs  : tparasupregs = (RS_I0,RS_I1,RS_I2,RS_I3,RS_I4,RS_I5);
 
 
 
 
-    function TSparcParaManager.get_volatile_registers_int(calloption : tproccalloption):TCpuRegisterSet;
+    function tcpuparamanager.get_volatile_registers_int(calloption : tproccalloption):TCpuRegisterSet;
       begin
       begin
         result:=[RS_G1,RS_O0,RS_O1,RS_O2,RS_O3,RS_O4,RS_O5,RS_O6,RS_O7];
         result:=[RS_G1,RS_O0,RS_O1,RS_O2,RS_O3,RS_O4,RS_O5,RS_O6,RS_O7];
       end;
       end;
 
 
 
 
-    function tsparcparamanager.get_volatile_registers_fpu(calloption : tproccalloption):TCpuRegisterSet;
+    function tcpuparamanager.get_volatile_registers_fpu(calloption : tproccalloption):TCpuRegisterSet;
       begin
       begin
         result:=[RS_F0..RS_F31];
         result:=[RS_F0..RS_F31];
       end;
       end;
 
 
 
 
-    procedure TSparcParaManager.GetIntParaLoc(pd : tabstractprocdef; nr : longint; var cgpara : tcgpara);
+    procedure tcpuparamanager.GetIntParaLoc(pd : tabstractprocdef; nr : longint; var cgpara : tcgpara);
       var
       var
         paraloc : pcgparalocation;
         paraloc : pcgparalocation;
         psym: tparavarsym;
         psym: tparavarsym;
@@ -115,7 +115,7 @@ implementation
 
 
 
 
     { true if a parameter is too large to copy and only the address is pushed }
     { true if a parameter is too large to copy and only the address is pushed }
-    function tsparcparamanager.push_addr_param(varspez:tvarspez;def : tdef;calloption : tproccalloption) : boolean;
+    function tcpuparamanager.push_addr_param(varspez:tvarspez;def : tdef;calloption : tproccalloption) : boolean;
       begin
       begin
         result:=false;
         result:=false;
         { var,out,constref always require address }
         { var,out,constref always require address }
@@ -146,7 +146,7 @@ implementation
       end;
       end;
 
 
 
 
-    function tsparcparamanager.get_funcretloc(p : tabstractprocdef; side: tcallercallee; forcetempdef: tdef): tcgpara;
+    function tcpuparamanager.get_funcretloc(p : tabstractprocdef; side: tcallercallee; forcetempdef: tdef): tcgpara;
       var
       var
         paraloc : pcgparalocation;
         paraloc : pcgparalocation;
         retcgsize  : tcgsize;
         retcgsize  : tcgsize;
@@ -204,7 +204,7 @@ implementation
       end;
       end;
 
 
 
 
-    procedure tsparcparamanager.create_paraloc_info_intern(p : tabstractprocdef; side: tcallercallee;paras:tparalist;
+    procedure tcpuparamanager.create_paraloc_info_intern(p : tabstractprocdef; side: tcallercallee;paras:tparalist;
                                                            var intparareg,parasize:longint);
                                                            var intparareg,parasize:longint);
       var
       var
         paraloc      : pcgparalocation;
         paraloc      : pcgparalocation;
@@ -313,7 +313,7 @@ implementation
       end;
       end;
 
 
 
 
-    function TSparcParaManager.create_varargs_paraloc_info(p : tabstractprocdef; varargspara:tvarargsparalist):longint;
+    function tcpuparamanager.create_varargs_paraloc_info(p : tabstractprocdef; varargspara:tvarargsparalist):longint;
       var
       var
         intparareg,
         intparareg,
         parasize : longint;
         parasize : longint;
@@ -329,7 +329,7 @@ implementation
 
 
 
 
 
 
-    function tsparcparamanager.create_paraloc_info(p : tabstractprocdef; side: tcallercallee):longint;
+    function tcpuparamanager.create_paraloc_info(p : tabstractprocdef; side: tcallercallee):longint;
       var
       var
         intparareg,
         intparareg,
         parasize : longint;
         parasize : longint;
@@ -345,5 +345,5 @@ implementation
 
 
 
 
 begin
 begin
-   ParaManager:=TSparcParaManager.create;
+   ParaManager:=tcpuparamanager.create;
 end.
 end.

+ 13 - 13
compiler/x86_64/cpupara.pas

@@ -33,7 +33,7 @@ unit cpupara;
       parabase,paramgr;
       parabase,paramgr;
 
 
     type
     type
-       tx86_64paramanager = class(tparamanager)
+       tcpuparamanager = class(tparamanager)
        private
        private
           procedure create_paraloc_info_intern(p : tabstractprocdef; side: tcallercallee;paras:tparalist;
           procedure create_paraloc_info_intern(p : tabstractprocdef; side: tcallercallee;paras:tparalist;
                                                var intparareg,mmparareg,parasize:longint;varargsparas: boolean);
                                                var intparareg,mmparareg,parasize:longint;varargsparas: boolean);
@@ -742,7 +742,7 @@ unit cpupara;
       end;
       end;
 
 
 
 
-    function tx86_64paramanager.ret_in_param(def:tdef;pd:tabstractprocdef):boolean;
+    function tcpuparamanager.ret_in_param(def:tdef;pd:tabstractprocdef):boolean;
       var
       var
         classes: tx64paraclasses;
         classes: tx64paraclasses;
         numclasses: longint;
         numclasses: longint;
@@ -765,7 +765,7 @@ unit cpupara;
       end;
       end;
 
 
 
 
-    function tx86_64paramanager.param_use_paraloc(const cgpara:tcgpara):boolean;
+    function tcpuparamanager.param_use_paraloc(const cgpara:tcgpara):boolean;
       var
       var
         paraloc : pcgparalocation;
         paraloc : pcgparalocation;
       begin
       begin
@@ -787,7 +787,7 @@ unit cpupara;
 
 
 
 
     { true if a parameter is too large to copy and only the address is pushed }
     { true if a parameter is too large to copy and only the address is pushed }
-    function tx86_64paramanager.push_addr_param(varspez:tvarspez;def : tdef;calloption : tproccalloption) : boolean;
+    function tcpuparamanager.push_addr_param(varspez:tvarspez;def : tdef;calloption : tproccalloption) : boolean;
       var
       var
         classes: tx64paraclasses;
         classes: tx64paraclasses;
         numclasses: longint;
         numclasses: longint;
@@ -865,7 +865,7 @@ unit cpupara;
       end;
       end;
 
 
 
 
-    function tx86_64paramanager.get_volatile_registers_int(calloption : tproccalloption):tcpuregisterset;
+    function tcpuparamanager.get_volatile_registers_int(calloption : tproccalloption):tcpuregisterset;
       begin
       begin
         if target_info.system=system_x86_64_win64 then
         if target_info.system=system_x86_64_win64 then
           result:=[RS_RAX,RS_RCX,RS_RDX,RS_R8,RS_R9,RS_R10,RS_R11]
           result:=[RS_RAX,RS_RCX,RS_RDX,RS_R8,RS_R9,RS_R10,RS_R11]
@@ -874,7 +874,7 @@ unit cpupara;
       end;
       end;
 
 
 
 
-    function tx86_64paramanager.get_volatile_registers_mm(calloption : tproccalloption):tcpuregisterset;
+    function tcpuparamanager.get_volatile_registers_mm(calloption : tproccalloption):tcpuregisterset;
       begin
       begin
         if target_info.system=system_x86_64_win64 then
         if target_info.system=system_x86_64_win64 then
           result:=[RS_XMM0..RS_XMM5]
           result:=[RS_XMM0..RS_XMM5]
@@ -883,13 +883,13 @@ unit cpupara;
       end;
       end;
 
 
 
 
-    function tx86_64paramanager.get_volatile_registers_fpu(calloption : tproccalloption):tcpuregisterset;
+    function tcpuparamanager.get_volatile_registers_fpu(calloption : tproccalloption):tcpuregisterset;
       begin
       begin
         result:=[RS_ST0..RS_ST7];
         result:=[RS_ST0..RS_ST7];
       end;
       end;
 
 
 
 
-    procedure tx86_64paramanager.getintparaloc(pd : tabstractprocdef; nr : longint; var cgpara : tcgpara);
+    procedure tcpuparamanager.getintparaloc(pd : tabstractprocdef; nr : longint; var cgpara : tcgpara);
       var
       var
         paraloc : pcgparalocation;
         paraloc : pcgparalocation;
         psym : tparavarsym;
         psym : tparavarsym;
@@ -945,7 +945,7 @@ unit cpupara;
       end;
       end;
 
 
 
 
-    function tx86_64paramanager.get_funcretloc(p : tabstractprocdef; side: tcallercallee; forcetempdef: tdef): tcgpara;
+    function tcpuparamanager.get_funcretloc(p : tabstractprocdef; side: tcallercallee; forcetempdef: tdef): tcgpara;
       const
       const
         intretregs: array[0..1] of tregister = (NR_FUNCTION_RETURN_REG,NR_FUNCTION_RETURN_REG_HIGH);
         intretregs: array[0..1] of tregister = (NR_FUNCTION_RETURN_REG,NR_FUNCTION_RETURN_REG_HIGH);
         mmretregs: array[0..1] of tregister = (NR_MM_RESULT_REG,NR_MM_RESULT_REG_HIGH);
         mmretregs: array[0..1] of tregister = (NR_MM_RESULT_REG,NR_MM_RESULT_REG_HIGH);
@@ -1093,7 +1093,7 @@ unit cpupara;
       end;
       end;
 
 
 
 
-    procedure tx86_64paramanager.create_paraloc_info_intern(p : tabstractprocdef; side: tcallercallee;paras:tparalist;
+    procedure tcpuparamanager.create_paraloc_info_intern(p : tabstractprocdef; side: tcallercallee;paras:tparalist;
                                                             var intparareg,mmparareg,parasize:longint;varargsparas: boolean);
                                                             var intparareg,mmparareg,parasize:longint;varargsparas: boolean);
       var
       var
         hp         : tparavarsym;
         hp         : tparavarsym;
@@ -1363,7 +1363,7 @@ unit cpupara;
       end;
       end;
 
 
 
 
-    function tx86_64paramanager.create_varargs_paraloc_info(p : tabstractprocdef; varargspara:tvarargsparalist):longint;
+    function tcpuparamanager.create_varargs_paraloc_info(p : tabstractprocdef; varargspara:tvarargsparalist):longint;
       var
       var
         intparareg,mmparareg,
         intparareg,mmparareg,
         parasize : longint;
         parasize : longint;
@@ -1384,7 +1384,7 @@ unit cpupara;
       end;
       end;
 
 
 
 
-    function tx86_64paramanager.create_paraloc_info(p : tabstractprocdef; side: tcallercallee):longint;
+    function tcpuparamanager.create_paraloc_info(p : tabstractprocdef; side: tcallercallee):longint;
       var
       var
         intparareg,mmparareg,
         intparareg,mmparareg,
         parasize : longint;
         parasize : longint;
@@ -1404,5 +1404,5 @@ unit cpupara;
 
 
 
 
 begin
 begin
-   paramanager:=tx86_64paramanager.create;
+   paramanager:=tcpuparamanager.create;
 end.
 end.