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

* AVR: use LDS/LD and STS/ST depending on the reference

Browse Source 
git-svn-id: branches/avr@17052 -
This commit is contained in:
florian 2011-02-27 21:13:25 +00:00
parent a178f34ab3
commit 0302c7181e
1 changed files with 50 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

79
compiler/avr/cgcpu.pas
View File

@ -98,6 +98,8 @@ unit cgcpu;
procedure emit_mov(list: TAsmList;reg2: tregister; reg1: tregister); procedure emit_mov(list: TAsmList;reg2: tregister; reg1: tregister);
procedure a_adjust_sp(list: TAsmList; value: longint); procedure a_adjust_sp(list: TAsmList; value: longint);
function GetLoad(const ref : treference) : tasmop;
function GetStore(const ref: treference): tasmop;
end; end;
tcg64favr = class(tcg64f32) tcg64favr = class(tcg64f32)
@ -423,7 +425,7 @@ unit cgcpu;
tmpreg:=GetNextReg(dst); tmpreg:=GetNextReg(dst);
for i:=2 to tcgsize2size[size] do for i:=2 to tcgsize2size[size] do
begin begin
list.concat(taicpu.op_const_reg(A_SBCI,-1,dst)); list.concat(taicpu.op_reg_const(A_SBCI,dst,-1));
tmpreg:=GetNextReg(tmpreg); tmpreg:=GetNextReg(tmpreg);
end; end;
end end
@ -625,7 +627,7 @@ unit cgcpu;
if (href.base<>NR_NO) and (tcgsize2size[tosize]>1) then if (href.base<>NR_NO) and (tcgsize2size[tosize]>1) then
href.addressmode:=AM_POSTINCREMENT; href.addressmode:=AM_POSTINCREMENT;
list.concat(taicpu.op_ref_reg(A_ST,href,reg)); list.concat(taicpu.op_ref_reg(GetStore(href),href,reg));
for i:=2 to tcgsize2size[tosize] do for i:=2 to tcgsize2size[tosize] do
begin begin
if (href.offset<>0) or assigned(href.symbol) then if (href.offset<>0) or assigned(href.symbol) then
@ -636,20 +638,20 @@ unit cgcpu;
else else
href.addressmode:=AM_UNCHANGED; href.addressmode:=AM_UNCHANGED;
list.concat(taicpu.op_ref_reg(A_ST,href,NR_R1)); list.concat(taicpu.op_ref_reg(GetStore(href),href,NR_R1));
end; end;
end; end;
OS_S8: OS_S8:
begin begin
if (href.base<>NR_NO) and (tcgsize2size[tosize]>1) then if (href.base<>NR_NO) and (tcgsize2size[tosize]>1) then
href.addressmode:=AM_POSTINCREMENT; href.addressmode:=AM_POSTINCREMENT;
list.concat(taicpu.op_ref_reg(A_ST,href,reg)); list.concat(taicpu.op_ref_reg(GetStore(href),href,reg));
if tcgsize2size[tosize]>1 then if tcgsize2size[tosize]>1 then
begin begin
tmpreg:=getintregister(list,OS_8); tmpreg:=getintregister(list,OS_8);
list.concat(taicpu.op_reg(A_CLR,tmpreg)); list.concat(taicpu.op_reg(A_CLR,tmpreg));
list.concat(taicpu.op_reg_const(A_SBIC,reg,7)); list.concat(taicpu.op_reg_const(A_SBRC,reg,7));
list.concat(taicpu.op_reg(A_COM,tmpreg)); list.concat(taicpu.op_reg(A_COM,tmpreg));
for i:=2 to tcgsize2size[tosize] do for i:=2 to tcgsize2size[tosize] do
begin begin
@ -660,7 +662,7 @@ unit cgcpu;
href.addressmode:=AM_POSTINCREMENT href.addressmode:=AM_POSTINCREMENT
else else
href.addressmode:=AM_UNCHANGED; href.addressmode:=AM_UNCHANGED;
list.concat(taicpu.op_ref_reg(A_ST,href,tmpreg)); list.concat(taicpu.op_ref_reg(GetStore(href),href,tmpreg));
end; end;
end; end;
end; end;
@ -669,7 +671,7 @@ unit cgcpu;
if (href.base<>NR_NO) and (tcgsize2size[tosize]>1) then if (href.base<>NR_NO) and (tcgsize2size[tosize]>1) then
href.addressmode:=AM_POSTINCREMENT; href.addressmode:=AM_POSTINCREMENT;
list.concat(taicpu.op_ref_reg(A_ST,href,reg)); list.concat(taicpu.op_ref_reg(GetStore(href),href,reg));
if (href.offset<>0) or assigned(href.symbol) then if (href.offset<>0) or assigned(href.symbol) then
inc(href.offset) inc(href.offset)
else if (href.base<>NR_NO) and (tcgsize2size[fromsize]>2) then else if (href.base<>NR_NO) and (tcgsize2size[fromsize]>2) then
@ -678,7 +680,7 @@ unit cgcpu;
href.addressmode:=AM_UNCHANGED; href.addressmode:=AM_UNCHANGED;
reg:=GetNextReg(reg); reg:=GetNextReg(reg);
list.concat(taicpu.op_ref_reg(A_ST,href,reg)); list.concat(taicpu.op_ref_reg(GetStore(href),href,reg));
for i:=3 to tcgsize2size[tosize] do for i:=3 to tcgsize2size[tosize] do
begin begin
@ -690,7 +692,7 @@ unit cgcpu;
else else
href.addressmode:=AM_UNCHANGED; href.addressmode:=AM_UNCHANGED;
list.concat(taicpu.op_ref_reg(A_ST,href,NR_R1)); list.concat(taicpu.op_ref_reg(GetStore(href),href,NR_R1));
end; end;
end; end;
OS_S16: OS_S16:
@ -698,7 +700,7 @@ unit cgcpu;
if (href.base<>NR_NO) and (tcgsize2size[tosize]>1) then if (href.base<>NR_NO) and (tcgsize2size[tosize]>1) then
href.addressmode:=AM_POSTINCREMENT; href.addressmode:=AM_POSTINCREMENT;
list.concat(taicpu.op_ref_reg(A_ST,href,reg)); list.concat(taicpu.op_ref_reg(GetStore(href),href,reg));
if (href.offset<>0) or assigned(href.symbol) then if (href.offset<>0) or assigned(href.symbol) then
inc(href.offset) inc(href.offset)
else if (href.base<>NR_NO) and (tcgsize2size[fromsize]>2) then else if (href.base<>NR_NO) and (tcgsize2size[fromsize]>2) then
@ -707,13 +709,13 @@ unit cgcpu;
href.addressmode:=AM_UNCHANGED; href.addressmode:=AM_UNCHANGED;
reg:=GetNextReg(reg); reg:=GetNextReg(reg);
list.concat(taicpu.op_ref_reg(A_ST,href,reg)); list.concat(taicpu.op_ref_reg(GetStore(href),href,reg));
if tcgsize2size[tosize]>2 then if tcgsize2size[tosize]>2 then
begin begin
tmpreg:=getintregister(list,OS_8); tmpreg:=getintregister(list,OS_8);
list.concat(taicpu.op_reg(A_CLR,tmpreg)); list.concat(taicpu.op_reg(A_CLR,tmpreg));
list.concat(taicpu.op_reg_const(A_SBIC,reg,7)); list.concat(taicpu.op_reg_const(A_SBRC,reg,7));
list.concat(taicpu.op_reg(A_COM,tmpreg)); list.concat(taicpu.op_reg(A_COM,tmpreg));
for i:=3 to tcgsize2size[tosize] do for i:=3 to tcgsize2size[tosize] do
begin begin
@ -724,7 +726,7 @@ unit cgcpu;
href.addressmode:=AM_POSTINCREMENT href.addressmode:=AM_POSTINCREMENT
else else
href.addressmode:=AM_UNCHANGED; href.addressmode:=AM_UNCHANGED;
list.concat(taicpu.op_ref_reg(A_ST,href,tmpreg)); list.concat(taicpu.op_ref_reg(GetStore(href),href,tmpreg));
end; end;
end; end;
end; end;
@ -741,7 +743,7 @@ unit cgcpu;
else else
href.addressmode:=AM_UNCHANGED; href.addressmode:=AM_UNCHANGED;
list.concat(taicpu.op_ref_reg(A_ST,href,reg)); list.concat(taicpu.op_ref_reg(GetStore(href),href,reg));
if (href.offset<>0) or assigned(href.symbol) then if (href.offset<>0) or assigned(href.symbol) then
inc(href.offset); inc(href.offset);
@ -773,7 +775,7 @@ unit cgcpu;
case fromsize of case fromsize of
OS_8: OS_8:
begin begin
list.concat(taicpu.op_reg_ref(A_LD,reg,href)); list.concat(taicpu.op_reg_ref(GetLoad(href),reg,href));
for i:=2 to tcgsize2size[tosize] do for i:=2 to tcgsize2size[tosize] do
begin begin
reg:=GetNextReg(reg); reg:=GetNextReg(reg);
@ -782,14 +784,14 @@ unit cgcpu;
end; end;
OS_S8: OS_S8:
begin begin
list.concat(taicpu.op_reg_ref(A_LD,reg,href)); list.concat(taicpu.op_reg_ref(GetLoad(href),reg,href));
tmpreg:=reg; tmpreg:=reg;
if tcgsize2size[tosize]>1 then if tcgsize2size[tosize]>1 then
begin begin
reg:=GetNextReg(reg); reg:=GetNextReg(reg);
list.concat(taicpu.op_reg(A_CLR,reg)); list.concat(taicpu.op_reg(A_CLR,reg));
list.concat(taicpu.op_reg_const(A_SBIC,tmpreg,7)); list.concat(taicpu.op_reg_const(A_SBRC,tmpreg,7));
list.concat(taicpu.op_reg(A_COM,reg)); list.concat(taicpu.op_reg(A_COM,reg));
tmpreg:=reg; tmpreg:=reg;
for i:=3 to tcgsize2size[tosize] do for i:=3 to tcgsize2size[tosize] do
@ -803,14 +805,14 @@ unit cgcpu;
begin begin
if href.base<>NR_NO then if href.base<>NR_NO then
href.addressmode:=AM_POSTINCREMENT; href.addressmode:=AM_POSTINCREMENT;
list.concat(taicpu.op_reg_ref(A_LD,reg,href)); list.concat(taicpu.op_reg_ref(GetLoad(href),reg,href));
if (href.offset<>0) or assigned(href.symbol) then if (href.offset<>0) or assigned(href.symbol) then
inc(href.offset); inc(href.offset);
href.addressmode:=AM_UNCHANGED; href.addressmode:=AM_UNCHANGED;
reg:=GetNextReg(reg); reg:=GetNextReg(reg);
list.concat(taicpu.op_reg_ref(A_LD,reg,href)); list.concat(taicpu.op_reg_ref(GetLoad(href),reg,href));
for i:=3 to tcgsize2size[tosize] do for i:=3 to tcgsize2size[tosize] do
begin begin
@ -822,18 +824,18 @@ unit cgcpu;
begin begin
if href.base<>NR_NO then if href.base<>NR_NO then
href.addressmode:=AM_POSTINCREMENT; href.addressmode:=AM_POSTINCREMENT;
list.concat(taicpu.op_reg_ref(A_LD,reg,href)); list.concat(taicpu.op_reg_ref(GetLoad(href),reg,href));
if (href.offset<>0) or assigned(href.symbol) then if (href.offset<>0) or assigned(href.symbol) then
inc(href.offset); inc(href.offset);
href.addressmode:=AM_UNCHANGED; href.addressmode:=AM_UNCHANGED;
reg:=GetNextReg(reg); reg:=GetNextReg(reg);
list.concat(taicpu.op_reg_ref(A_LD,reg,href)); list.concat(taicpu.op_reg_ref(GetLoad(href),reg,href));
tmpreg:=reg; tmpreg:=reg;
reg:=GetNextReg(reg); reg:=GetNextReg(reg);
list.concat(taicpu.op_reg(A_CLR,reg)); list.concat(taicpu.op_reg(A_CLR,reg));
list.concat(taicpu.op_reg_const(A_SBIC,tmpreg,7)); list.concat(taicpu.op_reg_const(A_SBRC,tmpreg,7));
list.concat(taicpu.op_reg(A_COM,reg)); list.concat(taicpu.op_reg(A_COM,reg));
tmpreg:=reg; tmpreg:=reg;
for i:=4 to tcgsize2size[tosize] do for i:=4 to tcgsize2size[tosize] do
@ -855,7 +857,7 @@ unit cgcpu;
else else
href.addressmode:=AM_UNCHANGED; href.addressmode:=AM_UNCHANGED;
list.concat(taicpu.op_reg_ref(A_LD,reg,href)); list.concat(taicpu.op_reg_ref(GetLoad(href),reg,href));
if (href.offset<>0) or assigned(href.symbol) then if (href.offset<>0) or assigned(href.symbol) then
inc(href.offset); inc(href.offset);
@ -898,7 +900,7 @@ unit cgcpu;
reg2:=GetNextReg(reg2); reg2:=GetNextReg(reg2);
list.concat(taicpu.op_reg(A_CLR,reg2)); list.concat(taicpu.op_reg(A_CLR,reg2));
list.concat(taicpu.op_reg_const(A_SBIC,reg1,7)); list.concat(taicpu.op_reg_const(A_SBRC,reg1,7));
list.concat(taicpu.op_reg(A_COM,reg2)); list.concat(taicpu.op_reg(A_COM,reg2));
tmpreg:=reg2; tmpreg:=reg2;
for i:=3 to tcgsize2size[tosize] do for i:=3 to tcgsize2size[tosize] do
@ -932,7 +934,7 @@ unit cgcpu;
reg2:=GetNextReg(reg2); reg2:=GetNextReg(reg2);
list.concat(taicpu.op_reg(A_CLR,reg2)); list.concat(taicpu.op_reg(A_CLR,reg2));
list.concat(taicpu.op_reg_const(A_SBIC,reg1,7)); list.concat(taicpu.op_reg_const(A_SBRC,reg1,7));
list.concat(taicpu.op_reg(A_COM,reg2)); list.concat(taicpu.op_reg(A_COM,reg2));
tmpreg:=reg2; tmpreg:=reg2;
for i:=4 to tcgsize2size[tosize] do for i:=4 to tcgsize2size[tosize] do
@ -1043,6 +1045,25 @@ unit cgcpu;
end; end;
end; end;
function tcgavr.GetLoad(const ref: treference) : tasmop;
begin
if (ref.base=NR_NO) and (ref.index=NR_NO) then
result:=A_LDS
else
result:=A_LD;
end;
function tcgavr.GetStore(const ref: treference) : tasmop;
begin
if (ref.base=NR_NO) and (ref.index=NR_NO) then
result:=A_STS
else
result:=A_ST;
end;
procedure tcgavr.g_proc_entry(list : TAsmList;localsize : longint;nostackframe:boolean); procedure tcgavr.g_proc_entry(list : TAsmList;localsize : longint;nostackframe:boolean);
var var
regs : tcpuregisterset; regs : tcpuregisterset;
@ -1177,8 +1198,8 @@ unit cgcpu;
a_load_const_reg(list,countregsize,len,countreg); a_load_const_reg(list,countregsize,len,countreg);
cg.a_label(list,l); cg.a_label(list,l);
tmpreg:=getintregister(list,copysize); tmpreg:=getintregister(list,copysize);
list.concat(taicpu.op_reg_ref(A_LD,tmpreg,srcref)); list.concat(taicpu.op_reg_ref(GetLoad(srcref),tmpreg,srcref));
list.concat(taicpu.op_ref_reg(A_ST,dstref,tmpreg)); list.concat(taicpu.op_ref_reg(GetStore(dstref),dstref,tmpreg));
a_op_const_reg(list,OP_SUB,countregsize,1,countreg); a_op_const_reg(list,OP_SUB,countregsize,1,countreg);
a_jmp_flags(list,F_NE,l); a_jmp_flags(list,F_NE,l);
end end
@ -1199,8 +1220,8 @@ unit cgcpu;
else else
dstref.addressmode:=AM_UNCHANGED; dstref.addressmode:=AM_UNCHANGED;
list.concat(taicpu.op_reg_ref(A_LD,tmpreg,srcref)); list.concat(taicpu.op_reg_ref(GetLoad(srcref),tmpreg,srcref));
list.concat(taicpu.op_ref_reg(A_ST,dstref,tmpreg)); list.concat(taicpu.op_ref_reg(GetStore(dstref),dstref,tmpreg));
if (dstref.offset<>0) or assigned(dstref.symbol) then if (dstref.offset<>0) or assigned(dstref.symbol) then
inc(dstref.offset); inc(dstref.offset);