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

* specify Tasmsymtype=AT_FUNCTION and use Create_nil_codeptr when generating the code pointers in the InitFinal table

Browse Source 
git-svn-id: trunk@25286 -
This commit is contained in:
nickysn 2013-08-18 18:27:48 +00:00
parent e147895f80
commit 10db067372
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
compiler/ngenutil.pas
View File

@ -572,14 +572,14 @@ implementation
begin
pd := tabstractrecorddef(structlist[i]).find_procdef_bytype(potype_class_constructor);
if assigned(pd) then
unitinits.concat(Tai_const.Createname(pd.mangledname,0))
unitinits.concat(Tai_const.Createname(pd.mangledname,AT_FUNCTION,0))
else
unitinits.concat(Tai_const.Create_pint(0));
unitinits.concat(Tai_const.Create_nil_codeptr);
pd := tabstractrecorddef(structlist[i]).find_procdef_bytype(potype_class_destructor);
if assigned(pd) then
unitinits.concat(Tai_const.Createname(pd.mangledname,0))
unitinits.concat(Tai_const.Createname(pd.mangledname,AT_FUNCTION,0))
else
unitinits.concat(Tai_const.Create_pint(0));
unitinits.concat(Tai_const.Create_nil_codeptr);
inc(count);
end;
structlist.free;
@ -598,13 +598,13 @@ implementation
if (hp.u.flags and (uf_init or uf_finalize))<>0 then
begin
if (hp.u.flags and uf_init)<>0 then
unitinits.concat(Tai_const.Createname(make_mangledname('INIT$',hp.u.globalsymtable,''),0))
unitinits.concat(Tai_const.Createname(make_mangledname('INIT$',hp.u.globalsymtable,''),AT_FUNCTION,0))
else
unitinits.concat(Tai_const.Create_sym(nil));
unitinits.concat(Tai_const.Create_nil_codeptr);
if (hp.u.flags and uf_finalize)<>0 then
unitinits.concat(Tai_const.Createname(make_mangledname('FINALIZE$',hp.u.globalsymtable,''),0))
unitinits.concat(Tai_const.Createname(make_mangledname('FINALIZE$',hp.u.globalsymtable,''),AT_FUNCTION,0))
else
unitinits.concat(Tai_const.Create_sym(nil));
unitinits.concat(Tai_const.Create_nil_codeptr);
inc(count);
end;
hp:=tused_unit(hp.next);
@ -616,13 +616,13 @@ implementation
if (current_module.flags and (uf_init or uf_finalize))<>0 then
begin
if (current_module.flags and uf_init)<>0 then
unitinits.concat(Tai_const.Createname(make_mangledname('INIT$',current_module.localsymtable,''),0))
unitinits.concat(Tai_const.Createname(make_mangledname('INIT$',current_module.localsymtable,''),AT_FUNCTION,0))
else
unitinits.concat(Tai_const.Create_sym(nil));
unitinits.concat(Tai_const.Create_nil_codeptr);
if (current_module.flags and uf_finalize)<>0 then
unitinits.concat(Tai_const.Createname(make_mangledname('FINALIZE$',current_module.localsymtable,''),0))
unitinits.concat(Tai_const.Createname(make_mangledname('FINALIZE$',current_module.localsymtable,''),AT_FUNCTION,0))
else
unitinits.concat(Tai_const.Create_sym(nil));
unitinits.concat(Tai_const.Create_nil_codeptr);
inc(count);
end;
{ Insert TableCount,InitCount at start }