From 837df925c56f81c88dc1020cd216177976edf202 Mon Sep 17 00:00:00 2001 From: Pierre Muller Date: Thu, 27 Oct 2022 22:48:46 +0100 Subject: [PATCH] Short version of the mips code genration bug (cherry picked from commit dce70b3b704985cdfb7cdf40cc7d59e5d52d5422) --- compiler/ncal.pas | 20 +++++++++++++++----- compiler/ncgcal.pas | 4 ++-- 2 files changed, 17 insertions(+), 7 deletions(-) diff --git a/compiler/ncal.pas b/compiler/ncal.pas index 8d9de8a9b6..d4e69141fa 100644 --- a/compiler/ncal.pas +++ b/compiler/ncal.pas @@ -4245,15 +4245,25 @@ implementation procedure tcallnode.check_stack_parameters; var hp : tcallparanode; + loc : pcgparalocation; begin hp:=tcallparanode(left); while assigned(hp) do begin - if assigned(hp.parasym) and - assigned(hp.parasym.paraloc[callerside].location) and - (hp.parasym.paraloc[callerside].location^.loc=LOC_REFERENCE) then - include(current_procinfo.flags,pi_has_stackparameter); - hp:=tcallparanode(hp.right); + if assigned(hp.parasym) then + begin + loc:=hp.parasym.paraloc[callerside].location; + while assigned(loc) do + begin + if loc^.loc=LOC_REFERENCE then + begin + include(current_procinfo.flags,pi_has_stackparameter); + exit; + end; + loc:=loc^.next; + end; + end; + hp:=tcallparanode(hp.right); end; end; diff --git a/compiler/ncgcal.pas b/compiler/ncgcal.pas index c4f609f66e..6b02c5754e 100644 --- a/compiler/ncgcal.pas +++ b/compiler/ncgcal.pas @@ -742,7 +742,7 @@ implementation } paramanager.freecgpara(current_asmdata.CurrAsmList,ppn.tempcgpara); tmpparaloc:=ppn.tempcgpara.location; - sizeleft:=ppn.tempcgpara.intsize; + sizeleft:=ppn.parasym.paraloc[callerside].intsize; calleralignment:=ppn.parasym.paraloc[callerside].alignment; tmpalignment:=ppn.tempcgpara.alignment; if (tmpalignment=0) or @@ -806,7 +806,7 @@ implementation reference_reset_base(htempref,tmpparaloc^.reference.index,tmpparaloc^.reference.offset,ctempposinvalid,tmpalignment,[]); { use concatcopy, because it can also be a float which fails when load_ref_ref is used } - if (ppn.tempcgpara.size <> OS_NO) then + if (tmpparaloc^.size <> OS_NO) then cg.g_concatcopy(current_asmdata.CurrAsmList,htempref,href,tcgsize2size[tmpparaloc^.size]) else cg.g_concatcopy(current_asmdata.CurrAsmList,htempref,href,sizeleft)