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

* place exception handling code in the correct asmlist

Browse Source 
git-svn-id: branches/debug_eh@42195 -
This commit is contained in:
Jonas Maebe 2019-06-08 20:17:06 +00:00
parent d0be4f11b8
commit 21bc37db44
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
compiler/cgexcept.pas
View File

@ -162,9 +162,9 @@ unit cgexcept;
{ fpc_pushexceptaddr(exceptionframetype, setjmp_buffer, exception_address_chain_entry) }
pd:=search_system_proc('fpc_pushexceptaddr');
paramanager.getintparaloc(current_asmdata.CurrAsmList,pd,1,paraloc1);
paramanager.getintparaloc(current_asmdata.CurrAsmList,pd,2,paraloc2);
paramanager.getintparaloc(current_asmdata.CurrAsmList,pd,3,paraloc3);
paramanager.getintparaloc(list,pd,1,paraloc1);
paramanager.getintparaloc(list,pd,2,paraloc2);
paramanager.getintparaloc(list,pd,3,paraloc3);
if pd.is_pushleftright then
begin
{ type of exceptionframe }
@ -197,7 +197,7 @@ unit cgexcept;
{ fpc_setjmp(result_of_pushexceptaddr_call) }
pd:=search_system_proc('fpc_setjmp');
paramanager.getintparaloc(current_asmdata.CurrAsmList,pd,1,paraloc1);
paramanager.getintparaloc(list,pd,1,paraloc1);
hlcg.a_load_reg_cgpara(list,pushexceptres.def,tmpresloc.register,paraloc1);
paramanager.freecgpara(list,paraloc1);
@ -262,7 +262,7 @@ unit cgexcept;
{ add an catch all action clause, at least psabieh needs this }
catch_all_add(list);
end_try_block(list,tek_except,t,entrystate,exitlabel);
emit_except_label(current_asmdata.CurrAsmList,tek_except,entrystate,t);
emit_except_label(list,tek_except,entrystate,t);
{ don't generate line info for internal cleanup }
list.concat(tai_marker.create(mark_NoLineInfoStart));
free_exception(list,t,entrystate,0,exitlabel,false);
@ -276,7 +276,7 @@ unit cgexcept;
class procedure tcgexceptionstatehandler.handle_reraise(list: TAsmList; const t: texceptiontemps; const entrystate: texceptionstate; const exceptframekind: texceptframekind);
begin
hlcg.g_call_system_proc(current_asmdata.CurrAsmList,'fpc_reraise',[],nil).resetiftemp;
hlcg.g_call_system_proc(list,'fpc_reraise',[],nil).resetiftemp;
end;

4
compiler/psabiehpi.pas
View File

@ -645,7 +645,7 @@ implementation
paramanager.getintparaloc(list,pd,1,cgpara1);
hlcg.a_load_reg_cgpara(list,voidpointertype,t.unwind_info,cgpara1);
paramanager.freecgpara(list,cgpara1);
hlcg.g_call_system_proc(current_asmdata.CurrAsmList,'_unwind_resume',[@cgpara1],nil).resetiftemp;
hlcg.g_call_system_proc(list,'_unwind_resume',[@cgpara1],nil).resetiftemp;
{ we do not have to clean up the stack, we never return }
cgpara1.done;
@ -670,7 +670,7 @@ implementation
end
else
ReRaiseLandingPad:=nil;
hlcg.g_call_system_proc(current_asmdata.CurrAsmList,'fpc_reraise',[],nil).resetiftemp;
hlcg.g_call_system_proc(list,'fpc_reraise',[],nil).resetiftemp;
if assigned(ReRaiseLandingPad) then
begin
psabiehprocinfo.CreateNewPSABIEHCallsite(list);