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

+ added i8086 medium/compact model 6-byte (mixed near + far) method pointer support in tcgloadnode and tcgassignmentnode

Browse Source 
git-svn-id: trunk@25149 -
This commit is contained in:
nickysn 2013-07-20 15:06:14 +00:00
parent 8e6d4b41e2
commit 91d7b2bc94
1 changed files with 62 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
compiler/ncgld.pas
View File

@ -72,7 +72,7 @@ implementation
aasmbase, aasmbase,
cgbase,pass_2, cgbase,pass_2,
procinfo, procinfo,
cpubase,parabase, cpubase,parabase,cpuinfo,
tgobj,ncgutil, tgobj,ncgutil,
cgobj,hlcgobj, cgobj,hlcgobj,
ncgbas,ncgflw, ncgbas,ncgflw,
@ -527,16 +527,40 @@ implementation
else else
hregister:=location.registerhi; hregister:=location.registerhi;
{ load method address } { load method address }
reference_reset_base(href,hregister,tobjectdef(procdef.struct).vmtmethodoffset(procdef.extnumber),sizeof(pint)); {$ifdef i8086}
location.register:=cg.getaddressregister(current_asmdata.CurrAsmList); if po_far in procdef.procoptions then
cg.a_load_ref_reg(current_asmdata.CurrAsmList,OS_ADDR,OS_ADDR,href,location.register); begin
reference_reset_base(href,hregister,tobjectdef(procdef.struct).vmtmethodoffset(procdef.extnumber),4);
location.register:=cg.getintregister(current_asmdata.CurrAsmList,OS_32);
cg.a_load_ref_reg(current_asmdata.CurrAsmList,OS_32,OS_32,href,location.register);
end
else
{$endif i8086}
begin
reference_reset_base(href,hregister,tobjectdef(procdef.struct).vmtmethodoffset(procdef.extnumber),sizeof(pint));
location.register:=cg.getaddressregister(current_asmdata.CurrAsmList);
cg.a_load_ref_reg(current_asmdata.CurrAsmList,OS_ADDR,OS_ADDR,href,location.register);
end;
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,sizeof(pint)); {$ifdef i8086}
location.register:=cg.getaddressregister(current_asmdata.CurrAsmList); if po_far in procdef.procoptions then
cg.a_loadaddr_ref_reg(current_asmdata.CurrAsmList,href,location.register); begin
reference_reset_symbol(href,current_asmdata.RefAsmSymbol(procdef.mangledname),0,sizeof(pint));
location.register:=cg.getintregister(current_asmdata.CurrAsmList,OS_32);
cg.a_loadaddr_ref_reg(current_asmdata.CurrAsmList,href,location.register);
href.refaddr:=addr_seg;
cg.a_load_ref_reg(current_asmdata.CurrAsmList,OS_16,OS_16,href,GetNextReg(location.register));
end
else
{$endif i8086}
begin
reference_reset_symbol(href,current_asmdata.RefAsmSymbol(procdef.mangledname),0,sizeof(pint));
location.register:=cg.getaddressregister(current_asmdata.CurrAsmList);
cg.a_loadaddr_ref_reg(current_asmdata.CurrAsmList,href,location.register);
end;
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
@ -882,6 +906,37 @@ implementation
right.location.register64,left.location) right.location.register64,left.location)
else else
{$endif cpu64bitalu} {$endif cpu64bitalu}
{$ifdef i8086}
{ 6-byte method pointer support for the i8086 medium and compact memory models }
if (left.resultdef.typ = procvardef) and (left.resultdef.size = 6) then
begin
case left.location.loc of
LOC_REFERENCE,LOC_CREFERENCE:
begin
href:=left.location.reference;
{ proc address }
if po_far in tprocdef(right.resultdef).procoptions then
begin
cg.a_load_reg_ref(current_asmdata.CurrAsmList,OS_32,OS_32,right.location.register,href);
inc(href.offset, 4)
end
else
begin
cg.a_load_reg_ref(current_asmdata.CurrAsmList,OS_16,OS_16,right.location.register,href);
inc(href.offset, 2);
end;
{ object self }
if current_settings.x86memorymodel in x86_far_data_models then
cg.a_load_reg_ref(current_asmdata.CurrAsmList,OS_32,OS_32,right.location.registerhi,href)
else
cg.a_load_reg_ref(current_asmdata.CurrAsmList,OS_16,OS_16,right.location.registerhi,href);
end;
else
internalerror(2013072001);
end;
end
else
{$endif i8086}
hlcg.a_load_reg_loc(current_asmdata.CurrAsmList,right.resultdef,left.resultdef,right.location.register,left.location); hlcg.a_load_reg_loc(current_asmdata.CurrAsmList,right.resultdef,left.resultdef,right.location.register,left.location);
end; end;
LOC_FPUREGISTER, LOC_FPUREGISTER,