* fixed generic tcgvecnode

* move code that updates a reference with index register and multiplier
    to separate method so it can be overriden for scaled indexing
  * i386 uses generic tcgvecnode
This commit is contained in:
peter 2002-09-01 18:46:01 +00:00
parent d2400aae38
commit 76bd75ed4a
2 changed files with 142 additions and 494 deletions

View File

@ -27,6 +27,7 @@ unit n386mem;
interface
uses
cpuinfo,cpubase,
node,nmem,ncgmem;
type
@ -39,6 +40,7 @@ interface
end;
ti386vecnode = class(tcgvecnode)
procedure update_reference_reg_mul(reg:tregister;l:aword);override;
procedure pass_2;override;
end;
@ -54,7 +56,6 @@ implementation
aasmbase,aasmtai,aasmcpu,
cginfo,cgbase,pass_2,
pass_1,nld,ncon,nadd,
cpubase,
cgobj,cga,tgobj,rgobj,ncgutil;
{*****************************************************************************
@ -99,404 +100,52 @@ implementation
TI386VECNODE
*****************************************************************************}
procedure ti386vecnode.pass_2;
procedure calc_emit_mul;
var
l1,l2 : longint;
procedure ti386vecnode.update_reference_reg_mul(reg:tregister;l:aword);
var
l2 : integer;
begin
{ Optimized for x86 to use the index register and scalefactor }
if location.reference.index=R_NO then
begin
l1:=get_mul_size;
case l1 of
1,2,4,8 : location.reference.scalefactor:=l1;
else
begin
if ispowerof2(l1,l2) then
emit_const_reg(A_SHL,S_L,l2,right.location.register)
else
emit_const_reg(A_IMUL,S_L,l1,right.location.register);
end;
{ no preparations needed }
end
else if location.reference.base=R_NO then
begin
case location.reference.scalefactor of
2 : cg.a_op_const_reg(exprasmlist,OP_SHL,1,location.reference.index);
4 : cg.a_op_const_reg(exprasmlist,OP_SHL,2,location.reference.index);
8 : cg.a_op_const_reg(exprasmlist,OP_SHL,3,location.reference.index);
end;
location.reference.base:=location.reference.index;
end
else
begin
cg.a_loadaddr_ref_reg(exprasmlist,location.reference,location.reference.base);
rg.ungetregisterint(exprasmlist,location.reference.index);
reference_reset_base(location.reference,location.reference.base,0);
end;
var
extraoffset : longint;
{ rl stores the resulttype.def of the left node, this is necessary }
{ to detect if it is an ansistring }
{ because in constant nodes which constant index }
{ the left tree is removed }
t : tnode;
href : treference;
srsym : tsym;
pushed : tpushedsaved;
hightree : tnode;
isjump : boolean;
otl,ofl : tasmlabel;
newsize : tcgsize;
pushedregs : tmaybesave;
begin
newsize:=def_cgsize(resulttype.def);
location_reset(location,LOC_REFERENCE,newsize);
secondpass(left);
{ we load the array reference to location }
{ an ansistring needs to be dereferenced }
if is_ansistring(left.resulttype.def) or
is_widestring(left.resulttype.def) then
begin
if nf_callunique in flags then
begin
if left.location.loc<>LOC_REFERENCE then
begin
CGMessage(cg_e_illegal_expression);
exit;
end;
rg.saveusedregisters(exprasmlist,pushed,all_registers);
cg.a_paramaddr_ref(exprasmlist,left.location.reference,paramanager.getintparaloc(1));
rg.saveregvars(exprasmlist,all_registers);
cg.a_call_name(exprasmlist,'FPC_'+Upper(tstringdef(left.resulttype.def).stringtypname)+'_UNIQUE');
cg.g_maybe_loadself(exprasmlist);
rg.restoreusedregisters(exprasmlist,pushed);
end;
case left.location.loc of
LOC_REGISTER,
LOC_CREGISTER :
location.reference.base:=left.location.register;
LOC_CREFERENCE,
LOC_REFERENCE :
begin
location_release(exprasmlist,left.location);
location.reference.base:=rg.getregisterint(exprasmlist);
cg.a_load_ref_reg(exprasmlist,OS_ADDR,left.location.reference,location.reference.base);
end;
else
internalerror(2002032218);
end;
{ check for a zero length string,
we can use the ansistring routine here }
if (cs_check_range in aktlocalswitches) then
begin
rg.saveusedregisters(exprasmlist,pushed,all_registers);
cg.a_param_reg(exprasmlist,OS_ADDR,location.reference.base,paramanager.getintparaloc(1));
rg.saveregvars(exprasmlist,all_registers);
cg.a_call_name(exprasmlist,'FPC_'+Upper(tstringdef(left.resulttype.def).stringtypname)+'_CHECKZERO');
cg.g_maybe_loadself(exprasmlist);
rg.restoreusedregisters(exprasmlist,pushed);
end;
{ in ansistrings/widestrings S[1] is p<w>char(S)[0] !! }
if is_ansistring(left.resulttype.def) then
dec(location.reference.offset)
else
dec(location.reference.offset,2);
{ we've also to keep left up-to-date, because it is used }
{ if a constant array index occurs, subject to change (FK) }
location_copy(left.location,location);
end
else if is_dynamic_array(left.resulttype.def) then
{ ... also a dynamic string }
begin
case left.location.loc of
LOC_REGISTER,
LOC_CREGISTER :
location.reference.base:=left.location.register;
LOC_REFERENCE,
LOC_CREFERENCE :
begin
location_release(exprasmlist,left.location);
location.reference.base:=rg.getregisterint(exprasmlist);
emit_ref_reg(A_MOV,S_L,
left.location.reference,location.reference.base);
end;
else
internalerror(2002032219);
end;
{$warning FIXME}
{ check for a zero length string,
we can use the ansistring routine here }
if (cs_check_range in aktlocalswitches) then
begin
rg.saveusedregisters(exprasmlist,pushed,all_registers);
emit_reg(A_PUSH,S_L,location.reference.base);
rg.saveregvars(exprasmlist,all_registers);
cg.a_call_name(exprasmlist,'FPC_ANSISTR_CHECKZERO');
cg.g_maybe_loadself(exprasmlist);
rg.restoreusedregisters(exprasmlist,pushed);
end;
{ we've also to keep left up-to-date, because it is used }
{ if a constant array index occurs, subject to change (FK) }
location_copy(left.location,location);
end
{ insert the new index register and scalefactor or
do the multiplication manual }
case l of
1,2,4,8 : location.reference.scalefactor:=l;
else
location_copy(location,left.location);
{ offset can only differ from 0 if arraydef }
if (left.resulttype.def.deftype=arraydef) and
not(is_dynamic_array(left.resulttype.def)) then
dec(location.reference.offset,
get_mul_size*tarraydef(left.resulttype.def).lowrange);
if right.nodetype=ordconstn then
begin
{ offset can only differ from 0 if arraydef }
if (left.resulttype.def.deftype=arraydef) then
begin
if not(is_open_array(left.resulttype.def)) and
not(is_array_of_const(left.resulttype.def)) and
not(is_dynamic_array(left.resulttype.def)) then
begin
if (tordconstnode(right).value>tarraydef(left.resulttype.def).highrange) or
(tordconstnode(right).value<tarraydef(left.resulttype.def).lowrange) then
begin
if (cs_check_range in aktlocalswitches) then
CGMessage(parser_e_range_check_error)
else
CGMessage(parser_w_range_check_error);
end;
dec(left.location.reference.offset,
get_mul_size*tarraydef(left.resulttype.def).lowrange);
end
else
begin
{ range checking for open and dynamic arrays !!!! }
{$warning FIXME}
{!!!!!!!!!!!!!!!!!}
end;
end
else if (left.resulttype.def.deftype=stringdef) then
begin
if (tordconstnode(right).value=0) and
not(is_shortstring(left.resulttype.def)) then
CGMessage(cg_e_can_access_element_zero);
if (cs_check_range in aktlocalswitches) then
begin
case tstringdef(left.resulttype.def).string_typ of
{ it's the same for ansi- and wide strings }
st_widestring,
st_ansistring:
begin
rg.saveusedregisters(exprasmlist,pushed,all_registers);
cg.a_param_const(exprasmlist,OS_INT,tordconstnode(right).value,paramanager.getintparaloc(2));
href:=location.reference;
dec(href.offset,7);
cg.a_param_ref(exprasmlist,OS_INT,href,paramanager.getintparaloc(1));
rg.saveregvars(exprasmlist,all_registers);
cg.a_call_name(exprasmlist,'FPC_'+Upper(tstringdef(left.resulttype.def).stringtypname)+'_RANGECHECK');
rg.restoreusedregisters(exprasmlist,pushed);
cg.g_maybe_loadself(exprasmlist);
end;
st_shortstring:
begin
{!!!!!!!!!!!!!!!!!}
end;
st_longstring:
begin
{!!!!!!!!!!!!!!!!!}
end;
end;
end;
end;
inc(left.location.reference.offset,
get_mul_size*tordconstnode(right).value);
if nf_memseg in flags then
left.location.reference.segment:=R_FS;
location_copy(location,left.location);
end
else
{ not nodetype=ordconstn }
begin
if (cs_regalloc in aktglobalswitches) and
{ if we do range checking, we don't }
{ need that fancy code (it would be }
{ buggy) }
not(cs_check_range in aktlocalswitches) and
(left.resulttype.def.deftype=arraydef) then
begin
extraoffset:=0;
if (right.nodetype=addn) then
begin
if taddnode(right).right.nodetype=ordconstn then
begin
extraoffset:=tordconstnode(taddnode(right).right).value;
t:=taddnode(right).left;
{ First pass processed this with the assumption }
{ that there was an add node which may require an }
{ extra register. Fake it or die with IE10 (JM) }
t.registers32 := taddnode(right).registers32;
taddnode(right).left:=nil;
right.free;
right:=t;
end
else if taddnode(right).left.nodetype=ordconstn then
begin
extraoffset:=tordconstnode(taddnode(right).left).value;
t:=taddnode(right).right;
t.registers32 := right.registers32;
taddnode(right).right:=nil;
right.free;
right:=t;
end;
end
else if (right.nodetype=subn) then
begin
if taddnode(right).right.nodetype=ordconstn then
begin
{ this was "extraoffset:=right.right.value;" Looks a bit like
copy-paste bug :) (JM) }
extraoffset:=-tordconstnode(taddnode(right).right).value;
t:=taddnode(right).left;
t.registers32 := right.registers32;
taddnode(right).left:=nil;
right.free;
right:=t;
end
{ You also have to negate right.right in this case! I can't add an
unaryminusn without causing a crash, so I've disabled it (JM)
else if right.left.nodetype=ordconstn then
begin
extraoffset:=right.left.value;
t:=right.right;
t^.registers32 := right.registers32;
putnode(right);
putnode(right.left);
right:=t;
end;}
end;
inc(location.reference.offset,
get_mul_size*extraoffset);
end;
{ calculate from left to right }
if not(location.loc in [LOC_CREFERENCE,LOC_REFERENCE]) then
CGMessage(cg_e_illegal_expression);
isjump:=(right.location.loc=LOC_JUMP);
if isjump then
begin
otl:=truelabel;
objectlibrary.getlabel(truelabel);
ofl:=falselabel;
objectlibrary.getlabel(falselabel);
end;
maybe_save(exprasmlist,right.registers32,location,pushedregs);
secondpass(right);
maybe_restore(exprasmlist,location,pushedregs);
{ here we change the location of right
and the update was forgotten so it
led to wrong code in emitrangecheck later PM
so make range check before }
if cs_check_range in aktlocalswitches then
begin
if left.resulttype.def.deftype=arraydef then
begin
if is_open_array(left.resulttype.def) or
is_array_of_const(left.resulttype.def) then
begin
tarraydef(left.resulttype.def).genrangecheck;
srsym:=searchsymonlyin(tloadnode(left).symtable,
'high'+tvarsym(tloadnode(left).symtableentry).name);
hightree:=cloadnode.create(tvarsym(srsym),tloadnode(left).symtable);
firstpass(hightree);
secondpass(hightree);
location_release(exprasmlist,hightree.location);
reference_reset_symbol(href,objectlibrary.newasmsymbol(tarraydef(left.resulttype.def).getrangecheckstring),4);
cg.a_load_loc_ref(exprasmlist,hightree.location,href);
hightree.free;
hightree:=nil;
end;
cg.g_rangecheck(exprasmlist,right,left.resulttype.def);
end;
end;
location_force_reg(exprasmlist,right.location,OS_32,false);
if isjump then
begin
truelabel:=otl;
falselabel:=ofl;
end;
{ produce possible range check code: }
if cs_check_range in aktlocalswitches then
begin
if left.resulttype.def.deftype=arraydef then
begin
{ done defore (PM) }
end
else if (left.resulttype.def.deftype=stringdef) then
begin
case tstringdef(left.resulttype.def).string_typ of
{ it's the same for ansi- and wide strings }
st_widestring,
st_ansistring:
begin
rg.saveusedregisters(exprasmlist,pushed,all_registers);
cg.a_param_reg(exprasmlist,OS_INT,right.location.register,paramanager.getintparaloc(1));
href:=location.reference;
dec(href.offset,7);
cg.a_param_ref(exprasmlist,OS_INT,href,paramanager.getintparaloc(1));
rg.saveregvars(exprasmlist,all_registers);
cg.a_call_name(exprasmlist,'FPC_'+Upper(tstringdef(left.resulttype.def).stringtypname)+'_RANGECHECK');
rg.restoreusedregisters(exprasmlist,pushed);
cg.g_maybe_loadself(exprasmlist);
end;
st_shortstring:
begin
{!!!!!!!!!!!!!!!!!}
end;
st_longstring:
begin
{!!!!!!!!!!!!!!!!!}
end;
end;
end;
end;
if location.reference.index=R_NO then
begin
location.reference.index:=right.location.register;
calc_emit_mul;
end
if ispowerof2(l,l2) then
cg.a_op_const_reg(exprasmlist,OP_SHL,l2,reg)
else
begin
if location.reference.base=R_NO then
begin
case location.reference.scalefactor of
2 : emit_const_reg(A_SHL,S_L,1,location.reference.index);
4 : emit_const_reg(A_SHL,S_L,2,location.reference.index);
8 : emit_const_reg(A_SHL,S_L,3,location.reference.index);
end;
calc_emit_mul;
location.reference.base:=location.reference.index;
location.reference.index:=right.location.register;
end
else
begin
emit_ref_reg(A_LEA,S_L,location.reference,location.reference.index);
rg.ungetregisterint(exprasmlist,location.reference.base);
{ the symbol offset is loaded, }
{ so release the symbol name and set symbol }
{ to nil }
location.reference.symbol:=nil;
location.reference.offset:=0;
calc_emit_mul;
location.reference.base:=location.reference.index;
location.reference.index:=right.location.register;
end;
end;
if nf_memseg in flags then
location.reference.segment:=R_FS;
cg.a_op_const_reg(exprasmlist,OP_IMUL,l,reg);
end;
end;
location.reference.index:=reg;
end;
location.size:=newsize;
procedure ti386vecnode.pass_2;
begin
inherited pass_2;
if nf_memseg in flags then
location.reference.segment:=R_FS;
end;
@ -507,7 +156,13 @@ begin
end.
{
$Log$
Revision 1.41 2002-08-11 14:32:30 peter
Revision 1.42 2002-09-01 18:46:01 peter
* fixed generic tcgvecnode
* move code that updates a reference with index register and multiplier
to separate method so it can be overriden for scaled indexing
* i386 uses generic tcgvecnode
Revision 1.41 2002/08/11 14:32:30 peter
* renamed current_library to objectlibrary
Revision 1.40 2002/08/11 13:24:17 peter

View File

@ -30,7 +30,8 @@ unit ncgmem;
interface
uses
node,nmem,cpuinfo;
cpuinfo,cpubase,
node,nmem;
type
tcgloadvmtnode = class(tloadvmtnode)
@ -70,9 +71,12 @@ interface
end;
tcgvecnode = class(tvecnode)
protected
function get_mul_size : aword;
procedure update_reference_reg_mul(reg:tregister;l:aword);virtual;
procedure second_wideansistring;virtual;
procedure second_dynamicarray;virtual;
public
procedure pass_2;override;
end;
@ -92,7 +96,6 @@ implementation
aasmbase,aasmtai,aasmcpu,
cginfo,cgbase,pass_2,
pass_1,nld,ncon,nadd,
cpubase,
cgobj,tgobj,rgobj,ncgutil,symbase
;
@ -478,6 +481,31 @@ implementation
end
end;
procedure tcgvecnode.update_reference_reg_mul(reg:tregister;l:aword);
begin
if location.reference.base=R_NO then
begin
cg.a_op_const_reg(exprasmlist,OP_IMUL,l,reg);
location.reference.base:=reg;
end
else if location.reference.index=R_NO then
begin
cg.a_op_const_reg(exprasmlist,OP_IMUL,l,reg);
location.reference.index:=reg;
end
else
begin
cg.a_loadaddr_ref_reg(exprasmlist,location.reference,location.reference.index);
rg.ungetregisterint(exprasmlist,location.reference.base);
reference_reset_base(location.reference,location.reference.index,0);
{ insert new index register }
cg.a_op_const_reg(exprasmlist,OP_IMUL,l,reg);
location.reference.index:=reg;
end;
end;
procedure tcgvecnode.second_wideansistring;
begin
end;
@ -561,10 +589,6 @@ implementation
dec(location.reference.offset)
else
dec(location.reference.offset,2);
{ we've also to keep left up-to-date, because it is used }
{ if a constant array index occurs, subject to change (FK) }
location_copy(left.location,location);
end
else if is_dynamic_array(left.resulttype.def) then
{ ... also a dynamic string }
@ -597,88 +621,77 @@ implementation
cg.g_maybe_loadself(exprasmlist);
rg.restoreusedregisters(exprasmlist,pushed);
end;
{ we've also to keep left up-to-date, because it is used }
{ if a constant array index occurs, subject to change (FK) }
location_copy(left.location,location);
end
else
location_copy(location,left.location);
{ offset can only differ from 0 if arraydef }
if (left.resulttype.def.deftype=arraydef) and
not(is_dynamic_array(left.resulttype.def)) then
dec(location.reference.offset,
get_mul_size*tarraydef(left.resulttype.def).lowrange);
not(is_dynamic_array(left.resulttype.def)) then
dec(location.reference.offset,get_mul_size*tarraydef(left.resulttype.def).lowrange);
if right.nodetype=ordconstn then
begin
{ offset can only differ from 0 if arraydef }
if (left.resulttype.def.deftype=arraydef) then
begin
if not(is_open_array(left.resulttype.def)) and
not(is_array_of_const(left.resulttype.def)) and
not(is_dynamic_array(left.resulttype.def)) then
begin
if (tordconstnode(right).value>tarraydef(left.resulttype.def).highrange) or
(tordconstnode(right).value<tarraydef(left.resulttype.def).lowrange) then
begin
{ this should be caught in the resulttypepass! (JM) }
case left.resulttype.def.deftype of
arraydef :
begin
if not(is_open_array(left.resulttype.def)) and
not(is_array_of_const(left.resulttype.def)) and
not(is_dynamic_array(left.resulttype.def)) then
begin
if (tordconstnode(right).value>tarraydef(left.resulttype.def).highrange) or
(tordconstnode(right).value<tarraydef(left.resulttype.def).lowrange) then
begin
{ this should be caught in the resulttypepass! (JM) }
if (cs_check_range in aktlocalswitches) then
CGMessage(parser_e_range_check_error)
else
CGMessage(parser_w_range_check_error);
end;
dec(left.location.reference.offset,
get_mul_size*tarraydef(left.resulttype.def).lowrange);
end
else
begin
{ range checking for open and dynamic arrays !!!! }
end;
end
else
begin
{ range checking for open and dynamic arrays !!!! }
{$warning FIXME}
{!!!!!!!!!!!!!!!!!}
{!!!!!!!!!!!!!!!!!}
end;
end;
stringdef :
begin
if (cs_check_range in aktlocalswitches) then
begin
case tstringdef(left.resulttype.def).string_typ of
{ it's the same for ansi- and wide strings }
st_widestring,
st_ansistring:
begin
rg.saveusedregisters(exprasmlist,pushed,all_registers);
cg.a_param_const(exprasmlist,OS_INT,tordconstnode(right).value,paramanager.getintparaloc(2));
href:=location.reference;
dec(href.offset,7);
cg.a_param_ref(exprasmlist,OS_INT,href,paramanager.getintparaloc(1));
rg.saveregvars(exprasmlist,all_registers);
cg.a_call_name(exprasmlist,'FPC_'+Upper(tstringdef(left.resulttype.def).stringtypname)+'_RANGECHECK');
rg.restoreusedregisters(exprasmlist,pushed);
cg.g_maybe_loadself(exprasmlist);
end;
st_shortstring:
begin
{!!!!!!!!!!!!!!!!!}
end;
st_longstring:
begin
{!!!!!!!!!!!!!!!!!}
end;
end;
end;
end
else if (left.resulttype.def.deftype=stringdef) then
begin
if (tordconstnode(right).value=0) and
not(is_shortstring(left.resulttype.def)) then
{ this should be caught in the resulttypepass! (JM) }
CGMessage(cg_e_can_access_element_zero);
if (cs_check_range in aktlocalswitches) then
begin
case tstringdef(left.resulttype.def).string_typ of
{ it's the same for ansi- and wide strings }
st_widestring,
st_ansistring:
begin
rg.saveusedregisters(exprasmlist,pushed,all_registers);
cg.a_param_const(exprasmlist,OS_INT,tordconstnode(right).value,paramanager.getintparaloc(2));
href:=location.reference;
dec(href.offset,7);
cg.a_param_ref(exprasmlist,OS_INT,href,paramanager.getintparaloc(1));
rg.saveregvars(exprasmlist,all_registers);
cg.a_call_name(exprasmlist,'FPC_'+Upper(tstringdef(left.resulttype.def).stringtypname)+'_RANGECHECK');
rg.restoreusedregisters(exprasmlist,pushed);
cg.g_maybe_loadself(exprasmlist);
end;
st_shortstring:
begin
{!!!!!!!!!!!!!!!!!}
end;
st_longstring:
begin
{!!!!!!!!!!!!!!!!!}
end;
end;
end;
end;
inc(left.location.reference.offset,
end;
end;
inc(location.reference.offset,
get_mul_size*tordconstnode(right).value);
location_copy(location,left.location);
end
else
{ not nodetype=ordconstn }
@ -719,8 +732,6 @@ implementation
begin
if taddnode(right).right.nodetype=ordconstn then
begin
{ this was "extraoffset:=right.right.value;" Looks a bit like
copy-paste bug :) (JM) }
extraoffset:=-tordconstnode(taddnode(right).right).value;
t:=taddnode(right).left;
t.registers32 := right.registers32;
@ -830,33 +841,9 @@ implementation
end;
end;
if location.reference.base=R_NO then
begin
location.reference.base:=right.location.register;
cg.a_op_const_reg(exprasmlist,OP_IMUL,get_mul_size,
right.location.register);
end
else if location.reference.index=R_NO then
begin
location.reference.index:=right.location.register;
cg.a_op_const_reg(exprasmlist,OP_IMUL,get_mul_size,
right.location.register);
end
else
begin
cg.a_loadaddr_ref_reg(exprasmlist,location.reference,
location.reference.base);
rg.ungetregisterint(exprasmlist,location.reference.index);
{ the symbol offset is loaded, }
{ so release the symbol name and set symbol }
{ to nil }
location.reference.symbol:=nil;
location.reference.offset:=0;
cg.a_op_const_reg(exprasmlist,OP_IMUL,
get_mul_size,right.location.register);
location.reference.index:=right.location.register;
end;
{ insert the register and the multiplication factor in the
reference }
update_reference_reg_mul(right.location.register,get_mul_size);
end;
location.size:=newsize;
@ -877,7 +864,13 @@ begin
end.
{
$Log$
Revision 1.25 2002-08-23 16:14:48 peter
Revision 1.26 2002-09-01 18:46:01 peter
* fixed generic tcgvecnode
* move code that updates a reference with index register and multiplier
to separate method so it can be overriden for scaled indexing
* i386 uses generic tcgvecnode
Revision 1.25 2002/08/23 16:14:48 peter
* tempgen cleanup
* tt_noreuse temp type added that will be used in genentrycode