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

* 8086: Fixed Ofs() for far routines.

Browse Source 
resultdef of typeconvnode.typecheck_proc_to_procvar() is reused every time you get an address of a proc. So it is forbidden to change the far/near attribute of resultdef - it leads to mess during code generation. 
  Instead it is needed to use separate reusable resultdefs with new flags pc_far_address and pc_offset.

git-svn-id: trunk@46470 -
This commit is contained in:
yury 2020-08-17 13:37:55 +00:00
parent 6878ffbf04
commit 222f981dd1
2 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
compiler/i8086/n8086cnv.pas
View File

@ -70,14 +70,22 @@ implementation
begin
if resultdef.typ<>procvardef then
internalerror(2018040401);
exclude(tprocvardef(resultdef).procoptions,po_far);
if po_far in tprocvardef(resultdef).procoptions then
begin
resultdef:=cprocvardef.getreusableprocaddr(tabstractprocdef(left.resultdef),pc_offset);
exclude(tprocvardef(resultdef).procoptions,po_far);
end;
end
else if (tcnf_proc_2_procvar_2_voidpointer in convnodeflags) and
(current_settings.x86memorymodel in x86_far_code_models) then
begin
if resultdef.typ<>procvardef then
internalerror(2018040402);
include(tprocvardef(resultdef).procoptions,po_far);
if not (po_far in tprocvardef(resultdef).procoptions) then
begin
resultdef:=cprocvardef.getreusableprocaddr(tabstractprocdef(left.resultdef),pc_far_address);
include(tprocvardef(resultdef).procoptions,po_far);
end;
end;
end;

6
compiler/symdef.pas
View File

@ -643,6 +643,12 @@ interface
pno_mangledname, pno_noparams);
tprocnameoptions = set of tprocnameoption;
tproccopytyp = (pc_normal,
{$ifdef i8086}
{ the address in a far format }
pc_far_address,
{ the offset part of the far address }
pc_offset,
{$endif i8086}
{ creates a procvardef describing only the code pointer
of a method/netsted function/... }
pc_address_only,