paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-10-28 18:41:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

* dealloc function result registers, register allocation is now

Browse Source 
back at pre-paraloc level
This commit is contained in:
peter 2004-09-27 15:15:20 +00:00
parent 77b6de17a6
commit 96a6acbda2
1 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
compiler/ncgcal.pas
View File

@ -505,14 +505,16 @@ implementation
{ ansi/widestrings must be registered, so we can dispose them } { ansi/widestrings must be registered, so we can dispose them }
if resulttype.def.needs_inittable then if resulttype.def.needs_inittable then
begin begin
if resultparaloc^.loc<>LOC_REGISTER then
internalerror(200409261);
{ the FUNCTION_RESULT_REG is already allocated } { the FUNCTION_RESULT_REG is already allocated }
if getsupreg(resultparaloc^.register)<first_mm_imreg then
cg.ungetcpuregister(exprasmlist,resultparaloc^.register);
if not assigned(funcretnode) then if not assigned(funcretnode) then
begin begin
location_reset(location,LOC_REFERENCE,OS_ADDR); location_reset(location,LOC_REFERENCE,OS_ADDR);
location.reference:=refcountedtemp; location.reference:=refcountedtemp;
{ a_load_reg_ref may allocate registers! }
cg.a_load_reg_ref(exprasmlist,OS_ADDR,OS_ADDR,NR_FUNCTION_RESULT_REG,location.reference); cg.a_load_reg_ref(exprasmlist,OS_ADDR,OS_ADDR,NR_FUNCTION_RESULT_REG,location.reference);
cg.ungetcpuregister(exprasmlist,NR_FUNCTION_RESULT_REG);
end end
else else
begin begin
@ -552,6 +554,8 @@ implementation
{$ifdef x86} {$ifdef x86}
tcgx86(cg).inc_fpu_stack; tcgx86(cg).inc_fpu_stack;
{$else x86} {$else x86}
if getsupreg(resultparaloc^.register)<first_fpu_imreg then
cg.ungetcpuregister(exprasmlist,resultparaloc^.register);
hregister:=cg.getfpuregister(exprasmlist,location.size); hregister:=cg.getfpuregister(exprasmlist,location.size);
cg.a_loadfpu_reg_reg(exprasmlist,location.size,location.register,hregister); cg.a_loadfpu_reg_reg(exprasmlist,location.size,location.register,hregister);
location.register:=hregister; location.register:=hregister;
@ -570,8 +574,12 @@ implementation
if retloc.loc<>LOC_REGISTER then if retloc.loc<>LOC_REGISTER then
internalerror(200409141); internalerror(200409141);
{ the function result registers are already allocated } { the function result registers are already allocated }
if getsupreg(retloc.registerlow)<first_int_imreg then
cg.ungetcpuregister(exprasmlist,retloc.registerlow);
location.registerlow:=cg.getintregister(exprasmlist,OS_32); location.registerlow:=cg.getintregister(exprasmlist,OS_32);
cg.a_load_reg_reg(exprasmlist,OS_32,OS_32,retloc.registerlow,location.registerlow); cg.a_load_reg_reg(exprasmlist,OS_32,OS_32,retloc.registerlow,location.registerlow);
if getsupreg(retloc.registerhigh)<first_int_imreg then
cg.ungetcpuregister(exprasmlist,retloc.registerhigh);
location.registerhigh:=cg.getintregister(exprasmlist,OS_32); location.registerhigh:=cg.getintregister(exprasmlist,OS_32);
cg.a_load_reg_reg(exprasmlist,OS_32,OS_32,retloc.registerhigh,location.registerhigh); cg.a_load_reg_reg(exprasmlist,OS_32,OS_32,retloc.registerhigh,location.registerhigh);
end end
@ -582,6 +590,8 @@ implementation
getregister was done for the full register getregister was done for the full register
def_cgsize(resulttype.def) is used here because def_cgsize(resulttype.def) is used here because
it could be a constructor call } it could be a constructor call }
if getsupreg(resultparaloc^.register)<first_int_imreg then
cg.ungetcpuregister(exprasmlist,resultparaloc^.register);
location.register:=cg.getintregister(exprasmlist,def_cgsize(resulttype.def)); location.register:=cg.getintregister(exprasmlist,def_cgsize(resulttype.def));
cg.a_load_reg_reg(exprasmlist,cgsize,def_cgsize(resulttype.def),resultparaloc^.register,location.register); cg.a_load_reg_reg(exprasmlist,cgsize,def_cgsize(resulttype.def),resultparaloc^.register,location.register);
end; end;
@ -596,6 +606,8 @@ implementation
LOC_MMREGISTER: LOC_MMREGISTER:
begin begin
location_reset(location,LOC_MMREGISTER,cgsize); location_reset(location,LOC_MMREGISTER,cgsize);
if getsupreg(resultparaloc^.register)<first_mm_imreg then
cg.ungetcpuregister(exprasmlist,resultparaloc^.register);
location.register:=cg.getmmregister(exprasmlist,cgsize); location.register:=cg.getmmregister(exprasmlist,cgsize);
cg.a_loadmm_reg_reg(exprasmlist,cgsize,cgsize,resultparaloc^.register,location.register,mms_movescalar); cg.a_loadmm_reg_reg(exprasmlist,cgsize,cgsize,resultparaloc^.register,location.register,mms_movescalar);
end; end;
@ -1220,7 +1232,11 @@ begin
end. end.
{ {
$Log$ $Log$
Revision 1.175 2004-09-25 14:23:54 peter Revision 1.176 2004-09-27 15:15:20 peter
* dealloc function result registers, register allocation is now
back at pre-paraloc level
Revision 1.175 2004/09/25 14:23:54 peter
* ungetregister is now only used for cpuregisters, renamed to * ungetregister is now only used for cpuregisters, renamed to
ungetcpuregister ungetcpuregister
* renamed (get|unget)explicitregister(s) to ..cpuregister * renamed (get|unget)explicitregister(s) to ..cpuregister