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

+ calculate the MZ loadable image size (excluding bss, stack and heap)

Browse Source 
+ only write the loadable image size number of bytes to .com files

git-svn-id: trunk@31385 -
This commit is contained in:
nickysn 2015-08-24 14:42:43 +00:00
parent a7e63581b4
commit fdbfaacec8
1 changed files with 38 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
compiler/ogomf.pas
View File

@ -273,6 +273,7 @@ interface
procedure CalcSegments_MemBasePos; procedure CalcSegments_MemBasePos;
procedure WriteMap_SegmentsAndGroups; procedure WriteMap_SegmentsAndGroups;
procedure WriteMap_HeaderData; procedure WriteMap_HeaderData;
procedure FillLoadableImageSize;
procedure FillStartAddress; procedure FillStartAddress;
procedure FillHeaderData; procedure FillHeaderData;
function writeExe:boolean; function writeExe:boolean;
@ -2045,9 +2046,30 @@ implementation
procedure TMZExeOutput.WriteMap_HeaderData; procedure TMZExeOutput.WriteMap_HeaderData;
begin begin
exemap.AddHeader('Header data'); exemap.AddHeader('Header data');
exemap.Add('Loadable image size: '+HexStr(Header.LoadableImageSize,8));
exemap.Add('Entry point address: '+HexStr(Header.InitialCS,4)+':'+HexStr(Header.InitialIP,4)); exemap.Add('Entry point address: '+HexStr(Header.InitialCS,4)+':'+HexStr(Header.InitialIP,4));
end; end;
procedure TMZExeOutput.FillLoadableImageSize;
var
i: Integer;
ExeSec: TMZExeSection;
ObjSec: TOmfObjSection;
StartDataPos: LongWord;
buf: array [0..1023] of byte;
bytesread: LongWord;
begin
Header.LoadableImageSize:=0;
ExeSec:=MZFlatContentSection;
for i:=0 to ExeSec.ObjSectionList.Count-1 do
begin
ObjSec:=TOmfObjSection(ExeSec.ObjSectionList[i]);
if (ObjSec.Size>0) and assigned(ObjSec.Data) then
if (ObjSec.MemPos+ObjSec.Size)>Header.LoadableImageSize then
Header.LoadableImageSize:=ObjSec.MemPos+ObjSec.Size;
end;
end;
procedure TMZExeOutput.FillStartAddress; procedure TMZExeOutput.FillStartAddress;
var var
EntryMemPos: qword; EntryMemPos: qword;
@ -2064,6 +2086,7 @@ implementation
procedure TMZExeOutput.FillHeaderData; procedure TMZExeOutput.FillHeaderData;
begin begin
FillLoadableImageSize;
FillStartAddress; FillStartAddress;
if assigned(exemap) then if assigned(exemap) then
WriteMap_HeaderData; WriteMap_HeaderData;
@ -2093,20 +2116,23 @@ implementation
for i:=0 to ExeSec.ObjSectionList.Count-1 do for i:=0 to ExeSec.ObjSectionList.Count-1 do
begin begin
ObjSec:=TOmfObjSection(ExeSec.ObjSectionList[i]); ObjSec:=TOmfObjSection(ExeSec.ObjSectionList[i]);
FWriter.WriteZeros(max(0,ObjSec.MemPos-ComFileOffset-FWriter.Size)); if ObjSec.MemPos<Header.LoadableImageSize then
if assigned(ObjSec.Data) then
begin begin
if ObjSec.MemPos<ComFileOffset then FWriter.WriteZeros(max(0,ObjSec.MemPos-ComFileOffset-FWriter.Size));
if assigned(ObjSec.Data) then
begin begin
ObjSec.Data.seek(ComFileOffset-ObjSec.MemPos); if ObjSec.MemPos<ComFileOffset then
repeat begin
bytesread:=ObjSec.Data.read(buf,sizeof(buf)); ObjSec.Data.seek(ComFileOffset-ObjSec.MemPos);
if bytesread<>0 then repeat
FWriter.write(buf,bytesread); bytesread:=ObjSec.Data.read(buf,sizeof(buf));
until bytesread=0; if bytesread<>0 then
end FWriter.write(buf,bytesread);
else until bytesread=0;
FWriter.writearray(ObjSec.Data); end
else
FWriter.writearray(ObjSec.Data);
end;
end; end;
end; end;
Result:=True; Result:=True;