paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-08-21 06:29:22 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix ARM SwapEndian on armv6+ for compilation with FPC 2.6

Browse Source 
We're currently using rev for armv6+, but FPC 2.6 could not handle the
instruction. So if somebody wants to build trunk it can't be for armv6+.

We'll circumvent the problem by always using the the generic code when
build with FPC 2.6.

git-svn-id: trunk@22003 -
This commit is contained in:
masta 2012-08-03 22:38:07 +00:00
parent 291157330e
commit e4a719fcff
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
rtl/arm/arm.inc
View File

@ -826,7 +826,7 @@ is bigger than the gain of the optimized function.
function AsmSwapEndian(const AValue: SmallInt): SmallInt;{$ifdef SYSTEMINLINE}inline;{$endif};assembler;nostackframe; function AsmSwapEndian(const AValue: SmallInt): SmallInt;{$ifdef SYSTEMINLINE}inline;{$endif};assembler;nostackframe;
asm asm
// We're starting with 4321 // We're starting with 4321
{$if defined(cpuarmv3) or defined(cpuarmv4) or defined(cpuarmv5)} {$if defined(cpuarmv3) or defined(cpuarmv4) or defined(cpuarmv5) or defined(VER2_6)}
mov r0, r0, shl #16 // Shift to make that 2100 mov r0, r0, shl #16 // Shift to make that 2100
mov r0, r0, ror #24 // Rotate to 1002 mov r0, r0, ror #24 // Rotate to 1002
orr r0, r0, r0 shr #16 // Shift and combine into 0012 orr r0, r0, r0 shr #16 // Shift and combine into 0012
@ -864,7 +864,7 @@ end;
function SwapEndian(const AValue: Int64): Int64; assembler; nostackframe; function SwapEndian(const AValue: Int64): Int64; assembler; nostackframe;
asm asm
{$if defined(cpuarmv3) or defined(cpuarmv4) or defined(cpuarmv5)} {$if defined(cpuarmv3) or defined(cpuarmv4) or defined(cpuarmv5) or defined(VER2_6)}
mov ip, r1 mov ip, r1
// We're starting with r0 = $87654321 // We're starting with r0 = $87654321