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

Switch back to emitting BLX instructions and fix calculation of constant offsets(should rarely/never happen).

Browse Source 
Add missing fields to other elf targets.

git-svn-id: branches/laksen/armiw@29286 -
This commit is contained in:
Jeppe Johansen 2014-12-14 16:28:35 +00:00
parent b4a4dda4e5
commit 901275b4a1
8 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
compiler/arm/aasmcpu.pas
View File

@ -2994,7 +2994,7 @@ implementation
end
else
begin
offset:=(((currsym.offset-insoffset-8) shr 2) and $ffffff);
offset:=((currsym.offset-insoffset-8) and $3fffffe);
bytes:=bytes or ((offset shr 2) and $ffffff);
bytes:=bytes or ((offset shr 1) and $1) shl 24;
end;

6
compiler/arm/armins.dat
View File

@ -121,8 +121,8 @@ imm24 \x1\x0B ARM32,ARMv4
mem32 \x1\x0B ARM32,ARMv4
[BLX]
imm24 \x28\xA ARM32,ARMv5T
mem32 \x28\xA ARM32,ARMv5T
imm24 \x28\xFA ARM32,ARMv5T
mem32 \x28\xFA ARM32,ARMv5T
reg32 \3\x01\x2F\xFF\x30 ARM32,ARMv5T
[BKPTcc]
@ -1116,4 +1116,4 @@ void void none
[LGNcc]
[LOGcc]
[LOGcc]

4
compiler/arm/armtab.inc
View File

@ -130,14 +130,14 @@
opcode : A_BLX;
ops : 1;
optypes : (ot_immediate24,ot_none,ot_none,ot_none,ot_none,ot_none);
code : #40#10;
code : #40#250;
flags : if_arm32 or if_armv5t
),
(
opcode : A_BLX;
ops : 1;
optypes : (ot_memory or ot_bits32,ot_none,ot_none,ot_none,ot_none,ot_none);
code : #40#10;
code : #40#250;
flags : if_arm32 or if_armv5t
),
(

1
compiler/i386/cpuelf.pas
View File

@ -496,6 +496,7 @@ implementation
encodereloc: @elf_i386_encodeReloc;
loadreloc: @elf_i386_loadReloc;
loadsection: nil;
encodeflags: nil;
);
as_i386_elf32_info : tasminfo =

1
compiler/mips/cpuelf.pas
View File

@ -1026,6 +1026,7 @@ implementation
encodereloc: @elf_mips_encodeReloc;
loadreloc: @elf_mips_loadReloc;
loadsection: @elf_mips_loadSection;
encodeflags: nil;
);
initialization

6
compiler/ogelf.pas
View File

@ -1274,7 +1274,8 @@ implementation
header.e_shnum:=nsections;
header.e_ehsize:=sizeof(telfheader);
header.e_shentsize:=sizeof(telfsechdr);
header.e_flags:=ElfTarget.encodeflags();
if assigned(ElfTarget.encodeflags) then
header.e_flags:=ElfTarget.encodeflags();
MaybeSwapHeader(header);
writer.write(header,sizeof(header));
writer.writezeros($40-sizeof(header)); { align }
@ -2046,7 +2047,8 @@ implementation
header.e_shnum:=ExeSectionList.Count+1;
header.e_phnum:=segmentlist.count;
header.e_ehsize:=sizeof(telfheader);
header.e_flags:=ElfTarget.encodeflags();
if assigned(ElfTarget.encodeflags) then
header.e_flags:=ElfTarget.encodeflags();
if assigned(EntrySym) then
header.e_entry:=EntrySym.Address;
header.e_shentsize:=sizeof(telfsechdr);

1
compiler/sparc/cpuelf.pas
View File

@ -114,6 +114,7 @@ implementation
encodereloc: @elf_sparc_encodeReloc;
loadreloc: @elf_sparc_loadReloc;
loadsection: nil;
encodeflags: nil;
);
as_sparc_elf32_info : tasminfo =

1
compiler/x86_64/cpuelf.pas
View File

@ -664,6 +664,7 @@ implementation
encodereloc: @elf_x86_64_encodeReloc;
loadreloc: @elf_x86_64_loadReloc;
loadsection: nil;
encodeflags: nil;
);