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

* fixed JccAdd/Inc/Dec2*Adc/Sbb optimizations

Browse Source 
git-svn-id: trunk@44254 -
This commit is contained in:
florian 2020-03-01 21:21:18 +00:00
parent 34be9e4643
commit f42b0bf6f5
1 changed files with 38 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
compiler/x86/aoptx86.pas
View File

@ -4750,7 +4750,11 @@ unit aoptx86;
symbol := TAsmLabel(taicpu(p).oper[0]^.ref^.symbol); symbol := TAsmLabel(taicpu(p).oper[0]^.ref^.symbol);
if (hp1.typ=ait_instruction) and if (hp1.typ=ait_instruction) and
GetNextInstruction(hp1,hp2) and (hp2.typ=ait_label) and GetNextInstruction(hp1,hp2) and
((hp2.typ=ait_label) or
{ trick to skip align }
((hp2.typ=ait_align) and GetNextInstruction(hp2,hp2) and (hp2.typ=ait_label))
) and
(Tasmlabel(symbol) = Tai_label(hp2).labsym) then (Tasmlabel(symbol) = Tai_label(hp2).labsym) then
{ jb @@1 cmc { jb @@1 cmc
inc/dec operand --> adc/sbb operand,0 inc/dec operand --> adc/sbb operand,0
@ -4765,9 +4769,17 @@ unit aoptx86;
carryadd_opcode:=A_NONE; carryadd_opcode:=A_NONE;
if Taicpu(p).condition in [C_NAE,C_B] then if Taicpu(p).condition in [C_NAE,C_B] then
begin begin
if Taicpu(hp1).opcode=A_INC then if (Taicpu(hp1).opcode=A_INC) or
((Taicpu(hp1).opcode=A_ADD) and
MatchOptype(Taicpu(hp1),top_const,top_reg) and
(Taicpu(hp1).oper[0]^.val=1)
) then
carryadd_opcode:=A_ADC; carryadd_opcode:=A_ADC;
if Taicpu(hp1).opcode=A_DEC then if (Taicpu(hp1).opcode=A_DEC) or
((Taicpu(hp1).opcode=A_SUB) and
MatchOptype(Taicpu(hp1),top_const,top_reg) and
(Taicpu(hp1).oper[0]^.val=1)
) then
carryadd_opcode:=A_SBB; carryadd_opcode:=A_SBB;
if carryadd_opcode<>A_NONE then if carryadd_opcode<>A_NONE then
begin begin
@ -4776,28 +4788,43 @@ unit aoptx86;
Taicpu(p).is_jmp:=false; Taicpu(p).is_jmp:=false;
Taicpu(p).opcode:=A_CMC; Taicpu(p).opcode:=A_CMC;
Taicpu(p).condition:=C_NONE; Taicpu(p).condition:=C_NONE;
DebugMsg(SPeepholeOptimization+'JccAdd/Inc/Dec2CmcAdc/Sbb',p);
Taicpu(hp1).ops:=2; Taicpu(hp1).ops:=2;
Taicpu(hp1).loadoper(1,Taicpu(hp1).oper[0]^); if (Taicpu(hp1).opcode=A_ADD) or (Taicpu(hp1).opcode=A_SUB) then
Taicpu(hp1).loadoper(1,Taicpu(hp1).oper[1]^)
else
Taicpu(hp1).loadoper(1,Taicpu(hp1).oper[0]^);
Taicpu(hp1).loadconst(0,0); Taicpu(hp1).loadconst(0,0);
Taicpu(hp1).opcode:=carryadd_opcode; Taicpu(hp1).opcode:=carryadd_opcode;
result:=true; result:=true;
exit; exit;
end; end;
end; end
if Taicpu(p).condition in [C_AE,C_NB] then else if Taicpu(p).condition in [C_AE,C_NB] then
begin begin
if Taicpu(hp1).opcode=A_INC then if (Taicpu(hp1).opcode=A_INC) or
((Taicpu(hp1).opcode=A_ADD) and
MatchOptype(Taicpu(hp1),top_const,top_reg) and
(Taicpu(hp1).oper[0]^.val=1)
) then
carryadd_opcode:=A_ADC; carryadd_opcode:=A_ADC;
if Taicpu(hp1).opcode=A_DEC then if (Taicpu(hp1).opcode=A_DEC) or
((Taicpu(hp1).opcode=A_SUB) and
MatchOptype(Taicpu(hp1),top_const,top_reg) and
(Taicpu(hp1).oper[0]^.val=1)
) then
carryadd_opcode:=A_SBB; carryadd_opcode:=A_SBB;
if carryadd_opcode<>A_NONE then if carryadd_opcode<>A_NONE then
begin begin
asml.remove(p);
p.free;
Taicpu(hp1).ops:=2; Taicpu(hp1).ops:=2;
Taicpu(hp1).loadoper(1,Taicpu(hp1).oper[0]^); DebugMsg(SPeepholeOptimization+'JccAdd/Inc/Dec2Adc/Sbb',p);
if (Taicpu(hp1).opcode=A_ADD) or (Taicpu(hp1).opcode=A_SUB) then
Taicpu(hp1).loadoper(1,Taicpu(hp1).oper[1]^)
else
Taicpu(hp1).loadoper(1,Taicpu(hp1).oper[0]^);
Taicpu(hp1).loadconst(0,0); Taicpu(hp1).loadconst(0,0);
Taicpu(hp1).opcode:=carryadd_opcode; Taicpu(hp1).opcode:=carryadd_opcode;
RemoveCurrentP(p);
p:=hp1; p:=hp1;
result:=true; result:=true;
exit; exit;