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

+ support omf group-relative fixups pointing to external symbol (e.g.

Browse Source 
'wrt dgroup' references)
- removed debug code from TMZExeOutput.DoRelocationFixup

git-svn-id: trunk@31378 -
This commit is contained in:
nickysn 2015-08-24 00:55:56 +00:00
parent 173713ce57
commit fa8841d575
1 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
compiler/ogomf.pas
View File

@ -45,6 +45,7 @@ interface
TOmfRelocation = class(TObjRelocation)
private
FFrameGroup: string;
FOmfFixup: TOmfSubRecord_FIXUP;
function GetGroupIndex(const groupname: string): Integer;
public
@ -53,6 +54,7 @@ interface
procedure BuildOmfFixup;
property FrameGroup: string read FFrameGroup write FFrameGroup;
property OmfFixup: TOmfSubRecord_FIXUP read FOmfFixup;
end;
@ -1539,13 +1541,13 @@ implementation
exit;
end;
end;
reloc:=TOmfRelocation.CreateSymbol(Fixup.LocationOffset,sym,RelocType);
objsec.ObjRelocations.Add(reloc);
case Fixup.FrameMethod of
ffmTarget:
{nothing};
ffmGroupIndex:
begin
{todo: handle 'wrt dgroup' here}
end;
reloc.FrameGroup:=TObjSectionGroup(objdata.GroupsList[Fixup.FrameDatum-1]).Name;
else
begin
InputError('Unsupported frame method '+IntToStr(Ord(Fixup.FrameMethod))+' in external reference to '+sym.Name);
@ -1557,8 +1559,6 @@ implementation
InputError('Unsupported nonzero target displacement '+IntToStr(Fixup.TargetDisplacement)+' in external reference to '+sym.Name);
exit;
end;
reloc:=TOmfRelocation.CreateSymbol(Fixup.LocationOffset,sym,RelocType);
objsec.ObjRelocations.Add(reloc);
end;
{todo: convert other fixup types as well }
@ -2062,15 +2062,12 @@ implementation
if assigned(objreloc.symbol) then
begin
target:=objreloc.symbol.address;
if assigned(objreloc.symbol.group) then
if objreloc.FrameGroup<>'' then
framebase:=TMZExeUnifiedLogicalGroup(ExeUnifiedLogicalGroups.Find(objreloc.FrameGroup)).MemPos
else if assigned(objreloc.symbol.group) then
framebase:=TMZExeUnifiedLogicalGroup(ExeUnifiedLogicalGroups.Find(objreloc.symbol.group.Name)).MemPos
else
framebase:=TOmfObjSection(objreloc.symbol.objsection).MZExeUnifiedLogicalSegment.MemBasePos;
if framebase<>0 then
begin
framebase:=0;
Writeln(objreloc.symbol.name);
end;
case objreloc.typ of
RELOC_ABSOLUTE:
fixupamount:=target-framebase;