From 13a459c2d71a1b9f0e5c02d7ad0d08e52ec1a50e Mon Sep 17 00:00:00 2001 From: Jonas Maebe Date: Sat, 20 Aug 2011 07:51:37 +0000 Subject: [PATCH] * replaced all calls to cg.g_incr/decrrefcount/g_initialize/g_finalize with calls to hlcg.* git-svn-id: branches/jvmbackend@18361 - --- compiler/ncgbas.pas | 4 ++-- compiler/ncgcal.pas | 2 +- compiler/ncgutil.pas | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/compiler/ncgbas.pas b/compiler/ncgbas.pas index a8625aa749..a704755983 100644 --- a/compiler/ncgbas.pas +++ b/compiler/ncgbas.pas @@ -71,7 +71,7 @@ interface aasmbase,aasmtai,aasmdata,aasmcpu, symsym,symconst,symdef,defutil, nflw,pass_2,ncgutil, - cgbase,cgobj, + cgbase,cgobj,hlcgobj, procinfo, tgobj ; @@ -402,7 +402,7 @@ interface tg.GetTempTyped(current_asmdata.CurrAsmList,tempinfo^.typedef,tempinfo^.temptype,tempinfo^.location.reference); { the temp could have been used previously either because the memory location was reused or because we're in a loop } - cg.g_finalize(current_asmdata.CurrAsmList,tempinfo^.typedef,tempinfo^.location.reference); + hlcg.g_finalize(current_asmdata.CurrAsmList,tempinfo^.typedef,tempinfo^.location.reference); end else if (ti_may_be_in_reg in tempinfo^.flags) then begin diff --git a/compiler/ncgcal.pas b/compiler/ncgcal.pas index f94c5e2b35..718a6081ef 100644 --- a/compiler/ncgcal.pas +++ b/compiler/ncgcal.pas @@ -410,7 +410,7 @@ implementation function since this is code is only executed after the function call has returned } if is_managed_type(funcretnode.resultdef) and (funcretnode.nodetype<>temprefn) then - cg.g_decrrefcount(current_asmdata.CurrAsmList,funcretnode.resultdef,funcretnode.location.reference); + hlcg.g_decrrefcount(current_asmdata.CurrAsmList,funcretnode.resultdef,funcretnode.location.reference); case location.loc of LOC_REGISTER : diff --git a/compiler/ncgutil.pas b/compiler/ncgutil.pas index ce177f9b54..76efd24080 100644 --- a/compiler/ncgutil.pas +++ b/compiler/ncgutil.pas @@ -1707,7 +1707,7 @@ implementation cg.g_array_rtti_helper(list,eldef,href,hsym.initialloc,'FPC_DECREF_ARRAY'); end else - cg.g_decrrefcount(list,tparavarsym(p).vardef,href); + hlcg.g_decrrefcount(list,tparavarsym(p).vardef,href); end; end; { open arrays can contain elements requiring init/final code, so the else has been removed here } @@ -1736,7 +1736,7 @@ implementation is_managed_type(hp^.def) then begin reference_reset_base(href,current_procinfo.framepointer,hp^.pos,sizeof(pint)); - cg.g_initialize(list,hp^.def,href); + hlcg.g_initialize(list,hp^.def,href); end; hp:=hp^.next; end; @@ -1756,7 +1756,7 @@ implementation begin include(current_procinfo.flags,pi_needs_implicit_finally); reference_reset_base(href,current_procinfo.framepointer,hp^.pos,sizeof(pint)); - cg.g_finalize(list,hp^.def,href); + hlcg.g_finalize(list,hp^.def,href); end; hp:=hp^.next; end;