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

* Aarch64: patch by J. Gareth Moreton: fix constant writing, resolves #38695

Browse Source 
+ test

git-svn-id: trunk@49104 -
This commit is contained in:
florian 2021-04-02 16:44:43 +00:00
parent e53d18d876
commit f0023a3b04
3 changed files with 22 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitattributes vendored
View File

@ -18769,6 +18769,7 @@ tests/webtbs/tw38636.pp svneol=native#text/plain
tests/webtbs/tw3864.pp svneol=native#text/plain tests/webtbs/tw3864.pp svneol=native#text/plain
tests/webtbs/tw38642.pp svneol=native#text/pascal tests/webtbs/tw38642.pp svneol=native#text/pascal
tests/webtbs/tw3865.pp svneol=native#text/plain tests/webtbs/tw3865.pp svneol=native#text/plain
tests/webtbs/tw38695.pp svneol=native#text/pascal
tests/webtbs/tw3870.pp svneol=native#text/plain tests/webtbs/tw3870.pp svneol=native#text/plain
tests/webtbs/tw3893.pp svneol=native#text/plain tests/webtbs/tw3893.pp svneol=native#text/plain
tests/webtbs/tw3898.pp svneol=native#text/plain tests/webtbs/tw3898.pp svneol=native#text/plain

13
compiler/aarch64/cgcpu.pas
View File

@ -588,7 +588,7 @@ implementation
leftover_a: word; leftover_a: word;
begin begin
{$ifdef extdebug} {$ifdef extdebug}
list.concat(tai_comment.Create(strpnew('Generating constant ' + tostr(a)))); list.concat(tai_comment.Create(strpnew('Generating constant ' + tostr(a) + ' / $' + hexstr(a, 16))));
{$endif extdebug} {$endif extdebug}
case a of case a of
{ Small positive number } { Small positive number }
@ -623,7 +623,7 @@ implementation
Exit; Exit;
end; end;
{ This determines whether this write can be peformed with an ORR followed by MOVK { This determines whether this write can be performed with an ORR followed by MOVK
by copying the 2nd word to the 4th word for the ORR constant, then overwriting by copying the 2nd word to the 4th word for the ORR constant, then overwriting
the 4th word (unless the word is. The alternative would require 3 instructions } the 4th word (unless the word is. The alternative would require 3 instructions }
leftover_a := word(a shr 48); leftover_a := word(a shr 48);
@ -644,14 +644,15 @@ implementation
called for a and it returned False. Reduces processing time. [Kit] } called for a and it returned False. Reduces processing time. [Kit] }
if (manipulated_a <> a) and is_shifter_const(manipulated_a, size) then if (manipulated_a <> a) and is_shifter_const(manipulated_a, size) then
begin begin
{ Encode value as:
orr reg,xzr,manipulated_a
movk reg,#(leftover_a),lsl #48
}
list.concat(taicpu.op_reg_reg_const(A_ORR, reg, makeregsize(NR_XZR, size), manipulated_a)); list.concat(taicpu.op_reg_reg_const(A_ORR, reg, makeregsize(NR_XZR, size), manipulated_a));
if (leftover_a <> 0) then
begin
shifterop_reset(so); shifterop_reset(so);
so.shiftmode := SM_LSL; so.shiftmode := SM_LSL;
so.shiftimm := 48; so.shiftimm := 48;
list.concat(taicpu.op_reg_const_shifterop(A_MOVK, reg, leftover_a, so)); list.concat(taicpu.op_reg_const_shifterop(A_MOVK, reg, leftover_a, so));
end;
Exit; Exit;
end; end;
@ -664,7 +665,7 @@ implementation
stored as the first 16 bits followed by a shifter constant } stored as the first 16 bits followed by a shifter constant }
case a of case a of
TCgInt($FFFF0000FFFF0000)..TCgInt($FFFF0000FFFFFFFF): TCgInt($FFFF0000FFFF0000)..TCgInt($FFFF0000FFFFFFFF):
doinverted := False doinverted := False;
else else
begin begin
doinverted := True; doinverted := True;

10
tests/webtbs/tw38695.pp Normal file
View File

@ -0,0 +1,10 @@
{ %opt=-O- }
var
q1,q2,q3 : qword;
begin
q1:=$0000FFFFFFFEFFFF;
q2:=$FFFEFFFF;
q3:=$FFFF00000000;
if q1<>q2 or q3 then
halt(1);
end.