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

Fixed bug in ARM coff writer. Relocations just ORed the offset onto the instruction instead of adding, but they are emitted as bl 0xFFFFFE, and not bl 0x0.

Browse Source 
git-svn-id: trunk@30403 -
This commit is contained in:
Jeppe Johansen 2015-04-02 18:28:42 +00:00
parent 197e5194b9
commit a3fd3ee3ab
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
compiler/ogcoff.pas
View File

@ -835,6 +835,9 @@ const pemagic : array[0..3] of byte = (
objreloc : TObjRelocation;
address,
relocval : aint;
{$ifdef arm}
addend : aint;
{$endif arm}
relocsec : TObjSection;
{$ifdef cpu64bitaddr}
s : string;
@ -912,16 +915,18 @@ const pemagic : array[0..3] of byte = (
{$ifdef arm}
RELOC_RELATIVE_24:
begin
relocval:=longint(relocval - objsec.mempos - objreloc.dataoffset) shr 2 - 2;
address:=address or (relocval and $ffffff);
addend:=sarlongint(((address and $ffffff) shl 8),8);
relocval:=longint(relocval - objsec.mempos - objreloc.dataoffset + addend) shr 2;
address:=(address and $ff000000) or (relocval and $ffffff);
relocval:=relocval shr 24;
if (relocval<>$3f) and (relocval<>0) then
internalerror(200606085); { offset overflow }
end;
RELOC_RELATIVE_24_THUMB:
begin
relocval:=longint(relocval - objsec.mempos - objreloc.dataoffset) shr 1 - 4;
address:=address or ((relocval shr 1) and $ffffff) or ((relocval and 1) shl 24);
addend:=sarlongint(((address and $ffffff) shl 8),8);
relocval:=longint(relocval - objsec.mempos - objreloc.dataoffset + addend) shr 1;
address:=(address and $ff000000) or ((relocval shr 1) and $ffffff) or ((relocval and 1) shl 24);
relocval:=relocval shr 25;
if (relocval<>$3f) and (relocval<>0) then
internalerror(200606085); { offset overflow }