|
|
@@ -49,6 +49,9 @@ Implementation
|
|
|
globals,globtype,
|
|
|
cgutils;
|
|
|
|
|
|
+ type
|
|
|
+ TAsmOpSet = set of TAsmOp;
|
|
|
+
|
|
|
function CanBeCond(p : tai) : boolean;
|
|
|
begin
|
|
|
result:=(p.typ=ait_instruction) and (taicpu(p).condition=C_None);
|
|
|
@@ -98,6 +101,14 @@ Implementation
|
|
|
end;
|
|
|
|
|
|
|
|
|
+ function MatchInstruction(const instr: tai; const ops: TAsmOpSet): boolean;
|
|
|
+ begin
|
|
|
+ result :=
|
|
|
+ (instr.typ = ait_instruction) and
|
|
|
+ (taicpu(instr).opcode in ops);
|
|
|
+ end;
|
|
|
+
|
|
|
+
|
|
|
function TCpuAsmOptimizer.RegInInstruction(Reg: TRegister; p1: tai): Boolean;
|
|
|
begin
|
|
|
If (p1.typ = ait_instruction) and (taicpu(p1).opcode in [A_MUL,A_MULS,A_FMUL,A_FMULS,A_FMULSU]) and
|
|
|
@@ -129,350 +140,395 @@ Implementation
|
|
|
case p.typ of
|
|
|
ait_instruction:
|
|
|
begin
|
|
|
- case taicpu(p).opcode of
|
|
|
- A_LDI:
|
|
|
- begin
|
|
|
- { turn
|
|
|
- ldi reg0, imm
|
|
|
- cp reg1, reg0
|
|
|
- dealloc reg0
|
|
|
- into
|
|
|
- cpi reg1, imm
|
|
|
- }
|
|
|
- if (taicpu(p).ops=2) and
|
|
|
- (taicpu(p).oper[0]^.typ=top_reg) and
|
|
|
- (taicpu(p).oper[1]^.typ=top_const) and
|
|
|
- GetNextInstructionUsingReg(p, hp1, taicpu(p).oper[0]^.reg) and
|
|
|
- (hp1.typ=ait_instruction) and
|
|
|
- (not RegModifiedBetween(taicpu(p).oper[0]^.reg, p, hp1)) and
|
|
|
- (taicpu(hp1).opcode=A_CP) and
|
|
|
- (taicpu(hp1).ops=2) and
|
|
|
- (taicpu(hp1).oper[1]^.typ=top_reg) and
|
|
|
- (getsupreg(taicpu(hp1).oper[0]^.reg) in [16..31]) and
|
|
|
- (taicpu(hp1).oper[1]^.reg=taicpu(p).oper[0]^.reg) and
|
|
|
- assigned(FindRegDeAlloc(taicpu(p).oper[0]^.reg,tai(hp1.Next))) then
|
|
|
- begin
|
|
|
- taicpu(hp1).opcode:=A_CPI;
|
|
|
- taicpu(hp1).loadconst(1, taicpu(p).oper[1]^.val);
|
|
|
-
|
|
|
- alloc:=FindRegAllocBackward(taicpu(p).oper[0]^.reg,tai(p.Previous));
|
|
|
- dealloc:=FindRegDeAlloc(taicpu(p).oper[0]^.reg,tai(hp1.Next));
|
|
|
-
|
|
|
- if assigned(alloc) and assigned(dealloc) then
|
|
|
- begin
|
|
|
- asml.Remove(alloc);
|
|
|
- alloc.Free;
|
|
|
- asml.Remove(dealloc);
|
|
|
- dealloc.Free;
|
|
|
- end;
|
|
|
-
|
|
|
- GetNextInstruction(p,hp1);
|
|
|
- asml.Remove(p);
|
|
|
- p.Free;
|
|
|
- p:=hp1;
|
|
|
-
|
|
|
- result:=true;
|
|
|
- end;
|
|
|
- end;
|
|
|
- A_STS:
|
|
|
- if (taicpu(p).oper[0]^.ref^.symbol=nil) and
|
|
|
- (taicpu(p).oper[0]^.ref^.relsymbol=nil) and
|
|
|
- (getsupreg(taicpu(p).oper[0]^.ref^.base)=RS_NO) and
|
|
|
- (getsupreg(taicpu(p).oper[0]^.ref^.index)=RS_NO) and
|
|
|
- (taicpu(p).oper[0]^.ref^.addressmode=AM_UNCHANGED) and
|
|
|
- (taicpu(p).oper[0]^.ref^.offset>=32) and
|
|
|
- (taicpu(p).oper[0]^.ref^.offset<=95) then
|
|
|
+ {
|
|
|
+ change
|
|
|
+ <op> reg,x,y
|
|
|
+ cp reg,r1
|
|
|
+ into
|
|
|
+ <op>s reg,x,y
|
|
|
+ }
|
|
|
+ { this optimization can applied only to the currently enabled operations because
|
|
|
+ the other operations do not update all flags and FPC does not track flag usage }
|
|
|
+ if MatchInstruction(p, [A_ADC,A_ADD,A_AND,A_ANDI,A_ASR,A_COM,A_DEC,A_EOR,
|
|
|
+ A_INC,A_LSL,A_LSR,
|
|
|
+ A_OR,A_ORI,A_ROL,A_ROR,A_SBC,A_SBCI,A_SUB,A_SUBI]) and
|
|
|
+ GetNextInstruction(p, hp1) and
|
|
|
+ MatchInstruction(hp1, A_CP) and
|
|
|
+ (taicpu(p).oper[0]^.reg = taicpu(hp1).oper[0]^.reg) and
|
|
|
+ (taicpu(hp1).oper[1]^.reg = NR_R1) and
|
|
|
+ GetNextInstruction(hp1, hp2) and
|
|
|
+ { be careful here, following instructions could use other flags
|
|
|
+ however after a jump fpc never depends on the value of flags }
|
|
|
+ { All above instructions set Z and N according to the following
|
|
|
+ Z := result = 0;
|
|
|
+ N := result[31];
|
|
|
+ EQ = Z=1; NE = Z=0;
|
|
|
+ MI = N=1; PL = N=0; }
|
|
|
+ MatchInstruction(hp2, A_BRxx) and
|
|
|
+ (taicpu(hp2).condition in [C_EQ,C_NE,C_MI,C_PL]) { and
|
|
|
+ no flag allocation tracking implemented yet on avr
|
|
|
+ assigned(FindRegDealloc(NR_DEFAULTFLAGS,tai(hp2.Next)))} then
|
|
|
+ begin
|
|
|
+ { move flag allocation if possible }
|
|
|
+ { no flag allocation tracking implemented yet on avr
|
|
|
+ GetLastInstruction(hp1, hp2);
|
|
|
+ hp2:=FindRegAlloc(NR_DEFAULTFLAGS,tai(hp2.Next));
|
|
|
+ if assigned(hp2) then
|
|
|
begin
|
|
|
- taicpu(p).opcode:=A_OUT;
|
|
|
- taicpu(p).loadconst(0,taicpu(p).oper[0]^.ref^.offset-32);
|
|
|
+ asml.Remove(hp2);
|
|
|
+ asml.insertbefore(hp2, p);
|
|
|
end;
|
|
|
- A_LDS:
|
|
|
- if (taicpu(p).oper[1]^.ref^.symbol=nil) and
|
|
|
- (taicpu(p).oper[1]^.ref^.relsymbol=nil) and
|
|
|
- (getsupreg(taicpu(p).oper[1]^.ref^.base)=RS_NO) and
|
|
|
- (getsupreg(taicpu(p).oper[1]^.ref^.index)=RS_NO) and
|
|
|
- (taicpu(p).oper[1]^.ref^.addressmode=AM_UNCHANGED) and
|
|
|
- (taicpu(p).oper[1]^.ref^.offset>=32) and
|
|
|
- (taicpu(p).oper[1]^.ref^.offset<=95) then
|
|
|
+ }
|
|
|
+
|
|
|
+ asml.remove(hp1);
|
|
|
+ hp1.free;
|
|
|
+ Result:=true;
|
|
|
+ end
|
|
|
+ else
|
|
|
+ case taicpu(p).opcode of
|
|
|
+ A_LDI:
|
|
|
begin
|
|
|
- taicpu(p).opcode:=A_IN;
|
|
|
- taicpu(p).loadconst(1,taicpu(p).oper[1]^.ref^.offset-32);
|
|
|
+ { turn
|
|
|
+ ldi reg0, imm
|
|
|
+ cp reg1, reg0
|
|
|
+ dealloc reg0
|
|
|
+ into
|
|
|
+ cpi reg1, imm
|
|
|
+ }
|
|
|
+ if (taicpu(p).ops=2) and
|
|
|
+ (taicpu(p).oper[0]^.typ=top_reg) and
|
|
|
+ (taicpu(p).oper[1]^.typ=top_const) and
|
|
|
+ GetNextInstructionUsingReg(p, hp1, taicpu(p).oper[0]^.reg) and
|
|
|
+ (hp1.typ=ait_instruction) and
|
|
|
+ (not RegModifiedBetween(taicpu(p).oper[0]^.reg, p, hp1)) and
|
|
|
+ (taicpu(hp1).opcode=A_CP) and
|
|
|
+ (taicpu(hp1).ops=2) and
|
|
|
+ (taicpu(hp1).oper[1]^.typ=top_reg) and
|
|
|
+ (getsupreg(taicpu(hp1).oper[0]^.reg) in [16..31]) and
|
|
|
+ (taicpu(hp1).oper[1]^.reg=taicpu(p).oper[0]^.reg) and
|
|
|
+ assigned(FindRegDeAlloc(taicpu(p).oper[0]^.reg,tai(hp1.Next))) then
|
|
|
+ begin
|
|
|
+ taicpu(hp1).opcode:=A_CPI;
|
|
|
+ taicpu(hp1).loadconst(1, taicpu(p).oper[1]^.val);
|
|
|
+
|
|
|
+ alloc:=FindRegAllocBackward(taicpu(p).oper[0]^.reg,tai(p.Previous));
|
|
|
+ dealloc:=FindRegDeAlloc(taicpu(p).oper[0]^.reg,tai(hp1.Next));
|
|
|
+
|
|
|
+ if assigned(alloc) and assigned(dealloc) then
|
|
|
+ begin
|
|
|
+ asml.Remove(alloc);
|
|
|
+ alloc.Free;
|
|
|
+ asml.Remove(dealloc);
|
|
|
+ dealloc.Free;
|
|
|
+ end;
|
|
|
+
|
|
|
+ GetNextInstruction(p,hp1);
|
|
|
+ asml.Remove(p);
|
|
|
+ p.Free;
|
|
|
+ p:=hp1;
|
|
|
+
|
|
|
+ result:=true;
|
|
|
+ end;
|
|
|
end;
|
|
|
- A_IN:
|
|
|
- if GetNextInstruction(p,hp1) then
|
|
|
+ A_STS:
|
|
|
+ if (taicpu(p).oper[0]^.ref^.symbol=nil) and
|
|
|
+ (taicpu(p).oper[0]^.ref^.relsymbol=nil) and
|
|
|
+ (getsupreg(taicpu(p).oper[0]^.ref^.base)=RS_NO) and
|
|
|
+ (getsupreg(taicpu(p).oper[0]^.ref^.index)=RS_NO) and
|
|
|
+ (taicpu(p).oper[0]^.ref^.addressmode=AM_UNCHANGED) and
|
|
|
+ (taicpu(p).oper[0]^.ref^.offset>=32) and
|
|
|
+ (taicpu(p).oper[0]^.ref^.offset<=95) then
|
|
|
begin
|
|
|
- {
|
|
|
- in rX,Y
|
|
|
- ori rX,n
|
|
|
- out Y,rX
|
|
|
-
|
|
|
- into
|
|
|
- sbi rX,lg(n)
|
|
|
- }
|
|
|
- if MatchInstruction(hp1,A_ORI) and
|
|
|
- (taicpu(hp1).oper[0]^.reg=taicpu(p).oper[0]^.reg) and
|
|
|
- (PopCnt(byte(taicpu(hp1).oper[1]^.val))=1) and
|
|
|
- GetNextInstruction(hp1,hp2) and
|
|
|
- MatchInstruction(hp2,A_OUT) and
|
|
|
- MatchOperand(taicpu(hp2).oper[1]^,taicpu(p).oper[0]^) and
|
|
|
- MatchOperand(taicpu(hp2).oper[0]^,taicpu(p).oper[1]^) then
|
|
|
- begin
|
|
|
- taicpu(p).opcode:=A_SBI;
|
|
|
- taicpu(p).loadconst(0,taicpu(p).oper[1]^.val);
|
|
|
- taicpu(p).loadconst(1,BsrByte(taicpu(hp1).oper[1]^.val)-1);
|
|
|
- asml.Remove(hp1);
|
|
|
- hp1.Free;
|
|
|
- asml.Remove(hp2);
|
|
|
- hp2.Free;
|
|
|
- result:=true;
|
|
|
- end
|
|
|
- {
|
|
|
- in rX,Y
|
|
|
- andi rX,not(n)
|
|
|
- out Y,rX
|
|
|
-
|
|
|
- into
|
|
|
- cbi rX,lg(n)
|
|
|
- }
|
|
|
- else if MatchInstruction(hp1,A_ANDI) and
|
|
|
- (taicpu(hp1).oper[0]^.reg=taicpu(p).oper[0]^.reg) and
|
|
|
- (PopCnt(byte(not(taicpu(hp1).oper[1]^.val)))=1) and
|
|
|
- GetNextInstruction(hp1,hp2) and
|
|
|
- MatchInstruction(hp2,A_OUT) and
|
|
|
- MatchOperand(taicpu(hp2).oper[1]^,taicpu(p).oper[0]^) and
|
|
|
- MatchOperand(taicpu(hp2).oper[0]^,taicpu(p).oper[1]^) then
|
|
|
- begin
|
|
|
- taicpu(p).opcode:=A_CBI;
|
|
|
- taicpu(p).loadconst(0,taicpu(p).oper[1]^.val);
|
|
|
- taicpu(p).loadconst(1,BsrByte(not(taicpu(hp1).oper[1]^.val))-1);
|
|
|
- asml.Remove(hp1);
|
|
|
- hp1.Free;
|
|
|
- asml.Remove(hp2);
|
|
|
- hp2.Free;
|
|
|
- result:=true;
|
|
|
- end;
|
|
|
+ taicpu(p).opcode:=A_OUT;
|
|
|
+ taicpu(p).loadconst(0,taicpu(p).oper[0]^.ref^.offset-32);
|
|
|
end;
|
|
|
- A_CLR:
|
|
|
- begin
|
|
|
- { turn the common
|
|
|
- clr rX
|
|
|
- mov/ld rX, rY
|
|
|
- into
|
|
|
- mov/ld rX, rY
|
|
|
- }
|
|
|
- if (taicpu(p).ops=1) and
|
|
|
- (taicpu(p).oper[0]^.typ=top_reg) and
|
|
|
- GetNextInstructionUsingReg(p, hp1, taicpu(p).oper[0]^.reg) and
|
|
|
- (not RegModifiedBetween(taicpu(p).oper[0]^.reg, p, hp1)) and
|
|
|
- (hp1.typ=ait_instruction) and
|
|
|
- (taicpu(hp1).opcode in [A_MOV,A_LD]) and
|
|
|
- (taicpu(hp1).ops>0) and
|
|
|
- (taicpu(hp1).oper[0]^.typ=top_reg) and
|
|
|
- (taicpu(hp1).oper[0]^.reg=taicpu(p).oper[0]^.reg) then
|
|
|
+ A_LDS:
|
|
|
+ if (taicpu(p).oper[1]^.ref^.symbol=nil) and
|
|
|
+ (taicpu(p).oper[1]^.ref^.relsymbol=nil) and
|
|
|
+ (getsupreg(taicpu(p).oper[1]^.ref^.base)=RS_NO) and
|
|
|
+ (getsupreg(taicpu(p).oper[1]^.ref^.index)=RS_NO) and
|
|
|
+ (taicpu(p).oper[1]^.ref^.addressmode=AM_UNCHANGED) and
|
|
|
+ (taicpu(p).oper[1]^.ref^.offset>=32) and
|
|
|
+ (taicpu(p).oper[1]^.ref^.offset<=95) then
|
|
|
begin
|
|
|
- asml.Remove(p);
|
|
|
- p.Free;
|
|
|
- p:=hp1;
|
|
|
- result:=true;
|
|
|
- end
|
|
|
- { turn
|
|
|
- clr rX
|
|
|
- ...
|
|
|
- adc rY, rX
|
|
|
- into
|
|
|
- ...
|
|
|
- adc rY, r1
|
|
|
- }
|
|
|
- else if (taicpu(p).ops=1) and
|
|
|
- (taicpu(p).oper[0]^.typ=top_reg) and
|
|
|
- GetNextInstructionUsingReg(p, hp1, taicpu(p).oper[0]^.reg) and
|
|
|
- (not RegModifiedBetween(taicpu(p).oper[0]^.reg, p, hp1)) and
|
|
|
- (hp1.typ=ait_instruction) and
|
|
|
- (taicpu(hp1).opcode in [A_ADC,A_SBC]) and
|
|
|
- (taicpu(hp1).ops=2) and
|
|
|
- (taicpu(hp1).oper[1]^.typ=top_reg) and
|
|
|
- (taicpu(hp1).oper[1]^.reg=taicpu(p).oper[0]^.reg) and
|
|
|
- (taicpu(hp1).oper[0]^.reg<>taicpu(p).oper[0]^.reg) and
|
|
|
- assigned(FindRegDeAlloc(taicpu(p).oper[0]^.reg,tai(hp1.Next))) then
|
|
|
- begin
|
|
|
- taicpu(hp1).oper[1]^.reg:=NR_R1;
|
|
|
-
|
|
|
- alloc:=FindRegAllocBackward(taicpu(p).oper[0]^.reg,tai(p.Previous));
|
|
|
- dealloc:=FindRegDeAlloc(taicpu(p).oper[0]^.reg,tai(hp1.Next));
|
|
|
-
|
|
|
- if assigned(alloc) and assigned(dealloc) then
|
|
|
- begin
|
|
|
- asml.Remove(alloc);
|
|
|
- alloc.Free;
|
|
|
- asml.Remove(dealloc);
|
|
|
- dealloc.Free;
|
|
|
- end;
|
|
|
-
|
|
|
- GetNextInstruction(p,hp1);
|
|
|
- asml.Remove(p);
|
|
|
- p.free;
|
|
|
- p:=hp1;
|
|
|
-
|
|
|
- result:=true;
|
|
|
+ taicpu(p).opcode:=A_IN;
|
|
|
+ taicpu(p).loadconst(1,taicpu(p).oper[1]^.ref^.offset-32);
|
|
|
end;
|
|
|
- end;
|
|
|
- A_PUSH:
|
|
|
- begin
|
|
|
- { turn
|
|
|
- push reg0
|
|
|
- push reg1
|
|
|
- pop reg3
|
|
|
- pop reg2
|
|
|
- into
|
|
|
- movw reg2,reg0
|
|
|
- }
|
|
|
- if (taicpu(p).ops=1) and
|
|
|
- (taicpu(p).oper[0]^.typ=top_reg) and
|
|
|
- GetNextInstruction(p,hp1) and
|
|
|
- (hp1.typ=ait_instruction) and
|
|
|
- (taicpu(hp1).opcode=A_PUSH) and
|
|
|
- (getsupreg(taicpu(hp1).oper[0]^.reg)=getsupreg(taicpu(p).oper[0]^.reg)+1) and
|
|
|
- ((getsupreg(taicpu(p).oper[0]^.reg) mod 2)=0) and
|
|
|
-
|
|
|
- GetNextInstruction(hp1,hp2) and
|
|
|
- (hp2.typ=ait_instruction) and
|
|
|
- (taicpu(hp2).opcode=A_POP) and
|
|
|
-
|
|
|
- GetNextInstruction(hp2,hp3) and
|
|
|
- (hp3.typ=ait_instruction) and
|
|
|
- (taicpu(hp3).opcode=A_POP) and
|
|
|
- (getsupreg(taicpu(hp2).oper[0]^.reg)=getsupreg(taicpu(hp3).oper[0]^.reg)+1) and
|
|
|
- ((getsupreg(taicpu(hp3).oper[0]^.reg) mod 2)=0) then
|
|
|
- begin
|
|
|
- taicpu(p).ops:=2;
|
|
|
- taicpu(p).opcode:=A_MOVW;
|
|
|
+ A_IN:
|
|
|
+ if GetNextInstruction(p,hp1) then
|
|
|
+ begin
|
|
|
+ {
|
|
|
+ in rX,Y
|
|
|
+ ori rX,n
|
|
|
+ out Y,rX
|
|
|
+
|
|
|
+ into
|
|
|
+ sbi rX,lg(n)
|
|
|
+ }
|
|
|
+ if MatchInstruction(hp1,A_ORI) and
|
|
|
+ (taicpu(hp1).oper[0]^.reg=taicpu(p).oper[0]^.reg) and
|
|
|
+ (PopCnt(byte(taicpu(hp1).oper[1]^.val))=1) and
|
|
|
+ GetNextInstruction(hp1,hp2) and
|
|
|
+ MatchInstruction(hp2,A_OUT) and
|
|
|
+ MatchOperand(taicpu(hp2).oper[1]^,taicpu(p).oper[0]^) and
|
|
|
+ MatchOperand(taicpu(hp2).oper[0]^,taicpu(p).oper[1]^) then
|
|
|
+ begin
|
|
|
+ taicpu(p).opcode:=A_SBI;
|
|
|
+ taicpu(p).loadconst(0,taicpu(p).oper[1]^.val);
|
|
|
+ taicpu(p).loadconst(1,BsrByte(taicpu(hp1).oper[1]^.val)-1);
|
|
|
+ asml.Remove(hp1);
|
|
|
+ hp1.Free;
|
|
|
+ asml.Remove(hp2);
|
|
|
+ hp2.Free;
|
|
|
+ result:=true;
|
|
|
+ end
|
|
|
+ {
|
|
|
+ in rX,Y
|
|
|
+ andi rX,not(n)
|
|
|
+ out Y,rX
|
|
|
+
|
|
|
+ into
|
|
|
+ cbi rX,lg(n)
|
|
|
+ }
|
|
|
+ else if MatchInstruction(hp1,A_ANDI) and
|
|
|
+ (taicpu(hp1).oper[0]^.reg=taicpu(p).oper[0]^.reg) and
|
|
|
+ (PopCnt(byte(not(taicpu(hp1).oper[1]^.val)))=1) and
|
|
|
+ GetNextInstruction(hp1,hp2) and
|
|
|
+ MatchInstruction(hp2,A_OUT) and
|
|
|
+ MatchOperand(taicpu(hp2).oper[1]^,taicpu(p).oper[0]^) and
|
|
|
+ MatchOperand(taicpu(hp2).oper[0]^,taicpu(p).oper[1]^) then
|
|
|
+ begin
|
|
|
+ taicpu(p).opcode:=A_CBI;
|
|
|
+ taicpu(p).loadconst(0,taicpu(p).oper[1]^.val);
|
|
|
+ taicpu(p).loadconst(1,BsrByte(not(taicpu(hp1).oper[1]^.val))-1);
|
|
|
+ asml.Remove(hp1);
|
|
|
+ hp1.Free;
|
|
|
+ asml.Remove(hp2);
|
|
|
+ hp2.Free;
|
|
|
+ result:=true;
|
|
|
+ end;
|
|
|
+ end;
|
|
|
+ A_CLR:
|
|
|
+ begin
|
|
|
+ { turn the common
|
|
|
+ clr rX
|
|
|
+ mov/ld rX, rY
|
|
|
+ into
|
|
|
+ mov/ld rX, rY
|
|
|
+ }
|
|
|
+ if (taicpu(p).ops=1) and
|
|
|
+ (taicpu(p).oper[0]^.typ=top_reg) and
|
|
|
+ GetNextInstructionUsingReg(p, hp1, taicpu(p).oper[0]^.reg) and
|
|
|
+ (not RegModifiedBetween(taicpu(p).oper[0]^.reg, p, hp1)) and
|
|
|
+ (hp1.typ=ait_instruction) and
|
|
|
+ (taicpu(hp1).opcode in [A_MOV,A_LD]) and
|
|
|
+ (taicpu(hp1).ops>0) and
|
|
|
+ (taicpu(hp1).oper[0]^.typ=top_reg) and
|
|
|
+ (taicpu(hp1).oper[0]^.reg=taicpu(p).oper[0]^.reg) then
|
|
|
+ begin
|
|
|
+ asml.Remove(p);
|
|
|
+ p.Free;
|
|
|
+ p:=hp1;
|
|
|
+ result:=true;
|
|
|
+ end
|
|
|
+ { turn
|
|
|
+ clr rX
|
|
|
+ ...
|
|
|
+ adc rY, rX
|
|
|
+ into
|
|
|
+ ...
|
|
|
+ adc rY, r1
|
|
|
+ }
|
|
|
+ else if (taicpu(p).ops=1) and
|
|
|
+ (taicpu(p).oper[0]^.typ=top_reg) and
|
|
|
+ GetNextInstructionUsingReg(p, hp1, taicpu(p).oper[0]^.reg) and
|
|
|
+ (not RegModifiedBetween(taicpu(p).oper[0]^.reg, p, hp1)) and
|
|
|
+ (hp1.typ=ait_instruction) and
|
|
|
+ (taicpu(hp1).opcode in [A_ADC,A_SBC]) and
|
|
|
+ (taicpu(hp1).ops=2) and
|
|
|
+ (taicpu(hp1).oper[1]^.typ=top_reg) and
|
|
|
+ (taicpu(hp1).oper[1]^.reg=taicpu(p).oper[0]^.reg) and
|
|
|
+ (taicpu(hp1).oper[0]^.reg<>taicpu(p).oper[0]^.reg) and
|
|
|
+ assigned(FindRegDeAlloc(taicpu(p).oper[0]^.reg,tai(hp1.Next))) then
|
|
|
+ begin
|
|
|
+ taicpu(hp1).oper[1]^.reg:=NR_R1;
|
|
|
|
|
|
- taicpu(p).loadreg(1, taicpu(p).oper[0]^.reg);
|
|
|
- taicpu(p).loadreg(0, taicpu(hp3).oper[0]^.reg);
|
|
|
+ alloc:=FindRegAllocBackward(taicpu(p).oper[0]^.reg,tai(p.Previous));
|
|
|
+ dealloc:=FindRegDeAlloc(taicpu(p).oper[0]^.reg,tai(hp1.Next));
|
|
|
|
|
|
- asml.Remove(hp1);
|
|
|
- hp1.Free;
|
|
|
- asml.Remove(hp2);
|
|
|
- hp2.Free;
|
|
|
- asml.Remove(hp3);
|
|
|
- hp3.Free;
|
|
|
+ if assigned(alloc) and assigned(dealloc) then
|
|
|
+ begin
|
|
|
+ asml.Remove(alloc);
|
|
|
+ alloc.Free;
|
|
|
+ asml.Remove(dealloc);
|
|
|
+ dealloc.Free;
|
|
|
+ end;
|
|
|
|
|
|
- result:=true;
|
|
|
- end;
|
|
|
- end;
|
|
|
- A_MOV:
|
|
|
- begin
|
|
|
- { turn
|
|
|
- mov reg0, reg1
|
|
|
- push reg0
|
|
|
- dealloc reg0
|
|
|
- into
|
|
|
- push reg1
|
|
|
- }
|
|
|
- if (taicpu(p).ops=2) and
|
|
|
- (taicpu(p).oper[0]^.typ = top_reg) and
|
|
|
- (taicpu(p).oper[1]^.typ = top_reg) and
|
|
|
- GetNextInstructionUsingReg(p,hp1,taicpu(p).oper[0]^.reg) and
|
|
|
- (not RegModifiedBetween(taicpu(p).oper[1]^.reg, p, hp1)) and
|
|
|
- (hp1.typ = ait_instruction) and
|
|
|
- (taicpu(hp1).opcode in [A_PUSH,A_MOV,A_CP,A_CPC,A_ADD,A_SUB,A_EOR,A_AND,A_OR]) and
|
|
|
- RegInInstruction(taicpu(p).oper[0]^.reg, hp1) and
|
|
|
- (not RegModifiedByInstruction(taicpu(p).oper[0]^.reg, hp1)) and
|
|
|
- {(taicpu(hp1).ops=1) and
|
|
|
- (taicpu(hp1).oper[0]^.typ = top_reg) and
|
|
|
- (taicpu(hp1).oper[0]^.reg=taicpu(p).oper[0]^.reg) and }
|
|
|
- assigned(FindRegDeAlloc(taicpu(p).oper[0]^.reg,tai(hp1.Next))) then
|
|
|
- begin
|
|
|
- for i := 0 to taicpu(hp1).ops-1 do
|
|
|
- if taicpu(hp1).oper[i]^.typ=top_reg then
|
|
|
- if taicpu(hp1).oper[i]^.reg=taicpu(p).oper[0]^.reg then
|
|
|
- taicpu(hp1).oper[i]^.reg:=taicpu(p).oper[1]^.reg;
|
|
|
+ GetNextInstruction(p,hp1);
|
|
|
+ asml.Remove(p);
|
|
|
+ p.free;
|
|
|
+ p:=hp1;
|
|
|
|
|
|
- alloc:=FindRegAllocBackward(taicpu(p).oper[0]^.reg,tai(p.Previous));
|
|
|
- dealloc:=FindRegDeAlloc(taicpu(p).oper[0]^.reg,tai(hp1.Next));
|
|
|
+ result:=true;
|
|
|
+ end;
|
|
|
+ end;
|
|
|
+ A_PUSH:
|
|
|
+ begin
|
|
|
+ { turn
|
|
|
+ push reg0
|
|
|
+ push reg1
|
|
|
+ pop reg3
|
|
|
+ pop reg2
|
|
|
+ into
|
|
|
+ movw reg2,reg0
|
|
|
+ }
|
|
|
+ if (taicpu(p).ops=1) and
|
|
|
+ (taicpu(p).oper[0]^.typ=top_reg) and
|
|
|
+ GetNextInstruction(p,hp1) and
|
|
|
+ (hp1.typ=ait_instruction) and
|
|
|
+ (taicpu(hp1).opcode=A_PUSH) and
|
|
|
+ (getsupreg(taicpu(hp1).oper[0]^.reg)=getsupreg(taicpu(p).oper[0]^.reg)+1) and
|
|
|
+ ((getsupreg(taicpu(p).oper[0]^.reg) mod 2)=0) and
|
|
|
+
|
|
|
+ GetNextInstruction(hp1,hp2) and
|
|
|
+ (hp2.typ=ait_instruction) and
|
|
|
+ (taicpu(hp2).opcode=A_POP) and
|
|
|
+
|
|
|
+ GetNextInstruction(hp2,hp3) and
|
|
|
+ (hp3.typ=ait_instruction) and
|
|
|
+ (taicpu(hp3).opcode=A_POP) and
|
|
|
+ (getsupreg(taicpu(hp2).oper[0]^.reg)=getsupreg(taicpu(hp3).oper[0]^.reg)+1) and
|
|
|
+ ((getsupreg(taicpu(hp3).oper[0]^.reg) mod 2)=0) then
|
|
|
+ begin
|
|
|
+ taicpu(p).ops:=2;
|
|
|
+ taicpu(p).opcode:=A_MOVW;
|
|
|
|
|
|
- if assigned(alloc) and assigned(dealloc) then
|
|
|
- begin
|
|
|
- asml.Remove(alloc);
|
|
|
- alloc.Free;
|
|
|
- asml.Remove(dealloc);
|
|
|
- dealloc.Free;
|
|
|
- end;
|
|
|
+ taicpu(p).loadreg(1, taicpu(p).oper[0]^.reg);
|
|
|
+ taicpu(p).loadreg(0, taicpu(hp3).oper[0]^.reg);
|
|
|
|
|
|
- GetNextInstruction(p,hp1);
|
|
|
- asml.Remove(p);
|
|
|
- p.free;
|
|
|
- p:=hp1;
|
|
|
- result:=true;
|
|
|
- end
|
|
|
- { remove
|
|
|
- mov reg0,reg0
|
|
|
- }
|
|
|
- else if (taicpu(p).ops=2) and
|
|
|
- (taicpu(p).oper[0]^.typ = top_reg) and
|
|
|
- (taicpu(p).oper[1]^.typ = top_reg) and
|
|
|
- (taicpu(p).oper[0]^.reg = taicpu(p).oper[1]^.reg) then
|
|
|
- begin
|
|
|
- GetNextInstruction(p,hp1);
|
|
|
- asml.remove(p);
|
|
|
- p.free;
|
|
|
- p:=hp1;
|
|
|
- result:=true;
|
|
|
- end
|
|
|
- { fold
|
|
|
- mov reg2,reg0
|
|
|
- mov reg3,reg1
|
|
|
- to
|
|
|
- movw reg2,reg0
|
|
|
- }
|
|
|
- else if (CPUAVR_HAS_MOVW in cpu_capabilities[current_settings.cputype]) and
|
|
|
- (taicpu(p).ops=2) and
|
|
|
- (taicpu(p).oper[0]^.typ = top_reg) and
|
|
|
- (taicpu(p).oper[1]^.typ = top_reg) and
|
|
|
- getnextinstruction(p,hp1) and
|
|
|
- (hp1.typ = ait_instruction) and
|
|
|
- (taicpu(hp1).opcode = A_MOV) and
|
|
|
- (taicpu(hp1).ops=2) and
|
|
|
- (taicpu(hp1).oper[0]^.typ = top_reg) and
|
|
|
- (taicpu(hp1).oper[1]^.typ = top_reg) and
|
|
|
- (getsupreg(taicpu(hp1).oper[0]^.reg)=getsupreg(taicpu(p).oper[0]^.reg)+1) and
|
|
|
- ((getsupreg(taicpu(p).oper[0]^.reg) mod 2)=0) and
|
|
|
- ((getsupreg(taicpu(p).oper[1]^.reg) mod 2)=0) and
|
|
|
- (getsupreg(taicpu(hp1).oper[1]^.reg)=getsupreg(taicpu(p).oper[1]^.reg)+1) then
|
|
|
- begin
|
|
|
- alloc:=FindRegAllocBackward(taicpu(hp1).oper[0]^.reg,tai(hp1.Previous));
|
|
|
- if assigned(alloc) then
|
|
|
- begin
|
|
|
- asml.Remove(alloc);
|
|
|
- asml.InsertBefore(alloc,p);
|
|
|
- end;
|
|
|
+ asml.Remove(hp1);
|
|
|
+ hp1.Free;
|
|
|
+ asml.Remove(hp2);
|
|
|
+ hp2.Free;
|
|
|
+ asml.Remove(hp3);
|
|
|
+ hp3.Free;
|
|
|
|
|
|
- taicpu(p).opcode:=A_MOVW;
|
|
|
- asml.remove(hp1);
|
|
|
- hp1.free;
|
|
|
- result:=true;
|
|
|
- end
|
|
|
- {
|
|
|
- This removes the first mov from
|
|
|
- mov rX,...
|
|
|
- mov rX,...
|
|
|
- }
|
|
|
- else if taicpu(hp1).opcode=A_MOV then
|
|
|
- while (hp1.typ=ait_instruction) and (taicpu(hp1).opcode=A_MOV) and
|
|
|
- MatchOperand(taicpu(p).oper[0]^, taicpu(hp1).oper[0]^) and
|
|
|
- { don't remove the first mov if the second is a mov rX,rX }
|
|
|
- not(MatchOperand(taicpu(hp1).oper[0]^,taicpu(hp1).oper[1]^)) do
|
|
|
+ result:=true;
|
|
|
+ end;
|
|
|
+ end;
|
|
|
+ A_MOV:
|
|
|
+ begin
|
|
|
+ { turn
|
|
|
+ mov reg0, reg1
|
|
|
+ push reg0
|
|
|
+ dealloc reg0
|
|
|
+ into
|
|
|
+ push reg1
|
|
|
+ }
|
|
|
+ if (taicpu(p).ops=2) and
|
|
|
+ (taicpu(p).oper[0]^.typ = top_reg) and
|
|
|
+ (taicpu(p).oper[1]^.typ = top_reg) and
|
|
|
+ GetNextInstructionUsingReg(p,hp1,taicpu(p).oper[0]^.reg) and
|
|
|
+ (not RegModifiedBetween(taicpu(p).oper[1]^.reg, p, hp1)) and
|
|
|
+ (hp1.typ = ait_instruction) and
|
|
|
+ (taicpu(hp1).opcode in [A_PUSH,A_MOV,A_CP,A_CPC,A_ADD,A_SUB,A_EOR,A_AND,A_OR]) and
|
|
|
+ RegInInstruction(taicpu(p).oper[0]^.reg, hp1) and
|
|
|
+ (not RegModifiedByInstruction(taicpu(p).oper[0]^.reg, hp1)) and
|
|
|
+ {(taicpu(hp1).ops=1) and
|
|
|
+ (taicpu(hp1).oper[0]^.typ = top_reg) and
|
|
|
+ (taicpu(hp1).oper[0]^.reg=taicpu(p).oper[0]^.reg) and }
|
|
|
+ assigned(FindRegDeAlloc(taicpu(p).oper[0]^.reg,tai(hp1.Next))) then
|
|
|
begin
|
|
|
+ for i := 0 to taicpu(hp1).ops-1 do
|
|
|
+ if taicpu(hp1).oper[i]^.typ=top_reg then
|
|
|
+ if taicpu(hp1).oper[i]^.reg=taicpu(p).oper[0]^.reg then
|
|
|
+ taicpu(hp1).oper[i]^.reg:=taicpu(p).oper[1]^.reg;
|
|
|
+
|
|
|
+ alloc:=FindRegAllocBackward(taicpu(p).oper[0]^.reg,tai(p.Previous));
|
|
|
+ dealloc:=FindRegDeAlloc(taicpu(p).oper[0]^.reg,tai(hp1.Next));
|
|
|
+
|
|
|
+ if assigned(alloc) and assigned(dealloc) then
|
|
|
+ begin
|
|
|
+ asml.Remove(alloc);
|
|
|
+ alloc.Free;
|
|
|
+ asml.Remove(dealloc);
|
|
|
+ dealloc.Free;
|
|
|
+ end;
|
|
|
+
|
|
|
+ GetNextInstruction(p,hp1);
|
|
|
+ asml.Remove(p);
|
|
|
+ p.free;
|
|
|
+ p:=hp1;
|
|
|
+ result:=true;
|
|
|
+ end
|
|
|
+ { remove
|
|
|
+ mov reg0,reg0
|
|
|
+ }
|
|
|
+ else if (taicpu(p).ops=2) and
|
|
|
+ (taicpu(p).oper[0]^.typ = top_reg) and
|
|
|
+ (taicpu(p).oper[1]^.typ = top_reg) and
|
|
|
+ (taicpu(p).oper[0]^.reg = taicpu(p).oper[1]^.reg) then
|
|
|
+ begin
|
|
|
+ GetNextInstruction(p,hp1);
|
|
|
asml.remove(p);
|
|
|
p.free;
|
|
|
p:=hp1;
|
|
|
- GetNextInstruction(hp1,hp1);
|
|
|
result:=true;
|
|
|
- if not assigned(hp1) then
|
|
|
- break;
|
|
|
- end;
|
|
|
- end;
|
|
|
- end;
|
|
|
+ end
|
|
|
+ { fold
|
|
|
+ mov reg2,reg0
|
|
|
+ mov reg3,reg1
|
|
|
+ to
|
|
|
+ movw reg2,reg0
|
|
|
+ }
|
|
|
+ else if (CPUAVR_HAS_MOVW in cpu_capabilities[current_settings.cputype]) and
|
|
|
+ (taicpu(p).ops=2) and
|
|
|
+ (taicpu(p).oper[0]^.typ = top_reg) and
|
|
|
+ (taicpu(p).oper[1]^.typ = top_reg) and
|
|
|
+ getnextinstruction(p,hp1) and
|
|
|
+ (hp1.typ = ait_instruction) and
|
|
|
+ (taicpu(hp1).opcode = A_MOV) and
|
|
|
+ (taicpu(hp1).ops=2) and
|
|
|
+ (taicpu(hp1).oper[0]^.typ = top_reg) and
|
|
|
+ (taicpu(hp1).oper[1]^.typ = top_reg) and
|
|
|
+ (getsupreg(taicpu(hp1).oper[0]^.reg)=getsupreg(taicpu(p).oper[0]^.reg)+1) and
|
|
|
+ ((getsupreg(taicpu(p).oper[0]^.reg) mod 2)=0) and
|
|
|
+ ((getsupreg(taicpu(p).oper[1]^.reg) mod 2)=0) and
|
|
|
+ (getsupreg(taicpu(hp1).oper[1]^.reg)=getsupreg(taicpu(p).oper[1]^.reg)+1) then
|
|
|
+ begin
|
|
|
+ alloc:=FindRegAllocBackward(taicpu(hp1).oper[0]^.reg,tai(hp1.Previous));
|
|
|
+ if assigned(alloc) then
|
|
|
+ begin
|
|
|
+ asml.Remove(alloc);
|
|
|
+ asml.InsertBefore(alloc,p);
|
|
|
+ end;
|
|
|
+
|
|
|
+ taicpu(p).opcode:=A_MOVW;
|
|
|
+ asml.remove(hp1);
|
|
|
+ hp1.free;
|
|
|
+ result:=true;
|
|
|
+ end
|
|
|
+ {
|
|
|
+ This removes the first mov from
|
|
|
+ mov rX,...
|
|
|
+ mov rX,...
|
|
|
+ }
|
|
|
+ else if taicpu(hp1).opcode=A_MOV then
|
|
|
+ while (hp1.typ=ait_instruction) and (taicpu(hp1).opcode=A_MOV) and
|
|
|
+ MatchOperand(taicpu(p).oper[0]^, taicpu(hp1).oper[0]^) and
|
|
|
+ { don't remove the first mov if the second is a mov rX,rX }
|
|
|
+ not(MatchOperand(taicpu(hp1).oper[0]^,taicpu(hp1).oper[1]^)) do
|
|
|
+ begin
|
|
|
+ asml.remove(p);
|
|
|
+ p.free;
|
|
|
+ p:=hp1;
|
|
|
+ GetNextInstruction(hp1,hp1);
|
|
|
+ result:=true;
|
|
|
+ if not assigned(hp1) then
|
|
|
+ break;
|
|
|
+ end;
|
|
|
+ end;
|
|
|
+ end;
|
|
|
end;
|
|
|
end;
|
|
|
end;
|
florian