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

* restored original behaviour of shl/shr constant evaluation outside

Browse Source 
inline statements
   o fixes compilation of pasjpeg with -Cr

git-svn-id: trunk@43560 -
This commit is contained in:
Jonas Maebe 2019-11-22 21:12:00 +00:00
parent 0f46207776
commit ff919184d8
1 changed files with 10 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
compiler/nmat.pas
View File

@ -687,7 +687,9 @@ implementation
function tshlshrnode.simplify(forinline : boolean):tnode; function tshlshrnode.simplify(forinline : boolean):tnode;
var var
lvalue,rvalue : Tconstexprint; lvalue, rvalue, mask : Tconstexprint;
rangedef: tdef;
size: longint;
begin begin
result:=nil; result:=nil;
{ constant folding } { constant folding }
@ -695,7 +697,6 @@ implementation
begin begin
if forinline then if forinline then
begin begin
{ shl/shr are unsigned operations, so cut off upper bits }
case resultdef.size of case resultdef.size of
1,2,4: 1,2,4:
rvalue:=tordconstnode(right).value and byte($1f); rvalue:=tordconstnode(right).value and byte($1f);
@ -710,19 +711,10 @@ implementation
if is_constintnode(left) then if is_constintnode(left) then
begin begin
lvalue:=tordconstnode(left).value; lvalue:=tordconstnode(left).value;
{ shl/shr are unsigned operations, so cut off upper bits } getrangedefmasksize(resultdef, rangedef, mask, size);
case resultdef.size of { shr is an unsigned operation, so cut off upper bits }
1: if forinline then
lvalue:=lvalue and byte($ff); lvalue:=lvalue and mask;
2:
lvalue:=lvalue and word($ffff);
4:
lvalue:=lvalue and dword($ffffffff);
8:
lvalue:=lvalue and qword($ffffffffffffffff);
else
internalerror(2013122301);
end;
case nodetype of case nodetype of
shrn: shrn:
lvalue:=lvalue shr rvalue; lvalue:=lvalue shr rvalue;
@ -734,20 +726,7 @@ implementation
{ discard shifted-out bits (shl never triggers overflow/range errors) } { discard shifted-out bits (shl never triggers overflow/range errors) }
if forinline and if forinline and
(nodetype=shln) then (nodetype=shln) then
begin lvalue:=lvalue and mask;
case resultdef.size of
1:
lvalue:=lvalue and byte($ff);
2:
lvalue:=lvalue and word($ffff);
4:
lvalue:=lvalue and dword($ffffffff);
8:
lvalue:=lvalue and qword($ffffffffffffffff);
else
internalerror(2019111701);
end;
end;
result:=create_simplified_ord_const(lvalue,resultdef,forinline,false); result:=create_simplified_ord_const(lvalue,resultdef,forinline,false);
end end
else if rvalue=0 then else if rvalue=0 then
@ -761,19 +740,8 @@ implementation
lvalue:=tordconstnode(left).value; lvalue:=tordconstnode(left).value;
if forinline then if forinline then
begin begin
{ shl/shr are unsigned operations, so cut off upper bits } getrangedefmasksize(resultdef, rangedef, mask, size);
case resultdef.size of lvalue:=lvalue and mask;
1:
lvalue:=tordconstnode(left).value and byte($ff);
2:
lvalue:=tordconstnode(left).value and word($ffff);
4:
lvalue:=tordconstnode(left).value and dword($ffffffff);
8:
lvalue:=tordconstnode(left).value and qword($ffffffffffffffff);
else
internalerror(2013122301);
end;
end; end;
{ '0 shl x' and '0 shr x' are 0 } { '0 shl x' and '0 shr x' are 0 }
if (lvalue=0) and if (lvalue=0) and