paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-11-11 06:39:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

* Pass NR_FUNCTION_RESULT_REG to FPC_SAFECALLCHECK in target-independent way.

Browse Source 
* Added missing call to paramanager.freecgpara.
* Handle safecall stuff after deallocating registers of the main call in order to keep allocations balanced.

git-svn-id: trunk@21021 -
This commit is contained in:
sergei 2012-04-24 14:50:56 +00:00
parent 04ca8a9126
commit 13e513fdf7
1 changed files with 15 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
compiler/ncgcal.pas
View File

@ -646,9 +646,9 @@ implementation
{$ifdef vtentry} {$ifdef vtentry}
sym : tasmsymbol; sym : tasmsymbol;
{$endif vtentry} {$endif vtentry}
{$ifdef x86_64} {$if defined(x86) or defined(arm)}
cgpara : tcgpara; cgpara : tcgpara;
{$endif x86_64} {$endif}
begin begin
if not assigned(procdefinition) or if not assigned(procdefinition) or
not(procdefinition.has_paraloc_info in [callerside,callbothsides]) then not(procdefinition.has_paraloc_info in [callerside,callbothsides]) then
@ -907,28 +907,25 @@ implementation
end; end;
end; end;
{$if defined(x86) or defined(arm)}
if (procdefinition.proccalloption=pocall_safecall) and
(tf_safecall_exceptions in target_info.flags) then
begin
{$ifdef x86_64}
cgpara.init;
paramanager.getintparaloc(pocall_default,1,cgpara);
cg.a_load_reg_cgpara(current_asmdata.CurrAsmList,OS_ADDR,NR_RAX,cgpara);
cgpara.done;
{$endif x86_64}
cg.allocallcpuregisters(current_asmdata.CurrAsmList);
cg.a_call_name(current_asmdata.CurrAsmList,'FPC_SAFECALLCHECK',false);
cg.deallocallcpuregisters(current_asmdata.CurrAsmList);
end;
{$endif}
if cg.uses_registers(R_MMREGISTER) then if cg.uses_registers(R_MMREGISTER) then
cg.dealloccpuregisters(current_asmdata.CurrAsmList,R_MMREGISTER,regs_to_save_mm); cg.dealloccpuregisters(current_asmdata.CurrAsmList,R_MMREGISTER,regs_to_save_mm);
if cg.uses_registers(R_FPUREGISTER) then if cg.uses_registers(R_FPUREGISTER) then
cg.dealloccpuregisters(current_asmdata.CurrAsmList,R_FPUREGISTER,regs_to_save_fpu); cg.dealloccpuregisters(current_asmdata.CurrAsmList,R_FPUREGISTER,regs_to_save_fpu);
cg.dealloccpuregisters(current_asmdata.CurrAsmList,R_INTREGISTER,regs_to_save_int); cg.dealloccpuregisters(current_asmdata.CurrAsmList,R_INTREGISTER,regs_to_save_int);
{$if defined(x86) or defined(arm)}
if (procdefinition.proccalloption=pocall_safecall) and
(tf_safecall_exceptions in target_info.flags) then
begin
cgpara.init;
paramanager.getintparaloc(pocall_default,1,cgpara);
cg.a_load_reg_cgpara(current_asmdata.CurrAsmList,OS_INT,NR_FUNCTION_RESULT_REG,cgpara);
paramanager.freecgpara(current_asmdata.CurrAsmList,cgpara);
cgpara.done;
cg.g_call(current_asmdata.CurrAsmList,'FPC_SAFECALLCHECK');
end;
{$endif}
{ handle function results } { handle function results }
if (not is_void(resultdef)) then if (not is_void(resultdef)) then
handle_return_value handle_return_value