paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-04-20 18:09:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

* fixed support for -Or with new features of CSE

Browse Source
This commit is contained in:
Jonas Maebe 2000-09-30 13:07:23 +00:00
parent 9048ff6354
commit bec76ee738
2 changed files with 76 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
compiler/csopt386.pas
View File

@ -61,7 +61,7 @@ End;
function modifiesConflictingMemLocation(p1: pai; reg: tregister; c: tregContent;
var regsStillValid: tregset): boolean;
var
p: paicpu;
p, hp: paicpu;
tmpRef: treference;
regCounter: tregister;
opCount: byte;
@ -82,21 +82,57 @@ begin
modifiesConflictingMemLocation := not(reg in regsStillValid);
end;
end
{ else
for regCounter := R_EAX to R_EDI do
else
if is_reg_var[reg32(p^.oper[1].reg)] then
for regCounter := R_EAX to R_EDI do
begin
if writeDestroysContents(p^.oper[1],regCounter,c[regCounter]) then
begin
exclude(regsStillValid,regCounter);
modifiesConflictingMemLocation := not(reg in regsStillValid);
end
end;
A_DIV, A_IDIV, A_MUL, A_IMUL:
begin
if (p^.ops = 1) then
begin
if writeDestroysContents(p^.oper[1],regCounter,c[regCounter]) then
if is_reg_var[R_EDX] and
(not getNextInstruction(p,hp) or
not((hp^.typ = ait_instruction) and
(hp^.opcode = A_MOV) and
(hp^.oper[0].typ = top_reg) and
(reg32(hp^.oper[0].reg) = R_EDX) and
getNextInstruction(hp,hp) and
(hp^.typ = ait_instruction) and
(hp^.opcode = A_POP) and
(hp^.oper[0].reg = R_EDX))) then
for regCounter := R_EAX to R_EDI do
if writeToRegDestroysContents(R_EDX,regCounter,c[regCounter]) then
begin
exclude(regsStillValid,R_EDX);
modifiesConflictingMemLocation := not(reg in regsStillValid);
end
end
else
{ only possible for imul }
{ last operand is always destination }
if is_reg_var[reg32(p^.oper[p^.ops-1].reg)] then
for regCounter := R_EAX to R_EDI do
begin
exclude(regsStillValid,regCounter);
modifiesConflictingMemLocation := not(reg in regsStillValid);
if writeDestroysContents(p^.oper[p^.ops-1],regCounter,c[regCounter]) then
begin
exclude(regsStillValid,regCounter);
modifiesConflictingMemLocation := not(reg in regsStillValid);
end
end
end};
A_IMUL,A_DIV, A_IDIV, A_MUL:; { they never write to memory }
end;
else
for opCount := 1 to MaxCh do
for opCount := 1 to MaxCh do
case InsProp[p^.opcode].Ch[opCount] of
Ch_MOp1,CH_WOp1,CH_RWOp1:
if paicpu(p)^.oper[0].typ = top_ref then
if (p^.oper[0].typ = top_ref) or
((p^.oper[0].typ = top_reg) and
is_reg_var[reg32(p^.oper[0].reg)]) then
for regCounter := R_EAX to R_EDI do
if writeDestroysContents(p^.oper[0],regCounter,c[regCounter]) then
begin
@ -104,7 +140,9 @@ begin
modifiesConflictingMemLocation := not(reg in regsStillValid);
end;
Ch_MOp2,CH_WOp2,CH_RWOp2:
if paicpu(p)^.oper[1].typ = top_ref then
if (p^.oper[1].typ = top_ref) or
((p^.oper[1].typ = top_reg) and
is_reg_var[reg32(p^.oper[1].reg)]) then
for regCounter := R_EAX to R_EDI do
if writeDestroysContents(p^.oper[1],regCounter,c[regCounter]) then
begin
@ -112,7 +150,9 @@ begin
modifiesConflictingMemLocation := not(reg in regsStillValid);
end;
Ch_MOp3,CH_WOp3,CH_RWOp3:
if paicpu(p)^.oper[2].typ = top_ref then
if (p^.oper[2].typ = top_ref) or
((p^.oper[2].typ = top_reg) and
is_reg_var[reg32(p^.oper[2].reg)]) then
for regCounter := R_EAX to R_EDI do
if writeDestroysContents(p^.oper[2],regCounter,c[regCounter]) then
begin
@ -1532,7 +1572,7 @@ Begin
End;
End;
End;
End;
A_STD: If GetLastInstruction(p, hp1) And
(PPaiProp(hp1^.OptInfo)^.DirFlag = F_Set) Then
@ -1590,7 +1630,10 @@ End.
{
$Log$
Revision 1.13 2000-09-29 23:14:45 jonas
Revision 1.14 2000-09-30 13:07:23 jonas
* fixed support for -Or with new features of CSE
Revision 1.13 2000/09/29 23:14:45 jonas
* search much further back for CSE sequences (non-conflicting stores are
now passed)
* remove more unnecessary loads of registers (especially the self pointer)

25
compiler/daopt386.pas
View File

@ -167,6 +167,8 @@ function RegInOp(Reg: TRegister; const o:toper): Boolean;
function writeToMemDestroysContents(regWritten: tregister; const ref: treference;
reg: tregister; const c: tcontent): boolean;
function writeToRegDestroysContents(destReg: tregister; reg: tregister;
const c: tcontent): boolean;
function writeDestroysContents(const op: toper; reg: tregister;
const c: tcontent): boolean;
@ -1594,7 +1596,7 @@ begin
{ * with uncertain optimizations off: }
{ - also destroy registers that contain any pointer }
with c do
writeToMemDestroysContents :=
writeToMemDestroysContents :=
(typ in [con_ref,con_noRemoveRef]) and
((not(cs_uncertainOpts in aktglobalswitches) and
(nrOfMods <> 1)
@ -1618,7 +1620,7 @@ begin
{ * with uncertain optimzations off: }
{ - destroy every register which contains a memory location }
with c do
writeToMemDestroysContents :=
writeToMemDestroysContents :=
(typ in [con_ref,con_noRemoveRef]) and
(not(cs_UncertainOpts in aktglobalswitches) or
{ for movsl }
@ -1633,6 +1635,15 @@ begin
)
end;
function writeToRegDestroysContents(destReg: tregister; reg: tregister;
const c: tcontent): boolean;
{ returns whether the contents c of reg are invalid after destReg is }
{ modified }
begin
writeToRegDestroysContents :=
(c.typ <> con_unknown) and
sequenceDependsOnReg(c,reg,reg32(destReg));
end;
function writeDestroysContents(const op: toper; reg: tregister;
const c: tcontent): boolean;
@ -1643,10 +1654,9 @@ begin
case op.typ of
top_reg:
writeDestroysContents :=
(c.typ <> con_unknown) and
sequenceDependsOnReg(c,reg,reg32(op.reg));
writeToRegDestroysContents(op.reg,reg,c);
top_ref:
writeDestroysContents :=
writeDestroysContents :=
writeToMemDestroysContents(R_NO,op.ref^,reg,c);
else
writeDestroysContents := false;
@ -2349,7 +2359,10 @@ End.
{
$Log$
Revision 1.14 2000-09-29 23:14:11 jonas
Revision 1.15 2000-09-30 13:07:23 jonas
* fixed support for -Or with new features of CSE
Revision 1.14 2000/09/29 23:14:11 jonas
+ writeToMemDestroysContents() and writeDestroysContents() to support the
new features of the CSE