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

- Removed remaining optimizations that duplicate functionality of tcg.optimize_op_const.

Browse Source 
- Don't call make_simple_ref if operation will be optimized away or replaced with another one, which calls make_simple_ref itself.

git-svn-id: trunk@26515 -
This commit is contained in:
sergei 2014-01-19 01:19:01 +00:00
parent c83032992d
commit 6b1f021fcf
1 changed files with 50 additions and 95 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

117
compiler/x86/cgx86.pas
View File

@ -1686,20 +1686,7 @@ unit cgx86;
end; end;
OP_DIV, OP_IDIV: OP_DIV, OP_IDIV:
begin begin
if ispowerof2(int64(a),power) then { should be handled specifically in the code }
begin
case op of
OP_DIV:
opcode := A_SHR;
OP_IDIV:
opcode := A_SAR;
else
internalerror(2013112907);
end;
list.concat(taicpu.op_const_reg(opcode,TCgSize2OpSize[size],power,reg));
exit;
end;
{ the rest should be handled specifically in the code }
{ generator because of the silly register usage restraints } { generator because of the silly register usage restraints }
internalerror(200109224); internalerror(200109224);
end; end;
@ -1714,10 +1701,9 @@ unit cgx86;
{ generator because of the silly register usage restraints } { generator because of the silly register usage restraints }
internalerror(200109225); internalerror(200109225);
end; end;
OP_ADD, OP_AND, OP_OR, OP_SUB, OP_XOR: OP_ADD, OP_SUB:
if not(cs_check_overflow in current_settings.localswitches) and if not(cs_check_overflow in current_settings.localswitches) and
(a = 1) and (a = 1) and
(op in [OP_ADD,OP_SUB]) and
UseIncDec then UseIncDec then
begin begin
if op = OP_ADD then if op = OP_ADD then
@ -1725,25 +1711,18 @@ unit cgx86;
else else
list.concat(taicpu.op_reg(A_DEC,TCgSize2OpSize[size],reg)) list.concat(taicpu.op_reg(A_DEC,TCgSize2OpSize[size],reg))
end end
else if (a = 0) then
if (op <> OP_AND) then
exit
else
list.concat(taicpu.op_const_reg(A_MOV,TCgSize2OpSize[size],0,reg))
else if (aword(a) = high(aword)) and
(op in [OP_AND,OP_OR,OP_XOR]) then
begin
case op of
OP_AND:
exit;
OP_OR:
list.concat(taicpu.op_const_reg(A_MOV,TCgSize2OpSize[size],aint(high(aword)),reg));
OP_XOR:
list.concat(taicpu.op_reg(A_NOT,TCgSize2OpSize[size],reg));
end
end
else else
list.concat(taicpu.op_const_reg(TOpCG2AsmOp[op],TCgSize2OpSize[size],aint(a),reg)); list.concat(taicpu.op_const_reg(TOpCG2AsmOp[op],TCgSize2OpSize[size],aint(a),reg));
OP_AND,OP_OR:
list.concat(taicpu.op_const_reg(TOpCG2AsmOp[op],TCgSize2OpSize[size],aint(a),reg));
OP_XOR:
if (aword(a)=high(aword)) then
list.concat(taicpu.op_reg(A_NOT,TCgSize2OpSize[size],reg))
else
list.concat(taicpu.op_const_reg(TOpCG2AsmOp[op],TCgSize2OpSize[size],aint(a),reg));
OP_SHL,OP_SHR,OP_SAR,OP_ROL,OP_ROR: OP_SHL,OP_SHR,OP_SAR,OP_ROL,OP_ROR:
begin begin
{$if defined(x86_64)} {$if defined(x86_64)}
@ -1789,47 +1768,32 @@ unit cgx86;
tmpref : treference; tmpref : treference;
begin begin
optimize_op_const(op, a); optimize_op_const(op, a);
tmpref:=ref; if op in [OP_NONE,OP_MOVE] then
make_simple_ref(list,tmpref); begin
if (op=OP_MOVE) then
a_load_const_ref(list,size,a,ref);
exit;
end;
{$ifdef x86_64} {$ifdef x86_64}
{ x86_64 only supports signed 32 bits constants directly } { x86_64 only supports signed 32 bits constants directly }
if not(op in [OP_NONE,OP_MOVE]) and if (size in [OS_S64,OS_64]) and
(size in [OS_S64,OS_64]) and
((a<low(longint)) or (a>high(longint))) then ((a<low(longint)) or (a>high(longint))) then
begin begin
tmpreg:=getintregister(list,size); tmpreg:=getintregister(list,size);
a_load_const_reg(list,size,a,tmpreg); a_load_const_reg(list,size,a,tmpreg);
a_op_reg_ref(list,op,size,tmpreg,tmpref); a_op_reg_ref(list,op,size,tmpreg,ref);
exit; exit;
end; end;
{$endif x86_64} {$endif x86_64}
tmpref:=ref;
make_simple_ref(list,tmpref);
Case Op of Case Op of
OP_NONE :
begin
{ Opcode is optimized away }
end;
OP_MOVE :
begin
{ Optimized, replaced with a simple load }
a_load_const_ref(list,size,a,ref);
end;
OP_DIV, OP_IDIV: OP_DIV, OP_IDIV:
Begin Begin
if ispowerof2(int64(a),power) then { should be handled specifically in the code }
begin
case op of
OP_DIV:
opcode := A_SHR;
OP_IDIV:
opcode := A_SAR;
else
internalerror(2013112908);
end;
list.concat(taicpu.op_const_ref(opcode,
TCgSize2OpSize[size],power,tmpref));
exit;
end;
{ the rest should be handled specifically in the code }
{ generator because of the silly register usage restraints } { generator because of the silly register usage restraints }
internalerror(200109231); internalerror(200109231);
End; End;
@ -1845,10 +1809,9 @@ unit cgx86;
{ generator because of the silly register usage restraints } { generator because of the silly register usage restraints }
internalerror(200109232); internalerror(200109232);
end; end;
OP_ADD, OP_AND, OP_OR, OP_SUB, OP_XOR: OP_ADD, OP_SUB:
if not(cs_check_overflow in current_settings.localswitches) and if not(cs_check_overflow in current_settings.localswitches) and
(a = 1) and (a = 1) and
(op in [OP_ADD,OP_SUB]) and
UseIncDec then UseIncDec then
begin begin
if op = OP_ADD then if op = OP_ADD then
@ -1856,26 +1819,18 @@ unit cgx86;
else else
list.concat(taicpu.op_ref(A_DEC,TCgSize2OpSize[size],tmpref)) list.concat(taicpu.op_ref(A_DEC,TCgSize2OpSize[size],tmpref))
end end
else if (a = 0) then
if (op <> OP_AND) then
exit
else else
a_load_const_ref(list,size,0,tmpref) list.concat(taicpu.op_const_ref(TOpCG2AsmOp[op],TCgSize2OpSize[size],a,tmpref));
else if (aword(a) = high(aword)) and
(op in [OP_AND,OP_OR,OP_XOR]) then OP_AND,OP_OR:
begin list.concat(taicpu.op_const_ref(TOpCG2AsmOp[op],TCgSize2OpSize[size],a,tmpref));
case op of
OP_AND:
exit;
OP_OR:
list.concat(taicpu.op_const_ref(A_MOV,TCgSize2OpSize[size],aint(high(aword)),tmpref));
OP_XOR: OP_XOR:
list.concat(taicpu.op_ref(A_NOT,TCgSize2OpSize[size],tmpref)); if (aword(a)=high(aword)) then
end list.concat(taicpu.op_ref(A_NOT,TCgSize2OpSize[size],tmpref))
end
else else
list.concat(taicpu.op_const_ref(TOpCG2AsmOp[op], list.concat(taicpu.op_const_ref(TOpCG2AsmOp[op],TCgSize2OpSize[size],a,tmpref));
TCgSize2OpSize[size],a,tmpref));
OP_SHL,OP_SHR,OP_SAR,OP_ROL,OP_ROR: OP_SHL,OP_SHR,OP_SAR,OP_ROL,OP_ROR:
begin begin
{$if defined(x86_64)} {$if defined(x86_64)}