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

* fixed several arm issues

Browse Source
This commit is contained in:
florian 2004-01-26 19:05:56 +00:00
parent 8ef2f96215
commit 35110d8ef5
5 changed files with 142 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
compiler/arm/aasmcpu.pas
View File

@ -95,7 +95,7 @@ uses
implementation implementation
uses uses
cutils,rgobj; cutils,rgobj,itcpugas;
procedure taicpu.loadshifterop(opidx:longint;const so:tshifterop); procedure taicpu.loadshifterop(opidx:longint;const so:tshifterop);
@ -313,13 +313,13 @@ implementation
function taicpu.spilling_create_load(const ref:treference;r:tregister): tai; function taicpu.spilling_create_load(const ref:treference;r:tregister): tai;
begin begin
result:=taicpu.op_reg_ref(A_LDR,r,ref); internalerror(200401261);
end; end;
function taicpu.spilling_create_store(r:tregister; const ref:treference): tai; function taicpu.spilling_create_store(r:tregister; const ref:treference): tai;
begin begin
result:=taicpu.op_reg_ref(A_STR,r,ref); internalerror(200401262);
end; end;
@ -427,7 +427,10 @@ implementation
end. end.
{ {
$Log$ $Log$
Revision 1.24 2004-01-24 20:19:46 florian Revision 1.25 2004-01-26 19:05:56 florian
* fixed several arm issues
Revision 1.24 2004/01/24 20:19:46 florian
* fixed some spilling stuff * fixed some spilling stuff
+ not(<int64>) implemented + not(<int64>) implemented
+ small set comparisations implemented + small set comparisations implemented

42
compiler/arm/cgcpu.pas
View File

@ -369,24 +369,17 @@ unit cgcpu;
if dst=src2 then if dst=src2 then
begin begin
if dst<>src1 then if dst<>src1 then
begin list.concat(taicpu.op_reg_reg_reg(A_MUL,dst,src1,src2))
rg[R_INTREGISTER].add_edge(getsupreg(dst),getsupreg(src1));
list.concat(taicpu.op_reg_reg_reg(A_MUL,dst,src1,src2));
end
else else
begin begin
tmpreg:=getintregister(list,size); tmpreg:=getintregister(list,size);
a_load_reg_reg(list,size,size,src2,dst); a_load_reg_reg(list,size,size,src2,dst);
rg[R_INTREGISTER].add_edge(getsupreg(dst),getsupreg(tmpreg));
ungetregister(list,tmpreg); ungetregister(list,tmpreg);
list.concat(taicpu.op_reg_reg_reg(A_MUL,dst,tmpreg,src1)); list.concat(taicpu.op_reg_reg_reg(A_MUL,dst,tmpreg,src1));
end; end;
end end
else else
begin list.concat(taicpu.op_reg_reg_reg(A_MUL,dst,src2,src1));
rg[R_INTREGISTER].add_edge(getsupreg(dst),getsupreg(src2));
list.concat(taicpu.op_reg_reg_reg(A_MUL,dst,src2,src1));
end;
end; end;
else else
list.concat(setoppostfix(taicpu.op_reg_reg_reg(op_reg_reg_opcg2asmop[op],dst,src2,src1),toppostfix(ord(setflags)*ord(PF_S)))); list.concat(setoppostfix(taicpu.op_reg_reg_reg(op_reg_reg_opcg2asmop[op],dst,src2,src1),toppostfix(ord(setflags)*ord(PF_S))));
@ -718,7 +711,7 @@ unit cgcpu;
end; end;
{ comparison operations } { comparison operations }
procedure tcgarm.a_cmp_const_reg_label(list : taasmoutput;size : tcgsize;cmp_op : topcmp;a : aword;reg : tregister; procedure tcgarm.a_cmp_const_reg_label(list : taasmoutput;size : tcgsize;cmp_op : topcmp;a : aword;reg : tregister;
l : tasmlabel); l : tasmlabel);
var var
@ -749,20 +742,20 @@ unit cgcpu;
end; end;
procedure tcgarm.a_jmp_always(list : taasmoutput;l: tasmlabel); procedure tcgarm.a_jmp_always(list : taasmoutput;l: tasmlabel);
begin begin
list.concat(taicpu.op_sym(A_B,objectlibrary.newasmsymbol(l.name))); list.concat(taicpu.op_sym(A_B,objectlibrary.newasmsymbol(l.name)));
end; end;
procedure tcgarm.a_jmp_flags(list : taasmoutput;const f : TResFlags;l: tasmlabel); procedure tcgarm.a_jmp_flags(list : taasmoutput;const f : TResFlags;l: tasmlabel);
var var
ai : taicpu; ai : taicpu;
begin begin
ai:=setcondition(taicpu.op_sym(A_B,l),flags_to_cond(f)); ai:=setcondition(taicpu.op_sym(A_B,l),flags_to_cond(f));
ai.is_jmp:=true; ai.is_jmp:=true;
list.concat(ai); list.concat(ai);
end; end;
procedure tcgarm.g_flags2reg(list: taasmoutput; size: TCgSize; const f: TResFlags; reg: TRegister); procedure tcgarm.g_flags2reg(list: taasmoutput; size: TCgSize; const f: TResFlags; reg: TRegister);
@ -1228,7 +1221,10 @@ begin
end. end.
{ {
$Log$ $Log$
Revision 1.39 2004-01-24 20:19:46 florian Revision 1.40 2004-01-26 19:05:56 florian
* fixed several arm issues
Revision 1.39 2004/01/24 20:19:46 florian
* fixed some spilling stuff * fixed some spilling stuff
+ not(<int64>) implemented + not(<int64>) implemented
+ small set comparisations implemented + small set comparisations implemented

27
compiler/arm/narmadd.pas
View File

@ -281,12 +281,24 @@ interface
exprasmlist.concat(setoppostfix(taicpu.op_reg_reg_reg(A_SUB,tmpreg,right.location.register64.reglo,left.location.register64.reglo),PF_S)); exprasmlist.concat(setoppostfix(taicpu.op_reg_reg_reg(A_SUB,tmpreg,right.location.register64.reglo,left.location.register64.reglo),PF_S));
exprasmlist.concat(setoppostfix(taicpu.op_reg_reg_reg(A_SBC,tmpreg,right.location.register64.reghi,left.location.register64.reghi),PF_S)); exprasmlist.concat(setoppostfix(taicpu.op_reg_reg_reg(A_SBC,tmpreg,right.location.register64.reghi,left.location.register64.reghi),PF_S));
cg.ungetregister(exprasmlist,tmpreg); cg.ungetregister(exprasmlist,tmpreg);
if location.resflags=F_GT then if nf_swaped in flags then
location.resflags:=F_LT begin
else if location.resflags=F_LE then if location.resflags=F_LT then
location.resflags:=F_GE location.resflags:=F_GT
else if location.resflags=F_GE then
location.resflags:=F_LE
else
internalerror(200401221);
end
else else
internalerror(200401221); begin
if location.resflags=F_GT then
location.resflags:=F_LT
else if location.resflags=F_LE then
location.resflags:=F_GE
else
internalerror(200401221);
end;
end; end;
release_reg_left_right; release_reg_left_right;
@ -332,7 +344,10 @@ begin
end. end.
{ {
$Log$ $Log$
Revision 1.10 2004-01-24 20:19:46 florian Revision 1.11 2004-01-26 19:05:56 florian
* fixed several arm issues
Revision 1.10 2004/01/24 20:19:46 florian
* fixed some spilling stuff * fixed some spilling stuff
+ not(<int64>) implemented + not(<int64>) implemented
+ small set comparisations implemented + small set comparisations implemented

131
compiler/arm/rgcpu.pas
View File

@ -36,68 +36,115 @@ unit rgcpu;
type type
trgcpu = class(trgobj) trgcpu = class(trgobj)
{ procedure add_cpu_interferences(p : tai);override;
function getexplicitregisterfpu(list : taasmoutput; r : Toldregister) : tregister;override; procedure DoSpillRead(list : taasmoutput;instr : taicpu_abstract;pos: tai; regidx: longint;
procedure ungetregisterfpu(list: taasmoutput; r : tregister; size:TCGsize);override; const spilltemplist:Tspill_temp_list;const regs : tspillregsinfo);override;
procedure cleartempgen; override; procedure DoSpillWritten(list : taasmoutput;instr : taicpu_abstract;pos: tai; regidx: longint;
private const spilltemplist:Tspill_temp_list;const regs : tspillregsinfo);override;
usedpararegs: Tsupregset; procedure DoSpillReadWritten(list : taasmoutput;instr : taicpu_abstract;pos: tai; regidx: longint;
usedparafpuregs: tregisterset; const spilltemplist:Tspill_temp_list;const regs : tspillregsinfo);override;
}
end; end;
implementation implementation
uses uses
cgobj, verbose, cutils; cgobj, verbose, cutils,
aasmcpu;
{
function trgcpu.getexplicitregisterfpu(list : taasmoutput; r : Toldregister) : tregister; procedure trgcpu.add_cpu_interferences(p : tai);
begin begin
if (r in [R_F0..R_F3]) and if p.typ=ait_instruction then
not is_reg_var_other[r] then
begin begin
if r in usedparafpuregs then if (taicpu(p).opcode=A_MUL) then
internalerror(2003060902); add_edge(getsupreg(taicpu(p).oper[0]^.reg),getsupreg(taicpu(p).oper[1]^.reg));
include(usedparafpuregs,r); end;
result.enum := r;
cg.a_reg_alloc(list,result);
end
else
result:=inherited getexplicitregisterfpu(list,r);
end; end;
procedure trgcpu.ungetregisterfpu(list: taasmoutput; r : tregister; size:TCGsize); procedure trgcpu.DoSpillRead(list : taasmoutput;instr : taicpu_abstract;pos: tai; regidx: longint;
const spilltemplist:Tspill_temp_list;const regs : tspillregsinfo);
var
helpins: tai;
ref : treference;
begin begin
if (r.enum in [R_F0..R_F3]) and ref:=spilltemplist[regs[regidx].orgreg];
not is_reg_var_other[r.enum] then helpins:=taicpu.op_reg_ref(A_LDR,regs[regidx].tempreg,ref);
if pos=nil then
list.insertafter(helpins,list.first)
else
list.insertafter(helpins,pos.next);
ungetregisterinline(list,instr,regs[regidx].tempreg);
forward_allocation(tai(helpins.next),instr);
end;
procedure trgcpu.DoSpillWritten(list : taasmoutput;instr : taicpu_abstract;pos: tai; regidx: longint;
const spilltemplist:Tspill_temp_list;const regs : tspillregsinfo);
var
helpins: tai;
ref : treference;
begin
ref:=spilltemplist[regs[regidx].orgreg];
helpins:=taicpu.op_reg_ref(A_STR,regs[regidx].tempreg,ref);
list.insertafter(helpins,instr);
ungetregisterinline(list,helpins,regs[regidx].tempreg);
end;
procedure trgcpu.DoSpillReadWritten(list : taasmoutput;instr : taicpu_abstract;pos: tai; regidx: longint;
const spilltemplist:Tspill_temp_list;const regs : tspillregsinfo);
var
helpins1, helpins2: tai;
tmpref,ref : treference;
tmpreg : tregister;
begin
ref:=spilltemplist[regs[regidx].orgreg];
{
if abs(ref.offset)>4095 then
begin begin
if not(r.enum in usedparafpuregs) then reference_reset(tmpref);
internalerror(2003060903); { create consts entry }
exclude(usedparafpuregs,r.enum); objectlibrary.getlabel(l);
cg.a_reg_dealloc(list,r); cg.a_label(current_procinfo.aktlocaldata,l);
end tmpref.symboldata:=current_procinfo.aktlocaldata.last;
current_procinfo.aktlocaldata.concat(tai_const.Create_32bit(ref.offset));
{ load consts entry }
getregisterinline(list,pos,defaultsub,tmpreg);
tmpref.symbol:=l;
tmpref.base:=NR_R15;
list.concat(taicpu.op_reg_ref(A_LDR,tmpreg,tmpref));
if ref.index<>NR_NO then
internalerror(200401263);
ref.index:=tmpreg;
ref.offset:=0;
end;
}
helpins1:=taicpu.op_reg_ref(A_LDR,regs[regidx].tempreg,ref);
if pos=nil then
list.insertafter(helpins1,list.first)
else else
inherited ungetregisterfpu(list,r,size); list.insertafter(helpins1,pos.next);
ref:=spilltemplist[regs[regidx].orgreg];
ref.symboldata:=nil;
helpins2:=taicpu.op_reg_ref(A_STR,regs[regidx].tempreg,ref);
list.insertafter(helpins2,instr);
ungetregisterinline(list,helpins2,regs[regidx].tempreg);
forward_allocation(tai(helpins1.next),instr);
end; end;
procedure trgcpu.cleartempgen;
begin
inherited cleartempgen;
usedpararegs := [];
usedparafpuregs := [];
end;
}
end. end.
{ {
$Log$ $Log$
Revision 1.5 2003-11-02 14:30:03 florian Revision 1.6 2004-01-26 19:05:56 florian
* fixed several arm issues
Revision 1.5 2003/11/02 14:30:03 florian
* fixed ARM for new reg. allocation scheme * fixed ARM for new reg. allocation scheme
Revision 1.4 2003/09/11 11:55:00 florian Revision 1.4 2003/09/11 11:55:00 florian

9
compiler/systems/i_linux.pas
View File

@ -457,9 +457,9 @@ unit i_linux;
constalignmax : 4; constalignmax : 4;
varalignmin : 0; varalignmin : 0;
varalignmax : 4; varalignmax : 4;
localalignmin : 4; localalignmin : 0;
localalignmax : 4; localalignmax : 4;
recordalignmin : 4; recordalignmin : 0;
recordalignmax : 4; recordalignmax : 4;
maxCrecordalign : 4 maxCrecordalign : 4
); );
@ -514,7 +514,10 @@ initialization
end. end.
{ {
$Log$ $Log$
Revision 1.20 2004-01-12 22:11:39 peter Revision 1.21 2004-01-26 19:05:56 florian
* fixed several arm issues
Revision 1.20 2004/01/12 22:11:39 peter
* use localalign info for alignment for locals and temps * use localalign info for alignment for locals and temps
* sparc fpu flags branching added * sparc fpu flags branching added
* moved powerpc copy_valye_openarray to generic * moved powerpc copy_valye_openarray to generic