paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-08-16 19:39:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

* improved handling of procedures with register calling conventions

Browse Source
This commit is contained in:
florian 2002-09-10 21:48:30 +00:00
parent dc3961baff
commit 55c7896d06
1 changed files with 60 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

78
compiler/ncgutil.pas
View File

@ -1187,6 +1187,7 @@ implementation
p : tsymtable; p : tsymtable;
stackalloclist : taasmoutput; stackalloclist : taasmoutput;
hp : tparaitem; hp : tparaitem;
paraloc : tparalocation;
begin begin
stackalloclist:=taasmoutput.Create; stackalloclist:=taasmoutput.Create;
@ -1230,13 +1231,37 @@ implementation
cg.a_load_ref_reg(list,OS_ADDR,href,self_pointer_reg); cg.a_load_ref_reg(list,OS_ADDR,href,self_pointer_reg);
end; end;
{ initialize return value }
if (not is_void(aktprocdef.rettype.def)) and if not is_void(aktprocdef.rettype.def) then
(aktprocdef.rettype.def.needs_inittable) then
begin begin
procinfo.flags:=procinfo.flags or pi_needs_implicit_finally; { for now the pointer to the result can't be a register }
reference_reset_base(href,procinfo.framepointer,procinfo.return_offset); if not(paramanager.ret_in_reg(aktprocdef.rettype.def)) then
cg.g_initialize(list,aktprocdef.rettype.def,href,paramanager.ret_in_param(aktprocdef.rettype.def)); begin
paraloc:=paramanager.getfuncretparaloc(aktprocdef);
reference_reset_base(href,procinfo.framepointer,procinfo.return_offset);
case paraloc.loc of
LOC_CREGISTER,
LOC_REGISTER:
if not(paraloc.size in [OS_64,OS_S64]) then
cg.a_load_reg_ref(list,paraloc.size,paraloc.register,href)
else
cg64.a_load64_reg_ref(list,paraloc.register64,href);
LOC_CFPUREGISTER,
LOC_FPUREGISTER:
cg.a_load_reg_ref(list,paraloc.size,paraloc.register,href);
LOC_CMMREGISTER,
LOC_MMREGISTER:
cg.a_loadmm_reg_ref(list,paraloc.register,href);
end;
end;
{ initialize return value }
if (aktprocdef.rettype.def.needs_inittable) then
begin
procinfo.flags:=procinfo.flags or pi_needs_implicit_finally;
reference_reset_base(href,procinfo.framepointer,procinfo.return_offset);
cg.g_initialize(list,aktprocdef.rettype.def,href,paramanager.ret_in_param(aktprocdef.rettype.def));
end;
end; end;
{ initialisize local data like ansistrings } { initialisize local data like ansistrings }
@ -1272,20 +1297,34 @@ implementation
hp:=tparaitem(procinfo.procdef.para.first); hp:=tparaitem(procinfo.procdef.para.first);
while assigned(hp) do while assigned(hp) do
begin begin
if (hp.paraloc.loc in [LOC_REGISTER,LOC_FPUREGISTER,LOC_MMREGISTER]) and if (tvarsym(hp.parasym).reg<>R_NO) then
(([vo_regable,vo_fpuregable]*tvarsym(hp.parasym).varoptions)=[]) then case hp.paraloc.loc of
LOC_CREGISTER,
LOC_REGISTER:
// if not(hp.paraloc.size in [OS_S64,OS_64]) then
cg.a_load_reg_reg(list,hp.paraloc.size,hp.paraloc.register,tvarsym(hp.parasym).reg);
// else
// cg64.a_load64_reg_reg(list,hp.paraloc.register64,tvarsym(hp.parasym).reg);
LOC_CFPUREGISTER,
LOC_FPUREGISTER:
cg.a_loadfpu_reg_reg(list,hp.paraloc.register,tvarsym(hp.parasym).reg);
end
else if (hp.paraloc.loc in [LOC_REGISTER,LOC_FPUREGISTER,LOC_MMREGISTER,
LOC_CREGISTER,LOC_CFPUREGISTER,LOC_CMMREGISTER]) and
(tvarsym(hp.parasym).reg=R_NO) then
begin begin
reference_reset_base(href,procinfo.framepointer,tvarsym(hp.parasym).address+
tvarsym(hp.parasym).owner.address_fixup);
case hp.paraloc.loc of case hp.paraloc.loc of
LOC_CREGISTER,
LOC_REGISTER: LOC_REGISTER:
begin if not(hp.paraloc.size in [OS_S64,OS_64]) then
reference_reset_base(href,procinfo.framepointer,tvarsym(hp.parasym).address); cg.a_load_reg_ref(list,hp.paraloc.size,hp.paraloc.register,href)
cg.a_load_reg_ref(list,hp.paraloc.size,hp.paraloc.register,href); else
end; cg64.a_load64_reg_ref(list,hp.paraloc.register64,href);
LOC_FPUREGISTER: LOC_FPUREGISTER,
begin LOC_CFPUREGISTER:
reference_reset_base(href,procinfo.framepointer,tvarsym(hp.parasym).address); cg.a_loadfpu_reg_ref(list,hp.paraloc.size,hp.paraloc.register,href);
cg.a_loadfpu_reg_ref(list,hp.paraloc.size,hp.paraloc.register,href);
end;
else else
internalerror(2002081302); internalerror(2002081302);
end; end;
@ -1792,7 +1831,10 @@ implementation
end. end.
{ {
$Log$ $Log$
Revision 1.48 2002-09-07 15:25:03 peter Revision 1.49 2002-09-10 21:48:30 florian
* improved handling of procedures with register calling conventions
Revision 1.48 2002/09/07 15:25:03 peter
* old logs removed and tabs fixed * old logs removed and tabs fixed
Revision 1.47 2002/09/02 18:44:48 peter Revision 1.47 2002/09/02 18:44:48 peter