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

* converted register_maybe_adjust_setbase() to the high level code generator

Browse Source 
git-svn-id: trunk@32591 -
This commit is contained in:
Jonas Maebe 2015-12-05 18:03:37 +00:00
parent ab22aaa2b7
commit da696057ab
9 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
compiler/arm/narmset.pas
View File

@ -105,8 +105,8 @@ implementation
begin begin
hlcg.location_force_reg(current_asmdata.CurrAsmList, left.location, hlcg.location_force_reg(current_asmdata.CurrAsmList, left.location,
left.resultdef, opdef, true); left.resultdef, opdef, true);
register_maybe_adjust_setbase(current_asmdata.CurrAsmList, left.location, register_maybe_adjust_setbase(current_asmdata.CurrAsmList, opdef,
setbase); left.location, setbase);
hlcg.location_force_reg(current_asmdata.CurrAsmList, right.location, hlcg.location_force_reg(current_asmdata.CurrAsmList, right.location,
right.resultdef, right.resultdef, true); right.resultdef, right.resultdef, true);

2
compiler/ncgadd.pas
View File

@ -350,7 +350,7 @@ interface
tmpreg:=hlcg.getintregister(current_asmdata.CurrAsmList,resultdef); tmpreg:=hlcg.getintregister(current_asmdata.CurrAsmList,resultdef);
hlcg.a_load_const_reg(current_asmdata.CurrAsmList,resultdef,mask,tmpreg); hlcg.a_load_const_reg(current_asmdata.CurrAsmList,resultdef,mask,tmpreg);
hlcg.location_force_reg(current_asmdata.CurrAsmList,right.location,right.resultdef,resultdef,true); hlcg.location_force_reg(current_asmdata.CurrAsmList,right.location,right.resultdef,resultdef,true);
register_maybe_adjust_setbase(current_asmdata.CurrAsmList,right.location,setbase); register_maybe_adjust_setbase(current_asmdata.CurrAsmList,resultdef,right.location,setbase);
hlcg.a_op_reg_reg(current_asmdata.CurrAsmList,cgop,resultdef, hlcg.a_op_reg_reg(current_asmdata.CurrAsmList,cgop,resultdef,
right.location.register,tmpreg); right.location.register,tmpreg);
if left.location.loc <> LOC_CONSTANT then if left.location.loc <> LOC_CONSTANT then

2
compiler/ncginl.pas
View File

@ -510,7 +510,7 @@ implementation
else else
begin begin
hlcg.location_force_reg(current_asmdata.CurrAsmList,elepara.location,elepara.resultdef,u32inttype,true); hlcg.location_force_reg(current_asmdata.CurrAsmList,elepara.location,elepara.resultdef,u32inttype,true);
register_maybe_adjust_setbase(current_asmdata.CurrAsmList,elepara.location,tsetdef(setpara.resultdef).setbase); register_maybe_adjust_setbase(current_asmdata.CurrAsmList,u32inttype,elepara.location,tsetdef(setpara.resultdef).setbase);
hlcg.a_bit_set_reg_loc(current_asmdata.CurrAsmList,(inlinenumber=in_include_x_y), hlcg.a_bit_set_reg_loc(current_asmdata.CurrAsmList,(inlinenumber=in_include_x_y),
u32inttype,setpara.resultdef,elepara.location.register,setpara.location); u32inttype,setpara.resultdef,elepara.location.register,setpara.location);
end; end;

6
compiler/ncgset.pas
View File

@ -194,7 +194,7 @@ implementation
begin begin
hlcg.location_force_reg(current_asmdata.CurrAsmList, left.location, hlcg.location_force_reg(current_asmdata.CurrAsmList, left.location,
left.resultdef, opdef, true); left.resultdef, opdef, true);
register_maybe_adjust_setbase(current_asmdata.CurrAsmList, left.location, register_maybe_adjust_setbase(current_asmdata.CurrAsmList, opdef, left.location,
setbase); setbase);
hlcg.a_bit_test_reg_loc_reg(current_asmdata.CurrAsmList, opdef, hlcg.a_bit_test_reg_loc_reg(current_asmdata.CurrAsmList, opdef,
right.resultdef, resultdef, left.location.register, right.location, right.resultdef, resultdef, left.location.register, right.location,
@ -395,7 +395,7 @@ implementation
{ load left in register } { load left in register }
hlcg.location_force_reg(current_asmdata.CurrAsmList,left.location,left.resultdef,uopdef,true); hlcg.location_force_reg(current_asmdata.CurrAsmList,left.location,left.resultdef,uopdef,true);
register_maybe_adjust_setbase(current_asmdata.CurrAsmList,left.location,setbase); register_maybe_adjust_setbase(current_asmdata.CurrAsmList,uopdef,left.location,setbase);
{ emit bit test operation -- warning: do not use { emit bit test operation -- warning: do not use
location_force_reg() to force a set into a register, except location_force_reg() to force a set into a register, except
to a register of the same size as the set. The reason is to a register of the same size as the set. The reason is
@ -434,7 +434,7 @@ implementation
else else
begin begin
hlcg.location_force_reg(current_asmdata.CurrAsmList,left.location,left.resultdef,opdef,true); hlcg.location_force_reg(current_asmdata.CurrAsmList,left.location,left.resultdef,opdef,true);
register_maybe_adjust_setbase(current_asmdata.CurrAsmList,left.location,setbase); register_maybe_adjust_setbase(current_asmdata.CurrAsmList,opdef,left.location,setbase);
pleftreg := left.location.register; pleftreg := left.location.register;
if (opsize >= OS_S8) or { = if signed } if (opsize >= OS_S8) or { = if signed }

10
compiler/ncgutil.pas
View File

@ -71,7 +71,7 @@ interface
set to LOC_CREGISTER/LOC_CFPUREGISTER/... } set to LOC_CREGISTER/LOC_CFPUREGISTER/... }
procedure gen_alloc_regloc(list:TAsmList;var loc: tlocation); procedure gen_alloc_regloc(list:TAsmList;var loc: tlocation);
procedure register_maybe_adjust_setbase(list: TAsmList; var l: tlocation; setbase: aint); procedure register_maybe_adjust_setbase(list: TAsmList; opdef: tdef; var l: tlocation; setbase: aint);
function has_alias_name(pd:tprocdef;const s:string):boolean; function has_alias_name(pd:tprocdef;const s:string):boolean;
@ -485,7 +485,7 @@ implementation
*****************************************************************************} *****************************************************************************}
procedure register_maybe_adjust_setbase(list: TAsmList; var l: tlocation; setbase: aint); procedure register_maybe_adjust_setbase(list: TAsmList; opdef: tdef; var l: tlocation; setbase: aint);
var var
tmpreg: tregister; tmpreg: tregister;
begin begin
@ -497,14 +497,14 @@ implementation
case l.loc of case l.loc of
LOC_CREGISTER: LOC_CREGISTER:
begin begin
tmpreg := cg.getintregister(list,l.size); tmpreg := hlcg.getintregister(list,opdef);
cg.a_op_const_reg_reg(list,OP_SUB,l.size,setbase,l.register,tmpreg); hlcg.a_op_const_reg_reg(list,OP_SUB,opdef,setbase,l.register,tmpreg);
l.loc:=LOC_REGISTER; l.loc:=LOC_REGISTER;
l.register:=tmpreg; l.register:=tmpreg;
end; end;
LOC_REGISTER: LOC_REGISTER:
begin begin
cg.a_op_const_reg(list,OP_SUB,l.size,setbase,l.register); hlcg.a_op_const_reg(list,OP_SUB,opdef,setbase,l.register);
end; end;
end; end;
end; end;

2
compiler/ppcgen/ngppcadd.pas
View File

@ -451,7 +451,7 @@ implementation
hlcg.location_force_reg(current_asmdata.CurrAsmList,right.location,right.resultdef,u32inttype,true); hlcg.location_force_reg(current_asmdata.CurrAsmList,right.location,right.resultdef,u32inttype,true);
tmpreg := cg.getintregister(current_asmdata.CurrAsmList,OS_INT); tmpreg := cg.getintregister(current_asmdata.CurrAsmList,OS_INT);
cg.a_load_const_reg(current_asmdata.CurrAsmList,OS_INT,aint((aword(1) shl (resultdef.size*8-1))),tmpreg); cg.a_load_const_reg(current_asmdata.CurrAsmList,OS_INT,aint((aword(1) shl (resultdef.size*8-1))),tmpreg);
register_maybe_adjust_setbase(current_asmdata.CurrAsmList,right.location,setbase); register_maybe_adjust_setbase(current_asmdata.CurrAsmList,u32inttype,right.location,setbase);
cg.a_op_reg_reg(current_asmdata.CurrAsmList,OP_SHR,OS_INT, cg.a_op_reg_reg(current_asmdata.CurrAsmList,OP_SHR,OS_INT,
right.location.register,tmpreg); right.location.register,tmpreg);
if left.location.loc <> LOC_CONSTANT then if left.location.loc <> LOC_CONSTANT then

2
compiler/x86/nx86add.pas
View File

@ -494,7 +494,7 @@ unit nx86add;
{ bts requires both elements to be registers } { bts requires both elements to be registers }
hlcg.location_force_reg(current_asmdata.CurrAsmList,left.location,left.resultdef,opdef,false); hlcg.location_force_reg(current_asmdata.CurrAsmList,left.location,left.resultdef,opdef,false);
hlcg.location_force_reg(current_asmdata.CurrAsmList,right.location,right.resultdef,opdef,true); hlcg.location_force_reg(current_asmdata.CurrAsmList,right.location,right.resultdef,opdef,true);
register_maybe_adjust_setbase(current_asmdata.CurrAsmList,right.location,setbase); register_maybe_adjust_setbase(current_asmdata.CurrAsmList,opdef,right.location,setbase);
op:=A_BTS; op:=A_BTS;
noswap:=true; noswap:=true;
end end

2
compiler/x86/nx86inl.pas
View File

@ -730,7 +730,7 @@ implementation
asmop:=A_BTR; asmop:=A_BTR;
hlcg.location_force_reg(current_asmdata.CurrAsmList,tcallparanode(tcallparanode(left).right).left.location,tcallparanode(tcallparanode(left).right).left.resultdef,opdef,true); hlcg.location_force_reg(current_asmdata.CurrAsmList,tcallparanode(tcallparanode(left).right).left.location,tcallparanode(tcallparanode(left).right).left.resultdef,opdef,true);
register_maybe_adjust_setbase(current_asmdata.CurrAsmList,tcallparanode(tcallparanode(left).right).left.location,setbase); register_maybe_adjust_setbase(current_asmdata.CurrAsmList,tcallparanode(tcallparanode(left).right).left.resultdef,tcallparanode(tcallparanode(left).right).left.location,setbase);
hregister:=tcallparanode(tcallparanode(left).right).left.location.register; hregister:=tcallparanode(tcallparanode(left).right).left.location.register;
if (tcallparanode(left).left.location.loc=LOC_REFERENCE) then if (tcallparanode(left).left.location.loc=LOC_REFERENCE) then
emit_reg_ref(asmop,tcgsize2opsize[opsize],hregister,tcallparanode(left).left.location.reference) emit_reg_ref(asmop,tcgsize2opsize[opsize],hregister,tcallparanode(left).left.location.reference)

12
compiler/x86/nx86set.pas
View File

@ -540,7 +540,7 @@ implementation
else else
begin begin
{$ifdef i8086} {$ifdef i8086}
register_maybe_adjust_setbase(current_asmdata.CurrAsmList,left.location,setbase); register_maybe_adjust_setbase(current_asmdata.CurrAsmList,left.resultdef,left.location,setbase);
cg.getcpuregister(current_asmdata.CurrAsmList,NR_CX); cg.getcpuregister(current_asmdata.CurrAsmList,NR_CX);
if TCGSize2Size[left.location.size] > 2 then if TCGSize2Size[left.location.size] > 2 then
left.location.size := OS_16; left.location.size := OS_16;
@ -572,7 +572,7 @@ implementation
location.resflags:=F_NE; location.resflags:=F_NE;
{$else i8086} {$else i8086}
hlcg.location_force_reg(current_asmdata.CurrAsmList,left.location,left.resultdef,u32inttype,true); hlcg.location_force_reg(current_asmdata.CurrAsmList,left.location,left.resultdef,u32inttype,true);
register_maybe_adjust_setbase(current_asmdata.CurrAsmList,left.location,setbase); register_maybe_adjust_setbase(current_asmdata.CurrAsmList,u32inttype,left.location,setbase);
if (tcgsize2size[right.location.size] < 4) or if (tcgsize2size[right.location.size] < 4) or
(right.location.loc = LOC_CONSTANT) then (right.location.loc = LOC_CONSTANT) then
hlcg.location_force_reg(current_asmdata.CurrAsmList,right.location,right.resultdef,u32inttype,true); hlcg.location_force_reg(current_asmdata.CurrAsmList,right.location,right.resultdef,u32inttype,true);
@ -610,7 +610,7 @@ implementation
(setbase<>0) then (setbase<>0) then
begin begin
hlcg.location_force_reg(current_asmdata.CurrAsmList,left.location,left.resultdef,opdef,true); hlcg.location_force_reg(current_asmdata.CurrAsmList,left.location,left.resultdef,opdef,true);
register_maybe_adjust_setbase(current_asmdata.CurrAsmList,left.location,setbase); register_maybe_adjust_setbase(current_asmdata.CurrAsmList,opdef,left.location,setbase);
end; end;
cg.getcpuregister(current_asmdata.CurrAsmList,NR_CX); cg.getcpuregister(current_asmdata.CurrAsmList,NR_CX);
@ -640,7 +640,7 @@ implementation
(setbase<>0) then (setbase<>0) then
begin begin
hlcg.location_force_reg(current_asmdata.CurrAsmList,left.location,left.resultdef,opdef,true); hlcg.location_force_reg(current_asmdata.CurrAsmList,left.location,left.resultdef,opdef,true);
register_maybe_adjust_setbase(current_asmdata.CurrAsmList,left.location,setbase); register_maybe_adjust_setbase(current_asmdata.CurrAsmList,opdef,left.location,setbase);
end; end;
case left.location.loc of case left.location.loc of
@ -707,7 +707,7 @@ implementation
begin begin
{$ifdef i8086} {$ifdef i8086}
hlcg.location_force_reg(current_asmdata.CurrAsmList,left.location,left.resultdef,opdef,false); hlcg.location_force_reg(current_asmdata.CurrAsmList,left.location,left.resultdef,opdef,false);
register_maybe_adjust_setbase(current_asmdata.CurrAsmList,left.location,setbase); register_maybe_adjust_setbase(current_asmdata.CurrAsmList,opdef,left.location,setbase);
if TCGSize2Size[left.location.size] > 2 then if TCGSize2Size[left.location.size] > 2 then
left.location.size := OS_16; left.location.size := OS_16;
@ -796,7 +796,7 @@ implementation
end; end;
{$else i8086} {$else i8086}
hlcg.location_force_reg(current_asmdata.CurrAsmList,left.location,left.resultdef,opdef,false); hlcg.location_force_reg(current_asmdata.CurrAsmList,left.location,left.resultdef,opdef,false);
register_maybe_adjust_setbase(current_asmdata.CurrAsmList,left.location,setbase); register_maybe_adjust_setbase(current_asmdata.CurrAsmList,opdef,left.location,setbase);
if (right.location.loc in [LOC_REGISTER,LOC_CREGISTER]) then if (right.location.loc in [LOC_REGISTER,LOC_CREGISTER]) then
hlcg.location_force_reg(current_asmdata.CurrAsmList,right.location,right.resultdef,opdef,true); hlcg.location_force_reg(current_asmdata.CurrAsmList,right.location,right.resultdef,opdef,true);
pleftreg:=left.location.register; pleftreg:=left.location.register;