paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-08-12 12:26:02 +02:00
Code Issues Packages Projects Releases Wiki Activity

* fixed type of proc address when loading a complex procvar

Browse Source 
git-svn-id: trunk@32413 -
This commit is contained in:
Jonas Maebe 2015-11-21 12:37:08 +00:00
parent 9a0cb50a08
commit a3cdf466e3
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
compiler/ncgld.pas
View File

@ -534,14 +534,14 @@ implementation
{ load method address } { load method address }
hlcg.reference_reset_base(href,voidpointertype,hregister,tobjectdef(procdef.struct).vmtmethodoffset(procdef.extnumber),voidpointertype.alignment); hlcg.reference_reset_base(href,voidpointertype,hregister,tobjectdef(procdef.struct).vmtmethodoffset(procdef.extnumber),voidpointertype.alignment);
location.register:=hlcg.getaddressregister(current_asmdata.CurrAsmList,procdef.address_type); location.register:=hlcg.getaddressregister(current_asmdata.CurrAsmList,procdef.address_type);
hlcg.a_load_ref_reg(current_asmdata.CurrAsmList,procdef.address_type,procdef.address_type,href,location.register); hlcg.a_load_ref_reg(current_asmdata.CurrAsmList,procdef.address_type,cprocvardef.getreusableprocaddr(procdef),href,location.register);
end end
else else
begin begin
{ load address of the function } { load address of the function }
reference_reset_symbol(href,current_asmdata.RefAsmSymbol(procdef.mangledname),0,procdef.address_type.alignment); reference_reset_symbol(href,current_asmdata.RefAsmSymbol(procdef.mangledname),0,procdef.address_type.alignment);
location.register:=hlcg.getaddressregister(current_asmdata.CurrAsmList,procdef.address_type); location.register:=hlcg.getaddressregister(current_asmdata.CurrAsmList,procdef.address_type);
hlcg.a_loadaddr_ref_reg(current_asmdata.CurrAsmList,procdef,procdef.address_type,href,location.register); hlcg.a_loadaddr_ref_reg(current_asmdata.CurrAsmList,procdef,cprocvardef.getreusableprocaddr(procdef),href,location.register);
end; end;
{ to get methodpointers stored correctly, code and self register must be swapped on { to get methodpointers stored correctly, code and self register must be swapped on