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

+ Support assembling expressions ".long L2-L1" where label L1 belongs to the current objsection and L2 comes from any objsection. This is done using relative relocations and is compatible with GNU AS.

Browse Source 
* Also fixed ogcoff.pas to handle these relative relocations correctly.

git-svn-id: trunk@21362 -
This commit is contained in:
sergei 2012-05-22 14:59:24 +00:00
parent dbc410de63
commit dc03282cb7
2 changed files with 23 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
compiler/assemble.pas
View File

@ -1140,8 +1140,15 @@ Implementation
if assigned(objsymend.objsection) then if assigned(objsymend.objsection) then
begin begin
if objsymend.objsection<>objsym.objsection then if objsymend.objsection<>objsym.objsection then
internalerror(200404124); begin
Tai_const(hp).value:=objsymend.address-objsym.address+Tai_const(hp).symofs; { leb128 relative constants are not relocatable, but other types are,
given that objsym belongs to the current section. }
if (Tai_const(hp).consttype in [aitconst_uleb128bit,aitconst_sleb128bit]) or
(objsym.objsection<>ObjData.CurrObjSec) then
InternalError(200404124);
end
else
Tai_const(hp).value:=objsymend.address-objsym.address+Tai_const(hp).symofs;
end; end;
end; end;
end; end;
@ -1257,8 +1264,13 @@ Implementation
objsym:=Objdata.SymbolRef(tai_const(hp).sym); objsym:=Objdata.SymbolRef(tai_const(hp).sym);
objsymend:=Objdata.SymbolRef(tai_const(hp).endsym); objsymend:=Objdata.SymbolRef(tai_const(hp).endsym);
if objsymend.objsection<>objsym.objsection then if objsymend.objsection<>objsym.objsection then
internalerror(200905042); begin
Tai_const(hp).value:=objsymend.address-objsym.address+Tai_const(hp).symofs; if (Tai_const(hp).consttype in [aitconst_uleb128bit,aitconst_sleb128bit]) or
(objsym.objsection<>ObjData.CurrObjSec) then
internalerror(200905042);
end
else
Tai_const(hp).value:=objsymend.address-objsym.address+Tai_const(hp).symofs;
end; end;
ObjData.alloc(tai_const(hp).size); ObjData.alloc(tai_const(hp).size);
end; end;
@ -1324,6 +1336,7 @@ Implementation
objsym, objsym,
objsymend : TObjSymbol; objsymend : TObjSymbol;
zerobuf : array[0..63] of byte; zerobuf : array[0..63] of byte;
relative_reloc: boolean;
begin begin
fillchar(zerobuf,sizeof(zerobuf),0); fillchar(zerobuf,sizeof(zerobuf),0);
{ main loop } { main loop }
@ -1388,11 +1401,13 @@ Implementation
begin begin
{ Recalculate relative symbols, addresses of forward references { Recalculate relative symbols, addresses of forward references
can be changed in treepass1 } can be changed in treepass1 }
relative_reloc:=false;
if assigned(tai_const(hp).sym) and if assigned(tai_const(hp).sym) and
assigned(tai_const(hp).endsym) then assigned(tai_const(hp).endsym) then
begin begin
objsym:=Objdata.SymbolRef(tai_const(hp).sym); objsym:=Objdata.SymbolRef(tai_const(hp).sym);
objsymend:=Objdata.SymbolRef(tai_const(hp).endsym); objsymend:=Objdata.SymbolRef(tai_const(hp).endsym);
relative_reloc:=(objsym.objsection<>objsymend.objsection);
Tai_const(hp).value:=objsymend.address-objsym.address+Tai_const(hp).symofs; Tai_const(hp).value:=objsymend.address-objsym.address+Tai_const(hp).symofs;
end; end;
case tai_const(hp).consttype of case tai_const(hp).consttype of
@ -1404,6 +1419,8 @@ Implementation
if assigned(tai_const(hp).sym) and if assigned(tai_const(hp).sym) and
not assigned(tai_const(hp).endsym) then not assigned(tai_const(hp).endsym) then
ObjData.writereloc(Tai_const(hp).symofs,tai_const(hp).size,Objdata.SymbolRef(tai_const(hp).sym),RELOC_ABSOLUTE) ObjData.writereloc(Tai_const(hp).symofs,tai_const(hp).size,Objdata.SymbolRef(tai_const(hp).sym),RELOC_ABSOLUTE)
else if relative_reloc then
ObjData.writereloc(ObjData.CurrObjSec.size+tai_const(hp).size-objsym.address+tai_const(hp).symofs,tai_const(hp).size,objsymend,RELOC_RELATIVE)
else else
ObjData.writebytes(Tai_const(hp).value,tai_const(hp).size); ObjData.writebytes(Tai_const(hp).value,tai_const(hp).size);
end; end;

5
compiler/ogcoff.pas
View File

@ -1136,13 +1136,12 @@ const pemagic : array[0..3] of byte = (
else else
begin begin
if (p.objsection<>nil) and if (p.objsection<>nil) and
(p.bind<>AB_COMMON) and (p.bind<>AB_COMMON) then
(reloctype<>RELOC_RELATIVE) then
CurrObjSec.addsectionreloc(curraddr,p.objsection,reloctype) CurrObjSec.addsectionreloc(curraddr,p.objsection,reloctype)
else else
CurrObjSec.addsymreloc(curraddr,p,reloctype); CurrObjSec.addsymreloc(curraddr,p,reloctype);
if (not win32) or if (not win32) or
((reloctype<>RELOC_RELATIVE) and (p.objsection<>nil)) then (p.objsection<>nil) then
inc(data,symaddr); inc(data,symaddr);
if reloctype=RELOC_RELATIVE then if reloctype=RELOC_RELATIVE then
begin begin