paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-04-10 23:20:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

* i8086 compiler fixed after 9848349610

Browse Source
This commit is contained in:
florian 2022-09-13 22:30:52 +02:00
parent 9848349610
commit cc7d67d08c
1 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
compiler/ncgld.pas
View File

@ -551,10 +551,10 @@ implementation
not tabstractprocdef(resultdef).is_addressonly then
begin
location_reset(location,LOC_CREGISTER,int_cgsize(voidpointertype.size*2));
{$ifdef CPU16BITADDR}
{$if defined(CPU8BITALU) and defined(CPU16BITADDR)}
{ cpus with 16 bit address registers don't use registerhi here, so allocate already here a register for all purposes }
location.register:=hlcg.getintregister(current_asmdata.CurrAsmList,s32inttype);
{$endif CPU16BITADDR}
{$endif defined(CPU8BITALU) and defined(CPU16BITADDR)}
secondpass(left);
{ load class instance/classrefdef address }
@ -572,11 +572,11 @@ implementation
{ this is not possible for objects }
if is_object(left.resultdef) then
internalerror(200304234);
{$ifdef CPU16BITADDR}
{$if defined(CPU8BITALU) and defined(CPU16BITADDR)}
hlcg.a_load_reg_reg(current_asmdata.CurrAsmList,left.resultdef,left.resultdef,left.location.register,cg.GetNextReg(cg.GetNextReg(location.register)));
{$else CPU16BITADDR}
{$else defined(CPU8BITALU) and defined(CPU16BITADDR)}
location.registerhi:=left.location.register;
{$endif CPU16BITADDR}
{$endif defined(CPU8BITALU) and defined(CPU16BITADDR)}
vd:=left.resultdef;
end;
LOC_CREFERENCE,
@ -587,22 +587,22 @@ implementation
is_nested_pd(procdef) then
begin
vd:=left.resultdef;
{$ifdef CPU16BITADDR}
{$if defined(CPU8BITALU) and defined(CPU16BITADDR)}
hlcg.a_load_ref_reg(current_asmdata.CurrAsmList,left.resultdef,left.resultdef,left.location.reference,cg.GetNextReg(cg.GetNextReg(location.register)))
{$else CPU16BITADDR}
{$else defined(CPU8BITALU) and defined(CPU16BITADDR)}
location.registerhi:=hlcg.getaddressregister(current_asmdata.CurrAsmList,left.resultdef);
hlcg.a_load_ref_reg(current_asmdata.CurrAsmList,left.resultdef,left.resultdef,left.location.reference,location.registerhi)
{$endif CPU16BITADDR}
{$endif defined(CPU8BITALU) and defined(CPU16BITADDR)}
end
else
begin
vd:=cpointerdef.getreusable(left.resultdef);
{$ifdef CPU16BITADDR}
{$if defined(CPU8BITALU) and defined(CPU16BITADDR)}
hlcg.a_loadaddr_ref_reg(current_asmdata.CurrAsmList,left.resultdef,vd,left.location.reference,cg.GetNextReg(cg.GetNextReg(location.register)));
{$else CPU16BITADDR}
{$else defined(CPU8BITALU) and defined(CPU16BITADDR)}
location.registerhi:=hlcg.getaddressregister(current_asmdata.CurrAsmList,vd);
hlcg.a_loadaddr_ref_reg(current_asmdata.CurrAsmList,left.resultdef,vd,left.location.reference,location.registerhi);
{$endif CPU16BITADDR}
{$endif defined(CPU8BITALU) and defined(CPU16BITADDR)}
end;
location_freetemp(current_asmdata.CurrAsmList,left.location);
end;
@ -633,18 +633,18 @@ implementation
vmtdef:=cpointerdef.getreusable(tobjectdef(left.resultdef).vmt_def);
hlcg.g_set_addr_nonbitpacked_field_ref(current_asmdata.CurrAsmList,tobjectdef(left.resultdef),tfieldvarsym(tobjectdef(left.resultdef).vmt_field),href);
{ targets with 32 bit method pointers got already a register assigned }
{$ifndef CPU16BITADDR}
{$if not(defined(CPU8BITALU) and defined(CPU16BITADDR))}
hregister:=hlcg.getaddressregister(current_asmdata.CurrAsmList,vmtdef);
{$endif CPU16BITADDR}
{$endif defined(CPU8BITALU) and defined(CPU16BITADDR)}
hlcg.a_load_ref_reg(current_asmdata.CurrAsmList,tfieldvarsym(tobjectdef(left.resultdef).vmt_field).vardef,vmtdef,href,hregister);
end
else if left.resultdef.typ=classrefdef then
begin
{ targets with 32 bit method pointers got already a register assigned }
{$ifndef CPU16BITADDR}
{$if not(defined(CPU8BITALU) and defined(CPU16BITADDR))}
{ classrefdef is a pointer to the vmt already }
hregister:=location.registerhi;
{$endif CPU16BITADDR}
{$endif defined(CPU8BITALU) and defined(CPU16BITADDR)}
vmtdef:=cpointerdef.getreusable(tobjectdef(tclassrefdef(left.resultdef).pointeddef).vmt_def);
hlcg.g_ptrtypecast_reg(current_asmdata.CurrAsmList,left.resultdef,vmtdef,hregister);
end
@ -654,9 +654,9 @@ implementation
hlcg.reference_reset_base(href,vd,location.registerhi,0,ctempposinvalid,vd.alignment,[]);
vmtdef:=cpointerdef.getreusable(tobjectdef(left.resultdef).vmt_def);
{ targets with 32 bit method pointers got already a register assigned }
{$ifndef CPU16BITADDR}
{$if not(defined(CPU8BITALU) and defined(CPU16BITADDR))}
hregister:=hlcg.getaddressregister(current_asmdata.CurrAsmList,vmtdef);
{$endif CPU16BITADDR}
{$endif defined(CPU8BITALU) and defined(CPU16BITADDR)}
hlcg.a_load_ref_reg(current_asmdata.CurrAsmList,vmtdef,vmtdef,href,hregister);
end
else
@ -666,9 +666,9 @@ implementation
tobjectdef(procdef.struct).vmtmethodoffset(procdef.extnumber));
hlcg.reference_reset_base(href,vmtdef,hregister,0,ctempposinvalid,vmtdef.alignment,[]);
{ targets with 32 bit method pointers got already a register assigned }
{$ifndef CPU16BITADDR}
{$if not(defined(CPU8BITALU) and defined(CPU16BITADDR))}
location.register:=hlcg.getaddressregister(current_asmdata.CurrAsmList,vmtentry.vardef);
{$endif CPU16BITADDR}
{$endif not(defined(CPU8BITALU) and defined(CPU16BITADDR))}
hlcg.g_set_addr_nonbitpacked_field_ref(current_asmdata.CurrAsmList,tabstractrecorddef(vmtdef.pointeddef),vmtentry,href);
hlcg.a_load_ref_reg(current_asmdata.CurrAsmList,vmtentry.vardef,vmtentry.vardef,href,location.register);
end
@ -677,9 +677,9 @@ implementation
{ load address of the function }
reference_reset_symbol(href,current_asmdata.RefAsmSymbol(procdef.mangledname,AT_FUNCTION),0,procdef.address_type.alignment,[]);
{ targets with 32 bit method pointers got already a register assigned }
{$ifndef CPU16BITADDR}
{$if not(defined(CPU8BITALU) and defined(CPU16BITADDR))}
location.register:=hlcg.getaddressregister(current_asmdata.CurrAsmList,cprocvardef.getreusableprocaddr(procdef,pc_address_only));
{$endif CPU16BITADDR}
{$endif not(defined(CPU8BITALU) and defined(CPU16BITADDR))}
hlcg.a_loadaddr_ref_reg(current_asmdata.CurrAsmList,procdef,cprocvardef.getreusableprocaddr(procdef,pc_address_only),href,location.register);
end;
@ -688,9 +688,9 @@ implementation
if target_info.endian=endian_big then
begin
{ cpus with 16 bit address registers don't use registerhi here }
{$ifdef CPU16BITADDR}
{$if defined(CPU8BITALU) and defined(CPU16BITADDR)}
Internalerror(2022091201);
{$endif CPU16BITADDR}
{$endif defined(CPU8BITALU) and defined(CPU16BITADDR)}
hregister:=location.register;
location.register:=location.registerhi;
location.registerhi:=hregister;