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

* Overloaded MemPos_ExeSection and DataPos_ExeSection accepting a TExeSection instead of name.

Browse Source 
git-svn-id: trunk@21661 -
This commit is contained in:
sergei 2012-06-20 13:33:18 +00:00
parent 2768e0fc12
commit 98fffb7981
1 changed files with 39 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
compiler/ogbase.pas
View File

@ -470,10 +470,12 @@ interface
procedure Order_ObjSection(const aname:string);virtual;
procedure MemPos_Start;virtual;
procedure MemPos_Header;virtual;
procedure MemPos_ExeSection(exesec:TExeSection);
procedure MemPos_ExeSection(const aname:string);virtual;
procedure MemPos_EndExeSection;virtual;
procedure DataPos_Start;virtual;
procedure DataPos_Header;virtual;
procedure DataPos_ExeSection(exesec:TExeSection);
procedure DataPos_ExeSection(const aname:string);virtual;
procedure DataPos_EndExeSection;virtual;
procedure DataPos_Symbols;virtual;
@ -1912,29 +1914,35 @@ implementation
end;
procedure TExeOutput.MemPos_ExeSection(const aname:string);
procedure TExeOutput.MemPos_ExeSection(exesec:TExeSection);
var
i : longint;
objsec : TObjSection;
begin
{ Alignment of ExeSection }
CurrMemPos:=align(CurrMemPos,SectionMemAlign);
exesec.MemPos:=CurrMemPos;
{ set position of object ObjSections }
for i:=0 to exesec.ObjSectionList.Count-1 do
begin
objsec:=TObjSection(exesec.ObjSectionList[i]);
CurrMemPos:=objsec.setmempos(CurrMemPos);
end;
{ calculate size of the section }
exesec.Size:=CurrMemPos-exesec.MemPos;
end;
procedure TExeOutput.MemPos_ExeSection(const aname:string);
begin
{ Section can be removed }
FCurrExeSec:=FindExeSection(aname);
if not assigned(CurrExeSec) then
exit;
{ Alignment of ExeSection }
CurrMemPos:=align(CurrMemPos,SectionMemAlign);
CurrExeSec.MemPos:=CurrMemPos;
{ set position of object ObjSections }
for i:=0 to CurrExeSec.ObjSectionList.Count-1 do
begin
objsec:=TObjSection(CurrExeSec.ObjSectionList[i]);
CurrMemPos:=objsec.setmempos(CurrMemPos);
end;
{ calculate size of the section }
CurrExeSec.Size:=CurrMemPos-CurrExeSec.MemPos;
MemPos_ExeSection(CurrExeSec);
end;
@ -1956,34 +1964,29 @@ implementation
end;
procedure TExeOutput.DataPos_ExeSection(const aname:string);
procedure TExeOutput.DataPos_ExeSection(exesec:TExeSection);
var
i : longint;
objsec : TObjSection;
begin
{ Section can be removed }
FCurrExeSec:=FindExeSection(aname);
if not assigned(CurrExeSec) then
exit;
{ don't write normal section if writing only debug info }
if (ExeWriteMode=ewm_dbgonly) and
not(oso_debug in CurrExeSec.SecOptions) then
not(oso_debug in exesec.SecOptions) then
exit;
if (oso_Data in currexesec.SecOptions) then
if (oso_Data in exesec.SecOptions) then
begin
CurrDataPos:=align(CurrDataPos,SectionDataAlign);
CurrExeSec.DataPos:=CurrDataPos;
exesec.DataPos:=CurrDataPos;
end;
{ set position of object ObjSections }
for i:=0 to CurrExeSec.ObjSectionList.Count-1 do
for i:=0 to exesec.ObjSectionList.Count-1 do
begin
objsec:=TObjSection(CurrExeSec.ObjSectionList[i]);
objsec:=TObjSection(exesec.ObjSectionList[i]);
if (oso_Data in objsec.SecOptions) then
begin
if not(oso_Data in currexesec.SecOptions) then
if not(oso_Data in exesec.SecOptions) then
internalerror(200603043);
if not assigned(objsec.Data) then
internalerror(200603044);
@ -1993,6 +1996,16 @@ implementation
end;
procedure TExeOutput.DataPos_ExeSection(const aname:string);
begin
{ Section can be removed }
FCurrExeSec:=FindExeSection(aname);
if not assigned(CurrExeSec) then
exit;
DataPos_ExeSection(CurrExeSec);
end;
procedure TExeOutput.DataPos_EndExeSection;
begin
if not assigned(CurrExeSec) then