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

* Cleaner implementation of pointer index to open array, codegen changes

Browse Source 
no longer necessary and therefore reverted.

git-svn-id: trunk@5037 -
This commit is contained in:
daniel 2006-10-27 20:57:51 +00:00
parent 3ba85ce96d
commit 068c0f7952
2 changed files with 57 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
compiler/ncal.pas
View File

@ -378,14 +378,23 @@ type
{Array slice using .. operator.} {Array slice using .. operator.}
with Trangenode(Tvecnode(p).right) do with Trangenode(Tvecnode(p).right) do
begin begin
{Because the bounds are also needed to calculate the pointer, l:=left; {Get lower bound.}
we take copies instead of clearing the original.} r:=right; {Get upper bound.}
l:=left.getcopy; {Get lower bound.}
r:=right.getcopy; {Get upper bound.}
end; end;
{In the procedure the array range is 0..(upper_bound-lower_bound).} {In the procedure the array range is 0..(upper_bound-lower_bound).}
hightree:=caddnode.create(subn,r,l); hightree:=caddnode.create(subn,r,l);
resulttypepass(gen_high_tree); resulttypepass(gen_high_tree);
{Replace the rangnode in the tree by its lower_bound, and
dispose the rangenode.}
temp:=Tvecnode(p).right;
Tvecnode(p).right:=l.getcopy;
with Trangenode(temp) do
begin
left:=nil;
right:=nil;
end;
temp.free;
end end
else else
begin begin

104
compiler/ncgmem.pas
View File

@ -83,7 +83,7 @@ implementation
symconst,symdef,symsym,symtable,defutil,paramgr, symconst,symdef,symsym,symtable,defutil,paramgr,
aasmbase,aasmtai,aasmdata, aasmbase,aasmtai,aasmdata,
procinfo,pass_2,parabase, procinfo,pass_2,parabase,
pass_1,nld,ncon,nadd,nutils,nset, pass_1,nld,ncon,nadd,nutils,
cgutils,cgobj, cgutils,cgobj,
tgobj,ncgutil tgobj,ncgutil
; ;
@ -698,13 +698,12 @@ implementation
ispowerof2(mulsize div 8,temp))) then ispowerof2(mulsize div 8,temp))) then
dec(location.reference.offset,bytemulsize*tarraydef(left.resulttype.def).lowrange); dec(location.reference.offset,bytemulsize*tarraydef(left.resulttype.def).lowrange);
case right.nodetype of if right.nodetype=ordconstn then
ordconstn: begin
begin { offset can only differ from 0 if arraydef }
{ offset can only differ from 0 if arraydef } case left.resulttype.def.deftype of
case left.resulttype.def.deftype of arraydef :
arraydef : begin
begin
if not(is_open_array(left.resulttype.def)) and if not(is_open_array(left.resulttype.def)) and
not(is_array_of_const(left.resulttype.def)) and not(is_array_of_const(left.resulttype.def)) and
not(is_dynamic_array(left.resulttype.def)) then not(is_dynamic_array(left.resulttype.def)) then
@ -727,11 +726,11 @@ implementation
if (cs_check_range in aktlocalswitches) then if (cs_check_range in aktlocalswitches) then
rangecheck_array; rangecheck_array;
end; end;
end; end;
stringdef : stringdef :
begin begin
if (cs_check_range in aktlocalswitches) then if (cs_check_range in aktlocalswitches) then
begin begin
case tstringdef(left.resulttype.def).string_typ of case tstringdef(left.resulttype.def).string_typ of
{ it's the same for ansi- and wide strings } { it's the same for ansi- and wide strings }
st_widestring, st_widestring,
@ -763,14 +762,14 @@ implementation
{!!!!!!!!!!!!!!!!!} {!!!!!!!!!!!!!!!!!}
end; end;
end; end;
end; end;
end; end;
end; end;
if not(is_packed_array(left.resulttype.def)) or if not(is_packed_array(left.resulttype.def)) or
((mulsize mod 8 = 0) and ((mulsize mod 8 = 0) and
ispowerof2(mulsize div 8,temp)) then ispowerof2(mulsize div 8,temp)) then
begin begin
inc(location.reference.offset, inc(location.reference.offset,
bytemulsize*tordconstnode(right).value); bytemulsize*tordconstnode(right).value);
{ don't do this for floats etc.; needed to properly set the } { don't do this for floats etc.; needed to properly set the }
{ size for bitpacked arrays (e.g. a bitpacked array of } { size for bitpacked arrays (e.g. a bitpacked array of }
@ -779,44 +778,29 @@ implementation
if is_packed_array(left.resulttype.def) and if is_packed_array(left.resulttype.def) and
(tcgsize2size[newsize] <> bytemulsize) then (tcgsize2size[newsize] <> bytemulsize) then
newsize:=int_cgsize(bytemulsize); newsize:=int_cgsize(bytemulsize);
end end
else else
begin begin
subsetref.ref := location.reference; subsetref.ref := location.reference;
subsetref.ref.alignment := left.resulttype.def.alignment; subsetref.ref.alignment := left.resulttype.def.alignment;
if not ispowerof2(subsetref.ref.alignment,temp) then if not ispowerof2(subsetref.ref.alignment,temp) then
internalerror(2006081212); internalerror(2006081212);
alignpow:=temp; alignpow:=temp;
inc(subsetref.ref.offset,((mulsize * (tordconstnode(right).value-tarraydef(left.resulttype.def).lowrange)) shr (3+alignpow)) shl alignpow); inc(subsetref.ref.offset,((mulsize * (tordconstnode(right).value-tarraydef(left.resulttype.def).lowrange)) shr (3+alignpow)) shl alignpow);
subsetref.bitindexreg := NR_NO; subsetref.bitindexreg := NR_NO;
subsetref.startbit := (mulsize * (tordconstnode(right).value-tarraydef(left.resulttype.def).lowrange)) and ((1 shl (3+alignpow))-1); subsetref.startbit := (mulsize * (tordconstnode(right).value-tarraydef(left.resulttype.def).lowrange)) and ((1 shl (3+alignpow))-1);
subsetref.bitlen := resulttype.def.packedbitsize; subsetref.bitlen := resulttype.def.packedbitsize;
if (left.location.loc = LOC_REFERENCE) then if (left.location.loc = LOC_REFERENCE) then
location.loc := LOC_SUBSETREF location.loc := LOC_SUBSETREF
else else
location.loc := LOC_CSUBSETREF; location.loc := LOC_CSUBSETREF;
location.sref := subsetref; location.sref := subsetref;
end; end;
end; end
rangen: else
begin { not nodetype=ordconstn }
{Pbyte[0..9] syntax. begin
The .. operator by itself does not generate code, it only determines if (cs_opt_level1 in aktoptimizerswitches) and
the type of the resulting array. So we immediately call the second past
of the lower bound, which determines the address.}
{Get lower array bound.}
secondpass(Trangenode(right).left);
{If mulsize = 1, we won't have to modify the index }
location_force_reg(current_asmdata.CurrAsmList,
Trangenode(right).left.location,
OS_ADDR,
mulsize=1);
update_reference_reg_mul(Trangenode(right).left.location.register,mulsize)
end;
else
{ not nodetype in [ordconstn,rangen] }
if (cs_opt_level1 in aktoptimizerswitches) and
{ if we do range checking, we don't } { if we do range checking, we don't }
{ need that fancy code (it would be } { need that fancy code (it would be }
{ buggy) } { buggy) }
@ -953,11 +937,11 @@ implementation
update_reference_reg_mul(right.location.register,mulsize) update_reference_reg_mul(right.location.register,mulsize)
else else
update_reference_reg_packed(right.location.register,mulsize); update_reference_reg_packed(right.location.register,mulsize);
end; end;
location.size:=newsize; location.size:=newsize;
paraloc1.done; paraloc1.done;
paraloc2.done; paraloc2.done;
end; end;