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

* replaced cg.a_label/a_jmp_always with hlcg.* calls (only for consistency,

Browse Source 
does not change anything in practice)

git-svn-id: trunk@35157 -
This commit is contained in:
Jonas Maebe 2016-12-18 13:57:29 +00:00
parent 3ae1f6664a
commit 6a1c4f9b75
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
compiler/ncgflw.pas
View File

@ -866,7 +866,7 @@ implementation
hlcg.g_call_system_proc(current_asmdata.CurrAsmList,'fpc_popaddrstack',[],nil);
hlcg.g_exception_reason_discard(current_asmdata.CurrAsmList,osuinttype,excepttemps.reasonbuf);
cexceptionstatehandler.cleanupobjectstack;
cg.a_jmp_always(current_asmdata.CurrAsmList,oldBreakLabel);
hlcg.a_jmp_always(current_asmdata.CurrAsmList,oldBreakLabel);
end;
if fc_continue in doobjectdestroyandreraisestate.newflowcontrol then
@ -894,7 +894,7 @@ implementation
hlcg.a_label(current_asmdata.CurrAsmList,breaktrylabel);
hlcg.g_call_system_proc(current_asmdata.CurrAsmList,'fpc_popaddrstack',[],nil);
hlcg.g_exception_reason_discard(current_asmdata.CurrAsmList,osuinttype,excepttemps.reasonbuf);
cg.a_jmp_always(current_asmdata.CurrAsmList,oldBreakLabel);
hlcg.a_jmp_always(current_asmdata.CurrAsmList,oldBreakLabel);
end;
if fc_continue in trystate.newflowcontrol then
@ -902,7 +902,7 @@ implementation
hlcg.a_label(current_asmdata.CurrAsmList,continuetrylabel);
hlcg.g_call_system_proc(current_asmdata.CurrAsmList,'fpc_popaddrstack',[],nil);
hlcg.g_exception_reason_discard(current_asmdata.CurrAsmList,osuinttype,excepttemps.reasonbuf);
cg.a_jmp_always(current_asmdata.CurrAsmList,oldContinueLabel);
hlcg.a_jmp_always(current_asmdata.CurrAsmList,oldContinueLabel);
end;
cexceptionstatehandler.unget_exception_temps(current_asmdata.CurrAsmList,excepttemps);
hlcg.a_label(current_asmdata.CurrAsmList,endexceptlabel);
@ -1026,7 +1026,7 @@ implementation
tg.UngetLocal(current_asmdata.CurrAsmList,exceptvarsym.localloc.reference);
exceptvarsym.localloc.loc:=LOC_INVALID;
end;
cg.a_jmp_always(current_asmdata.CurrAsmList,endexceptlabel);
hlcg.a_jmp_always(current_asmdata.CurrAsmList,endexceptlabel);
if assigned(right) then
begin
@ -1034,22 +1034,22 @@ implementation
if fc_exit in doobjectdestroyandreraisestate.newflowcontrol then
begin
{ the address and object pop does secondtryexcept }
cg.a_label(current_asmdata.CurrAsmList,exitonlabel);
cg.a_jmp_always(current_asmdata.CurrAsmList,oldCurrExitLabel);
hlcg.a_label(current_asmdata.CurrAsmList,exitonlabel);
hlcg.a_jmp_always(current_asmdata.CurrAsmList,oldCurrExitLabel);
end;
if fc_break in doobjectdestroyandreraisestate.newflowcontrol then
begin
{ the address and object pop does secondtryexcept }
cg.a_label(current_asmdata.CurrAsmList,breakonlabel);
cg.a_jmp_always(current_asmdata.CurrAsmList,oldBreakLabel);
hlcg.a_label(current_asmdata.CurrAsmList,breakonlabel);
hlcg.a_jmp_always(current_asmdata.CurrAsmList,oldBreakLabel);
end;
if fc_continue in doobjectdestroyandreraisestate.newflowcontrol then
begin
{ the address and object pop does secondtryexcept }
cg.a_label(current_asmdata.CurrAsmList,continueonlabel);
cg.a_jmp_always(current_asmdata.CurrAsmList,oldContinueLabel);
hlcg.a_label(current_asmdata.CurrAsmList,continueonlabel);
hlcg.a_jmp_always(current_asmdata.CurrAsmList,oldContinueLabel);
end;
current_procinfo.CurrExitLabel:=oldCurrExitLabel;
@ -1061,7 +1061,7 @@ implementation
end;
cexceptionstatehandler.unget_exception_temps(current_asmdata.CurrAsmList,excepttemps);
cg.a_label(current_asmdata.CurrAsmList,nextonlabel);
hlcg.a_label(current_asmdata.CurrAsmList,nextonlabel);
flowcontrol:=doobjectdestroyandreraisestate.oldflowcontrol+(doobjectdestroyandreraisestate.newflowcontrol-[fc_inflowcontrol]);
paraloc1.done;
current_asmdata.CurrAsmList.concat(tai_marker.create(mark_NoLineInfoEnd));