paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-04-22 08:09:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

* more RiscV paramgr unification

Browse Source
This commit is contained in:
florian 2024-12-15 23:01:55 +01:00
parent f32eaa1564
commit 98b1aee2a5
3 changed files with 61 additions and 95 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
compiler/riscv/pararv.pas
View File

@ -26,21 +26,31 @@ unit pararv;
uses
globtype,
cgutils,
paramgr;
aasmdata,
symdef,
cgbase,cgutils,
parabase,paramgr;
type
trvparamanager = class(tparamanager)
function get_volatile_registers_int(calloption: tproccalloption): tcpuregisterset; override;
function get_volatile_registers_fpu(calloption: tproccalloption): tcpuregisterset; override;
function get_saved_registers_fpu(calloption: tproccalloption): tcpuregisterarray;override;
function get_saved_registers_int(calloption: tproccalloption): tcpuregisterarray;override;
function get_saved_registers_fpu(calloption: tproccalloption): tcpuregisterarray;override;
function get_saved_registers_int(calloption: tproccalloption): tcpuregisterarray;override;
procedure getcgtempparaloc(list: TAsmList; pd: tabstractprocdef; nr: longint; var cgpara: tcgpara);override;
protected
procedure init_values(var curintreg, curfloatreg, curmmreg: tsuperregister; var cur_stack_offset: aword);
end;
implementation
uses
verbose,
symtype,symsym,
defutil,
cpubase;
function trvparamanager.get_volatile_registers_int(calloption: tproccalloption): tcpuregisterset;
@ -70,6 +80,53 @@ implementation
result:=saved_regs;
end;
procedure trvparamanager.getcgtempparaloc(list: TAsmList; pd : tabstractprocdef; nr : longint; var cgpara : tcgpara);
var
paraloc : pcgparalocation;
psym : tparavarsym;
pdef : tdef;
begin
psym:=tparavarsym(pd.paras[nr-1]);
pdef:=psym.vardef;
if push_addr_param(psym.varspez,pdef,pd.proccalloption) then
pdef:=cpointerdef.getreusable_no_free(pdef);
cgpara.reset;
cgpara.size:=def_cgsize(pdef);
cgpara.intsize:=tcgsize2size[cgpara.size];
cgpara.alignment:=get_para_align(pd.proccalloption);
cgpara.def:=pdef;
paraloc:=cgpara.add_location;
with paraloc^ do
begin
size:=def_cgsize(pdef);
def:=pdef;
if (nr<=8) then
begin
if nr=0 then
internalerror(2024121501);
loc:=LOC_REGISTER;
register:=newreg(R_INTREGISTER,RS_X10+nr-1,R_SUBWHOLE);
end
else
begin
loc:=LOC_REFERENCE;
paraloc^.reference.index:=NR_STACK_POINTER_REG;
reference.offset:=sizeof(pint)*nr;
end;
end;
end;
procedure trvparamanager.init_values(var curintreg, curfloatreg, curmmreg: tsuperregister; var cur_stack_offset: aword);
begin
{ register parameter save area begins at 48(r2) }
cur_stack_offset := 0;
curintreg := RS_X10;
curfloatreg := RS_F10;
curmmreg := RS_NO;
end;
end.

49
compiler/riscv32/cpupara.pas
View File

@ -36,12 +36,10 @@ unit cpupara;
tcpuparamanager = class(trvparamanager)
function push_addr_param(varspez:tvarspez;def : tdef;calloption : tproccalloption) : boolean;override;
procedure getcgtempparaloc(list: TAsmList; pd : tabstractprocdef; nr : longint; var cgpara : tcgpara);override;
function create_paraloc_info(p : tabstractprocdef; side: tcallercallee):longint;override;
function create_varargs_paraloc_info(p : tabstractprocdef; side: tcallercallee; varargspara:tvarargsparalist):longint;override;
function get_funcretloc(p : tabstractprocdef; side: tcallercallee; forcetempdef: tdef): tcgpara;override;
private
procedure init_values(var curintreg, curfloatreg, curmmreg: tsuperregister; var cur_stack_offset: aword);
function create_paraloc_info_intern(p : tabstractprocdef; side: tcallercallee; paras:tparalist;
var curintreg, curfloatreg, curmmreg: tsuperregister; var cur_stack_offset: aword; varargsparas: boolean):longint;
end;
@ -54,44 +52,6 @@ unit cpupara;
defutil,symtable,
procinfo,cpupi;
procedure tcpuparamanager.getcgtempparaloc(list: TAsmList; pd : tabstractprocdef; nr : longint; var cgpara : tcgpara);
var
paraloc : pcgparalocation;
psym : tparavarsym;
pdef : tdef;
begin
psym:=tparavarsym(pd.paras[nr-1]);
pdef:=psym.vardef;
if push_addr_param(psym.varspez,pdef,pd.proccalloption) then
pdef:=cpointerdef.getreusable_no_free(pdef);
cgpara.reset;
cgpara.size:=def_cgsize(pdef);
cgpara.intsize:=tcgsize2size[cgpara.size];
cgpara.alignment:=get_para_align(pd.proccalloption);
cgpara.def:=pdef;
paraloc:=cgpara.add_location;
with paraloc^ do
begin
size:=def_cgsize(pdef);
def:=pdef;
if (nr<=8) then
begin
if nr=0 then
internalerror(200309271);
loc:=LOC_REGISTER;
register:=newreg(R_INTREGISTER,RS_X10+nr-1,R_SUBWHOLE);
end
else
begin
loc:=LOC_REFERENCE;
paraloc^.reference.index:=NR_STACK_POINTER_REG;
reference.offset:=sizeof(pint)*(nr);
end;
end;
end;
function getparaloc(p : tdef) : tcgloc;
begin
@ -206,15 +166,6 @@ unit cpupara;
end;
procedure tcpuparamanager.init_values(var curintreg, curfloatreg, curmmreg: tsuperregister; var cur_stack_offset: aword);
begin
cur_stack_offset:=0;
curintreg:=RS_X10;
curfloatreg:=RS_F10;
curmmreg:=RS_NO;
end;
function tcpuparamanager.get_funcretloc(p : tabstractprocdef; side: tcallercallee; forcetempdef: tdef): tcgpara;
var
paraloc : pcgparalocation;

42
compiler/riscv64/cpupara.pas
View File

@ -37,13 +37,11 @@ unit cpupara;
function push_addr_param(varspez: tvarspez; def: tdef; calloption: tproccalloption): boolean; override;
function ret_in_param(def: tdef; pd: tabstractprocdef): boolean; override;
procedure getcgtempparaloc(list: TAsmList; pd : tabstractprocdef; nr: longint; var cgpara: tcgpara); override;
function create_paraloc_info(p: tabstractprocdef; side: tcallercallee): longint; override;
function create_varargs_paraloc_info(p: tabstractprocdef; side: tcallercallee; varargspara: tvarargsparalist): longint; override;
function get_funcretloc(p : tabstractprocdef; side: tcallercallee; forcetempdef: tdef): tcgpara;override;
private
procedure init_values(var curintreg, curfloatreg, curmmreg: tsuperregister; var cur_stack_offset: aword);
function create_paraloc_info_intern(p: tabstractprocdef; side: tcallercallee; paras: tparalist; var curintreg, curfloatreg, curmmreg: tsuperregister; var cur_stack_offset: aword; isVararg : boolean): longint;
function parseparaloc(p: tparavarsym; const s: string): boolean; override;
procedure create_paraloc_for_def(var para: TCGPara; varspez: tvarspez; paradef: tdef; var nextfloatreg, nextintreg: tsuperregister; var stack_offset: aword; const isVararg, forceintmem: boolean; const side: tcallercallee; const p: tabstractprocdef);
@ -57,38 +55,6 @@ implementation
defutil,symtable,symcpu,
procinfo, cpupi;
procedure tcpuparamanager.getcgtempparaloc(list: TAsmList; pd : tabstractprocdef; nr: longint; var cgpara: tcgpara);
var
paraloc: pcgparalocation;
psym: tparavarsym;
pdef: tdef;
begin
psym:=tparavarsym(pd.paras[nr-1]);
pdef:=psym.vardef;
if push_addr_param(psym.varspez,pdef,pd.proccalloption) then
pdef:=cpointerdef.getreusable_no_free(pdef);
cgpara.reset;
cgpara.size := def_cgsize(pdef);
cgpara.intsize := tcgsize2size[cgpara.size];
cgpara.alignment := get_para_align(pd.proccalloption);
cgpara.def:=pdef;
paraloc := cgpara.add_location;
with paraloc^ do begin
size := def_cgsize(pdef);
def := pdef;
if (nr <= 8) then begin
if (nr = 0) then
internalerror(200309271);
loc := LOC_REGISTER;
register := newreg(R_INTREGISTER, RS_X10 + nr-1, R_SUBWHOLE);
end else begin
loc := LOC_REFERENCE;
paraloc^.reference.index := NR_STACK_POINTER_REG;
reference.offset := sizeof(aint) * (nr - 9);
end;
end;
end;
function getparaloc(p: tdef): tcgloc;
begin
{ Later, the LOC_REFERENCE is in most cases changed into LOC_REGISTER
@ -189,14 +155,6 @@ implementation
result:=push_addr_param(vs_value,def,pd.proccalloption);
end;
procedure tcpuparamanager.init_values(var curintreg, curfloatreg, curmmreg: tsuperregister; var cur_stack_offset: aword);
begin
{ register parameter save area begins at 48(r2) }
cur_stack_offset := 0;
curintreg := RS_X10;
curfloatreg := RS_F10;
curmmreg := RS_NO;
end;
function tcpuparamanager.get_funcretloc(p : tabstractprocdef; side: tcallercallee; forcetempdef: tdef): tcgpara;
var