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

* moved the PageNum property of TOmfLibObjectWriter.TOmfLibDictionaryEntry to

Browse Source 
TOmfLibObjectWriter.TOmfLibObjectModule. Instead, store the module index (in
  FObjectModules) in TOmfLibDictionaryEntry. This is a prerequisite for
  implementing OMF library page size optimization.

git-svn-id: trunk@39193 -
This commit is contained in:
nickysn 2018-06-07 18:32:50 +00:00
parent 4bcfe8dbb2
commit 00c6826896
1 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
compiler/owomflib.pas
View File

@ -47,21 +47,23 @@ type
strict private
FObjFileName: string;
FObjData: TDynamicArray;
FPageNum: Word;
public
constructor Create(const fn:string);
destructor Destroy; override;
property ObjData: TDynamicArray read FObjData;
property PageNum: Word read FPageNum write FPageNum;
end;
{ TOmfLibDictionaryEntry }
TOmfLibDictionaryEntry=class(TFPHashObject)
strict private
FPageNum: Word;
FModuleIndex: Integer;
public
constructor Create(HashObjectList:TFPHashObjectList;const aName:TSymStr;aPageNum:Word);
property PageNum: Word read FPageNum write FPageNum;
constructor Create(HashObjectList:TFPHashObjectList;const aName:TSymStr;aModuleIndex:Integer);
property ModuleIndex: Integer read FModuleIndex write FModuleIndex;
end;
strict private
FPageSize: Integer;
@ -71,6 +73,7 @@ type
FDictionary: TFPHashObjectList;
FObjectModules: TFPObjectList;
FCurrentModule: TOmfLibObjectModule;
FCurrentModuleIndex: Integer;
procedure WriteHeader(DictStart: DWord; DictBlocks: Word);
procedure WriteFooter;
@ -169,10 +172,10 @@ implementation
*****************************************************************************}
constructor TOmfLibObjectWriter.TOmfLibDictionaryEntry.Create(
HashObjectList: TFPHashObjectList; const aName: TSymStr; aPageNum: Word);
HashObjectList: TFPHashObjectList; const aName: TSymStr; aModuleIndex:Integer);
begin
inherited Create(HashObjectList,aName);
PageNum:=aPageNum;
ModuleIndex:=aModuleIndex;
end;
{*****************************************************************************
@ -211,7 +214,8 @@ implementation
function TOmfLibObjectWriter.createfile(const fn: string): boolean;
begin
FCurrentModule:=TOmfLibObjectModule.Create(fn);
FObjectModules.Add(FCurrentModule);
FCurrentModuleIndex:=FObjectModules.Add(FCurrentModule);
FCurrentModule.PageNum:=FObjStartPage;
createfile:=true;
fobjsize:=0;
end;
@ -232,7 +236,7 @@ implementation
ObjHeader:=TOmfRecord_THEADR.Create;
ObjHeader.DecodeFrom(RawRec);
{ create a dictionary entry with the module name }
TOmfLibDictionaryEntry.Create(FDictionary,ModName2DictEntry(ObjHeader.ModuleName),FObjStartPage);
TOmfLibDictionaryEntry.Create(FDictionary,ModName2DictEntry(ObjHeader.ModuleName),FCurrentModuleIndex);
ObjHeader.Free;
end;
RawRec.WriteTo(FLibData);
@ -246,7 +250,7 @@ implementation
procedure TOmfLibObjectWriter.writesym(const sym: string);
begin
TOmfLibDictionaryEntry.Create(FDictionary,sym,FObjStartPage);
TOmfLibDictionaryEntry.Create(FDictionary,sym,FCurrentModuleIndex);
end;
@ -355,7 +359,7 @@ implementation
for i:=0 to FDictionary.Count-1 do
begin
N:=TOmfLibDictionaryEntry(FDictionary[i]).Name;
PageNum:=TOmfLibDictionaryEntry(FDictionary[i]).PageNum;
PageNum:=TOmfLibObjectModule(FObjectModules[TOmfLibDictionaryEntry(FDictionary[i]).ModuleIndex]).PageNum;
length_of_string:=Length(N);
h:=compute_omf_lib_hash(N,nblocks);
start_block:=h.block_x;