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

+ also initialize the proper (foreign) segment when loading a global variable

Browse Source 
from another unit in the huge memory model

git-svn-id: trunk@31515 -
This commit is contained in:
nickysn 2015-09-04 16:05:52 +00:00
parent eaab604f0c
commit 2b42c17318
1 changed files with 83 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

87
compiler/i8086/n8086ld.pas
View File

@ -28,22 +28,28 @@ interface
uses
globtype,
symsym,symtype,
node,ncgld;
node,ncgld, aasmbase;
type
{ ti8086loadnode }
ti8086loadnode = class(tcgloadnode)
protected
procedure generate_nested_access(vs: tsym); override;
procedure generate_absaddr_access(vs: tabsolutevarsym); override;
public
procedure pass_generate_code;override;
end;
implementation
uses
globals,aasmdata,
symcpu,
globals,aasmdata,defutil,
symconst,symcpu,
nld,
cgbase,cgobj,
cgbase,cgobj,cgutils,
cpubase,cpuinfo;
{*****************************************************************************
@ -85,6 +91,79 @@ implementation
inherited;
end;
procedure ti8086loadnode.pass_generate_code;
var
gvs: tstaticvarsym;
segref: treference;
refsym: TAsmSymbol;
segreg: TRegister;
newsize: TCgSize;
begin
if current_settings.x86memorymodel=mm_huge then
begin
case symtableentry.typ of
staticvarsym:
begin
gvs:=tstaticvarsym(symtableentry);
if (vo_is_dll_var in gvs.varoptions) then
{ DLL variable }
begin
inherited pass_generate_code;
exit;
end
{ Thread variable }
else if (vo_is_thread_var in gvs.varoptions) then
begin
inherited pass_generate_code;
exit;
end
{ Normal (or external) variable }
else
begin
if gvs.Owner.iscurrentunit then
begin
inherited pass_generate_code;
exit;
end;
{ we don't know the size of all arrays }
newsize:=def_cgsize(resultdef);
{ alignment is overridden per case below }
location_reset_ref(location,LOC_REFERENCE,newsize,resultdef.alignment);
if gvs.localloc.loc=LOC_INVALID then
begin
if not(vo_is_weak_external in gvs.varoptions) then
refsym:=current_asmdata.RefAsmSymbol(gvs.mangledname)
else
refsym:=current_asmdata.WeakRefAsmSymbol(gvs.mangledname);
segreg:=cg.getintregister(current_asmdata.CurrAsmList,OS_16);
reference_reset_symbol(segref,refsym,0,0);
segref.refaddr:=addr_seg;
cg.a_load_ref_reg(current_asmdata.CurrAsmList,OS_16,OS_16,segref,segreg);
reference_reset_symbol(location.reference,refsym,0,location.reference.alignment);
location.reference.segment:=segreg;
end
else
location:=gvs.localloc;
end;
{ make const a LOC_CREFERENCE }
if (gvs.varspez=vs_const) and
(location.loc=LOC_REFERENCE) then
location.loc:=LOC_CREFERENCE;
end;
else
inherited pass_generate_code;
end;
end
else
inherited pass_generate_code;
end;
begin
cloadnode:=ti8086loadnode;