paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-09-13 21:11:23 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixed MovxOp2Op failing on i386 due to lack of register check

Browse Source
This commit is contained in:
J. Gareth "Curious Kit" Moreton 2021-12-22 17:48:05 +00:00 committed by FPK
parent 1e37eef3d2
commit 8609c0803e
1 changed files with 23 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
compiler/x86/aoptx86.pas
View File

@ -10527,13 +10527,33 @@ unit aoptx86;
((taicpu(hp1).oper[0]^.val and Limit) = taicpu(hp1).oper[0]^.val) ((taicpu(hp1).oper[0]^.val and Limit) = taicpu(hp1).oper[0]^.val)
) then ) then
begin begin
{$if defined(i386) or defined(i8086)}
{ If the target size is 8-bit, make sure we can actually encode it }
if (NewRegSize = R_SUBL) and (taicpu(hp1).oper[0]^.typ = top_reg) and not (GetSupReg(taicpu(hp1).oper[0]^.reg) in [RS_EAX,RS_EBX,RS_ECX,RS_EDX]) then
Exit;
{$endif i386 or i8086}
DebugMsg(SPeepholeOptimization + 'MovxOp2Op 2',p); DebugMsg(SPeepholeOptimization + 'MovxOp2Op 2',p);
if AndTest and not RegUsed then
taicpu(hp1).opcode := A_TEST;
taicpu(hp1).opsize := NewSize; taicpu(hp1).opsize := NewSize;
taicpu(hp1).loadoper(1, taicpu(p).oper[0]^);
if AndTest then
begin
RemoveInstruction(hp2);
if not RegUsed then
begin
taicpu(hp1).opcode := A_TEST;
if (taicpu(hp1).oper[0]^.typ = top_ref) then
begin
{ Make sure the reference is the second operand }
SwapOper := taicpu(hp1).oper[0];
taicpu(hp1).oper[0] := taicpu(hp1).oper[1];
taicpu(hp1).oper[1] := SwapOper;
end;
end;
end;
case taicpu(hp1).oper[0]^.typ of case taicpu(hp1).oper[0]^.typ of
top_reg: top_reg:
setsubreg(taicpu(hp1).oper[0]^.reg, NewRegSize); setsubreg(taicpu(hp1).oper[0]^.reg, NewRegSize);
@ -10544,18 +10564,6 @@ unit aoptx86;
; ;
end; end;
taicpu(hp1).loadoper(1, taicpu(p).oper[0]^);
if (taicpu(hp1).opcode = A_TEST) and (taicpu(hp1).oper[0]^.typ = top_ref) then
begin
{ For TEST, make sure the reference is the second operand }
SwapOper := taicpu(hp1).oper[0];
taicpu(hp1).oper[0] := taicpu(hp1).oper[1];
taicpu(hp1).oper[1] := SwapOper;
end;
if AndTest then
RemoveInstruction(hp2);
if RegUsed then if RegUsed then
begin begin
AsmL.Remove(p); AsmL.Remove(p);