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

* Reverted r29373 and replaced it with more appropriate fix.

Browse Source 
git-svn-id: trunk@33093 -
This commit is contained in:
sergei 2016-02-13 11:09:31 +00:00
parent db19d73ec0
commit e8f2f42b75
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
compiler/mips/aoptcpu.pas
View File

@ -271,17 +271,18 @@ unit aoptcpu;
begin begin
{ try to optimize the typical call sequence { try to optimize the typical call sequence
lw $reg, (whatever) lw $reg, (whatever)
<alloc volatile registers> <alloc volatile registers (including $reg!!)>
move $t9,$reg move $t9,$reg
jalr $t9 jalr $t9
Do not do so if the used register might contain a
register variable. } if $reg is nonvolatile, its value may be used after call
and we cannot safely replace it with $t9 }
if (opcode=A_MOVE) and if (opcode=A_MOVE) and
not(cs_opt_regvar in current_settings.optimizerswitches) and
(taicpu(next).oper[0]^.reg=NR_R25) and (taicpu(next).oper[0]^.reg=NR_R25) and
GetNextInstruction(next,hp1) and GetNextInstruction(next,hp1) and
MatchInstruction(hp1,A_JALR) and MatchInstruction(hp1,A_JALR) and
MatchOperand(taicpu(hp1).oper[0]^,NR_R25) then MatchOperand(taicpu(hp1).oper[0]^,NR_R25) and
assigned(FindRegAlloc(taicpu(p).oper[0]^.reg,tai(p.next))) then
begin begin
taicpu(p).loadreg(0,taicpu(next).oper[0]^.reg); taicpu(p).loadreg(0,taicpu(next).oper[0]^.reg);
asml.remove(next); asml.remove(next);
@ -499,8 +500,7 @@ unit aoptcpu;
else if (taicpu(next).opcode in [A_ADD,A_ADDU,A_ADDI,A_ADDIU,A_SUB,A_SUBU]) and else if (taicpu(next).opcode in [A_ADD,A_ADDU,A_ADDI,A_ADDIU,A_SUB,A_SUBU]) and
MatchOperand(taicpu(next).oper[0]^,taicpu(p).oper[0]^.reg) then MatchOperand(taicpu(next).oper[0]^,taicpu(p).oper[0]^.reg) then
begin begin
if MatchOperand(taicpu(next).oper[1]^,taicpu(p).oper[0]^.reg) and if MatchOperand(taicpu(next).oper[1]^,taicpu(p).oper[0]^.reg) then
Assigned(FindRegDealloc(taicpu(p).oper[0]^.reg,tai(next.next))) then
begin begin
taicpu(next).loadreg(1,taicpu(p).oper[1]^.reg); taicpu(next).loadreg(1,taicpu(p).oper[1]^.reg);
asml.remove(p); asml.remove(p);
@ -509,8 +509,7 @@ unit aoptcpu;
end end
{ TODO: if Ry=NR_R0, this effectively changes instruction into MOVE, { TODO: if Ry=NR_R0, this effectively changes instruction into MOVE,
providing further optimization possibilities } providing further optimization possibilities }
else if MatchOperand(taicpu(next).oper[2]^,taicpu(p).oper[0]^.reg) and else if MatchOperand(taicpu(next).oper[2]^,taicpu(p).oper[0]^.reg) then
Assigned(FindRegDealloc(taicpu(p).oper[0]^.reg,tai(next.next))) then
begin begin
taicpu(next).loadreg(2,taicpu(p).oper[1]^.reg); taicpu(next).loadreg(2,taicpu(p).oper[1]^.reg);
asml.remove(p); asml.remove(p);