summaryrefslogtreecommitdiff
path: root/gcc/ada/exp_pakd.adb
diff options
context:
space:
mode:
authorbosch <bosch@138bc75d-0d04-0410-961f-82ee72b054a4>2002-03-08 20:11:04 +0000
committerbosch <bosch@138bc75d-0d04-0410-961f-82ee72b054a4>2002-03-08 20:11:04 +0000
commitf15731c43ae5e8cea424ea40f905c19afa1bd2e4 (patch)
treeb584a79288c93215b05fb451943291ccd039388b /gcc/ada/exp_pakd.adb
parent1d347c236ad815c77bd345611ed221b0bd6091de (diff)
downloadgcc-f15731c43ae5e8cea424ea40f905c19afa1bd2e4.tar.gz
* 41intnam.ads, 42intnam.ads, 4aintnam.ads, 4cintnam.ads,
4dintnam.ads, 4gintnam.ads, 4hintnam.ads, 4lintnam.ads, 4mintnam.ads, 4pintnam.ads, 4rintnam.ads, 4sintnam.ads, 4uintnam.ads, 4vcalend.adb, 4zintnam.ads, 52system.ads, 5amastop.adb, 5asystem.ads, 5ataprop.adb, 5atpopsp.adb, 5avxwork.ads, 5bosinte.adb, 5bsystem.ads, 5esystem.ads, 5fsystem.ads, 5ftaprop.adb, 5ginterr.adb, 5gmastop.adb, 5gsystem.ads, 5gtaprop.adb, 5gtasinf.adb, 5gtasinf.ads, 5hparame.ads, 5hsystem.ads, 5htaprop.adb, 5htraceb.adb, 5itaprop.adb, 5ksystem.ads, 5kvxwork.ads, 5lintman.adb, 5lsystem.ads, 5mvxwork.ads, 5ninmaop.adb, 5nosinte.ads, 5ntaprop.adb, 5ointerr.adb, 5omastop.adb, 5oosinte.adb, 5osystem.ads, 5otaprop.adb, 5otaspri.ads, 5pvxwork.ads, 5qtaprop.adb, 5sintman.adb, 5ssystem.ads, 5staprop.adb, 5stpopse.adb, 5svxwork.ads, 5tosinte.ads, 5uintman.adb, 5vasthan.adb, 5vinmaop.adb, 5vinterr.adb, 5vintman.adb, 5vmastop.adb, 5vparame.ads, 5vsystem.ads, 5vtaprop.adb, 5vtpopde.adb, 5wmemory.adb, 5wsystem.ads, 5wtaprop.adb, 5ysystem.ads, 5zinterr.adb, 5zintman.adb, 5zosinte.adb, 5zosinte.ads, 5zsystem.ads, 5ztaprop.adb, 6vcpp.adb, 6vcstrea.adb, 7sintman.adb, 7staprop.adb, 7stpopsp.adb, 9drpc.adb, Make-lang.in, Makefile.in, a-caldel.adb, a-comlin.ads, a-dynpri.adb, a-except.adb, a-except.ads, a-finali.adb, a-ncelfu.ads, a-reatim.adb, a-retide.adb, a-stream.ads, a-ststio.adb, a-ststio.ads, a-stwifi.adb, a-tags.adb, a-tasatt.adb, a-textio.adb, a-tideau.adb, a-tiflau.adb, a-tigeau.adb, a-tigeau.ads, a-tiinau.adb, a-timoau.adb, a-witeio.adb, a-wtdeau.adb, a-wtenau.adb, a-wtflau.adb, a-wtgeau.adb, a-wtgeau.ads, a-wtinau.adb, a-wtmoau.adb, ada-tree.def, ada-tree.h, adaint.c, adaint.h, ali-util.adb, ali.adb, ali.ads, atree.adb, atree.ads, atree.h, back_end.adb, bcheck.adb, bindgen.adb, bindusg.adb, checks.adb, comperr.adb, config-lang.in, csets.adb, csets.ads, cstand.adb, cstreams.c, debug.adb, debug.ads, decl.c, einfo.adb, einfo.ads, einfo.h, elists.h, errout.adb, errout.ads, eval_fat.adb, exp_aggr.adb, exp_attr.adb, exp_ch11.adb, exp_ch12.adb, exp_ch13.adb, exp_ch2.adb, exp_ch3.adb, exp_ch3.ads, exp_ch4.adb, exp_ch5.adb, exp_ch6.adb, exp_ch7.adb, exp_ch7.ads, exp_ch9.adb, exp_ch9.ads, exp_dbug.adb, exp_dbug.ads, exp_disp.ads, exp_dist.adb, exp_fixd.adb, exp_intr.adb, exp_pakd.adb, exp_prag.adb, exp_strm.adb, exp_util.adb, exp_util.ads, expander.adb, expect.c, fe.h, fmap.adb, fmap.ads, fname-uf.adb, freeze.adb, frontend.adb, g-awk.adb, g-cgideb.adb, g-comlin.adb, g-comlin.ads, g-debpoo.adb, g-dirope.adb, g-dirope.ads, g-dyntab.adb, g-expect.adb, g-expect.ads, g-io.ads, g-io_aux.adb, g-io_aux.ads, g-locfil.adb, g-locfil.ads, g-os_lib.adb, g-os_lib.ads, g-regexp.adb, g-regpat.adb, g-socket.adb, g-socket.ads, g-spipat.adb, g-table.adb, g-trasym.adb, g-trasym.ads, gigi.h, gmem.c, gnat1drv.adb, gnatbind.adb, gnatbl.c, gnatchop.adb, gnatcmd.adb, gnatdll.adb, gnatfind.adb, gnatlbr.adb, gnatlink.adb, gnatls.adb, gnatmem.adb, gnatprep.adb, gnatvsn.ads, gnatxref.adb, hlo.adb, hostparm.ads, i-cobol.adb, i-cpp.adb, i-cstrea.ads, i-cstrin.adb, i-pacdec.adb, i-vxwork.ads, impunit.adb, init.c, inline.adb, io-aux.c, layout.adb, lib-load.adb, lib-util.adb, lib-writ.adb, lib-writ.ads, lib-xref.adb, lib-xref.ads, lib.adb, lib.ads, make.adb, makeusg.adb, mdll.adb, memroot.adb, misc.c, mlib-tgt.adb, mlib-utl.adb, mlib-utl.ads, mlib.adb, namet.adb, namet.ads, namet.h, nlists.h, nmake.adb, nmake.ads, nmake.adt, opt.adb, opt.ads, osint.adb, osint.ads, output.adb, output.ads, par-ch2.adb, par-ch3.adb, par-ch5.adb, par-prag.adb, par-tchk.adb, par-util.adb, par.adb, prj-attr.adb, prj-dect.adb, prj-env.adb, prj-env.ads, prj-nmsc.adb, prj-part.adb, prj-proc.adb, prj-strt.adb, prj-tree.adb, prj-tree.ads, prj.adb, prj.ads, raise.c, raise.h, repinfo.adb, restrict.adb, restrict.ads, rident.ads, rtsfind.adb, rtsfind.ads, s-arit64.adb, s-asthan.adb, s-atacco.adb, s-atacco.ads, s-auxdec.adb, s-crc32.adb, s-crc32.ads, s-direio.adb, s-fatgen.adb, s-fileio.adb, s-finimp.adb, s-gloloc.adb, s-gloloc.ads, s-interr.adb, s-mastop.adb, s-mastop.ads, s-memory.adb, s-parame.ads, s-parint.adb, s-pooglo.adb, s-pooloc.adb, s-rpc.adb, s-secsta.adb, s-sequio.adb, s-shasto.adb, s-soflin.adb, s-soflin.ads, s-stache.adb, s-taasde.adb, s-taasde.ads, s-tadeca.adb, s-tadeca.ads, s-tadert.adb, s-tadert.ads, s-taenca.adb, s-taenca.ads, s-taprob.adb, s-taprop.ads, s-tarest.adb, s-tasdeb.adb, s-tasini.adb, s-tasini.ads, s-taskin.adb, s-taskin.ads, s-tasque.adb, s-tasque.ads, s-tasren.adb, s-tasren.ads, s-tassta.adb, s-tasuti.adb, s-tasuti.ads, s-tataat.adb, s-tataat.ads, s-tpoben.adb, s-tpoben.ads, s-tpobop.adb, s-tposen.adb, s-tposen.ads, s-traceb.adb, s-traceb.ads, s-unstyp.ads, s-widenu.adb, scn-nlit.adb, scn.adb, sem.adb, sem_aggr.adb, sem_attr.adb, sem_attr.ads, sem_case.adb, sem_ch10.adb, sem_ch11.adb, sem_ch11.ads, sem_ch12.adb, sem_ch13.adb, sem_ch13.ads, sem_ch2.adb, sem_ch3.adb, sem_ch3.ads, sem_ch4.adb, sem_ch5.adb, sem_ch6.adb, sem_ch6.ads, sem_ch7.adb, sem_ch8.adb, sem_ch8.ads, sem_ch9.adb, sem_disp.adb, sem_dist.adb, sem_elab.adb, sem_elim.adb, sem_elim.ads, sem_eval.adb, sem_intr.adb, sem_mech.adb, sem_prag.adb, sem_res.adb, sem_type.adb, sem_util.adb, sem_util.ads, sem_vfpt.adb, sem_warn.adb, sinfo.adb, sinfo.ads, sinfo.h, sinput-l.adb, sinput-l.ads, sinput.adb, sinput.ads, snames.adb, snames.ads, snames.h, sprint.adb, sprint.ads, stringt.adb, stringt.ads, stringt.h, style.adb, switch.adb, switch.ads, sysdep.c, system.ads, table.adb, targparm.adb, targparm.ads, targtyps.c, tbuild.adb, tbuild.ads, tracebak.c, trans.c, tree_gen.adb, tree_io.adb, treepr.adb, treepr.ads, treeprs.ads, treeprs.adt, ttypes.ads, types.adb, types.ads, types.h, uintp.ads, urealp.ads, usage.adb, utils.c, utils2.c, validsw.adb, xnmake.adb, xr_tabls.adb, xr_tabls.ads, xref_lib.adb, xref_lib.ads : Merge in ACT changes. * 1ssecsta.adb, 1ssecsta.ads, a-chlat9.ads, a-cwila9.ads, g-enblsp.adb, g-md5.adb, g-md5.ads, gnatname.adb, gnatname.ads, mkdir.c, osint-b.adb, osint-b.ads, osint-c.adb, osint-c.ads, osint-l.adb, osint-l.ads, osint-m.adb, osint-m.ads : New files * 3lsoccon.ads, 5qparame.ads, 5qvxwork.ads, 5smastop.adb, 5zparame.ads, gnatmain.adb, gnatmain.ads, gnatpsys.adb : Removed * mdllfile.adb, mdllfile.ads, mdlltool.adb, mdlltool.ads : Renamed to mdll-fil.ad[bs] and mdll-util.ad[bs] * mdll-fil.adb, mdll-fil.ads, mdll-utl.adb, mdll-utl.ads : Renamed from mdllfile.ad[bs] and mdlltool.ad[bs] git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@50451 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/ada/exp_pakd.adb')
-rw-r--r--gcc/ada/exp_pakd.adb109
1 files changed, 62 insertions, 47 deletions
diff --git a/gcc/ada/exp_pakd.adb b/gcc/ada/exp_pakd.adb
index 5656569669c..511cd4c95a5 100644
--- a/gcc/ada/exp_pakd.adb
+++ b/gcc/ada/exp_pakd.adb
@@ -8,7 +8,7 @@
-- --
-- $Revision$
-- --
--- Copyright (C) 1992-2001 Free Software Foundation, Inc. --
+-- Copyright (C) 1992-2002 Free Software Foundation, Inc. --
-- --
-- GNAT is free software; you can redistribute it and/or modify it under --
-- terms of the GNU General Public License as published by the Free Soft- --
@@ -591,7 +591,7 @@ package body Exp_Pakd is
Right_Opnd =>
Convert_To (Standard_Integer,
Make_Attribute_Reference (Loc,
- Prefix => New_Occurrence_Of (Styp, Loc),
+ Prefix => New_Occurrence_Of (Styp, Loc),
Attribute_Name => Name_First)));
-- For larger integer types, subtract first, then convert to
@@ -606,7 +606,7 @@ package body Exp_Pakd is
Left_Opnd => Newsub,
Right_Opnd =>
Make_Attribute_Reference (Loc,
- Prefix => New_Occurrence_Of (Styp, Loc),
+ Prefix => New_Occurrence_Of (Styp, Loc),
Attribute_Name => Name_First)));
end if;
@@ -625,18 +625,18 @@ package body Exp_Pakd is
Make_Op_Subtract (Loc,
Left_Opnd => Convert_To (Standard_Integer,
Make_Attribute_Reference (Loc,
- Prefix => New_Occurrence_Of (Styp, Loc),
+ Prefix => New_Occurrence_Of (Styp, Loc),
Attribute_Name => Name_Pos,
- Expressions => New_List (Newsub))),
+ Expressions => New_List (Newsub))),
Right_Opnd =>
Convert_To (Standard_Integer,
Make_Attribute_Reference (Loc,
- Prefix => New_Occurrence_Of (Styp, Loc),
+ Prefix => New_Occurrence_Of (Styp, Loc),
Attribute_Name => Name_Pos,
- Expressions => New_List (
+ Expressions => New_List (
Make_Attribute_Reference (Loc,
- Prefix => New_Occurrence_Of (Styp, Loc),
+ Prefix => New_Occurrence_Of (Styp, Loc),
Attribute_Name => Name_First)))));
end if;
@@ -761,7 +761,7 @@ package body Exp_Pakd is
end if;
Set_Is_Itype (PAT, True);
- Set_Is_Packed_Array_Type (PAT, True);
+ Set_Packed_Array_Type (Typ, PAT);
Analyze (Decl, Suppress => All_Checks);
if Pushed_Scope then
@@ -780,10 +780,11 @@ package body Exp_Pakd is
-- Set remaining fields of packed array type
- Init_Alignment (PAT);
- Set_Parent (PAT, Empty);
- Set_Packed_Array_Type (Typ, PAT);
+ Init_Alignment (PAT);
+ Set_Parent (PAT, Empty);
Set_Associated_Node_For_Itype (PAT, Typ);
+ Set_Is_Packed_Array_Type (PAT, True);
+ Set_Original_Array_Type (PAT, Typ);
-- We definitely do not want to delay freezing for packed array
-- types. This is of particular importance for the itypes that
@@ -801,14 +802,17 @@ package body Exp_Pakd is
procedure Set_PB_Type is
begin
-- If the user has specified an explicit alignment for the
- -- component, take it into account.
+ -- type or component, take it into account.
if Csize <= 2 or else Csize = 4 or else Csize mod 2 /= 0
+ or else Alignment (Typ) = 1
or else Component_Alignment (Typ) = Calign_Storage_Unit
then
PB_Type := RTE (RE_Packed_Bytes1);
- elsif Csize mod 4 /= 0 then
+ elsif Csize mod 4 /= 0
+ or else Alignment (Typ) = 2
+ then
PB_Type := RTE (RE_Packed_Bytes2);
else
@@ -973,17 +977,28 @@ package body Exp_Pakd is
Type_Definition => Typedef);
end;
+ -- Set type as packed array type and install it
+
+ Set_Is_Packed_Array_Type (PAT);
Install_PAT;
return;
- -- Case of bit-packing required for unconstrained array. We simply
- -- use Packed_Bytes{1,2,4} as appropriate, and we do not need to
- -- construct a special packed array type.
+ -- Case of bit-packing required for unconstrained array. We create
+ -- a subtype that is equivalent to use Packed_Bytes{1,2,4} as needed.
elsif not Is_Constrained (Typ) then
+ PAT :=
+ Make_Defining_Identifier (Loc,
+ Chars => Make_Packed_Array_Type_Name (Typ, Csize));
+
+ Set_Packed_Array_Type (Typ, PAT);
Set_PB_Type;
- Set_Packed_Array_Type (Typ, PB_Type);
- Set_Is_Packed_Array_Type (Packed_Array_Type (Typ), True);
+
+ Decl :=
+ Make_Subtype_Declaration (Loc,
+ Defining_Identifier => PAT,
+ Subtype_Indication => New_Occurrence_Of (PB_Type, Loc));
+ Install_PAT;
return;
-- Remaining code is for the case of bit-packing for constrained array
@@ -1453,9 +1468,9 @@ package body Exp_Pakd is
Make_Procedure_Call_Statement (Loc,
Name => New_Occurrence_Of (Set_nn, Loc),
Parameter_Associations => New_List (
- Make_Attribute_Reference (Loc,
+ Make_Byte_Aligned_Attribute_Reference (Loc,
Attribute_Name => Name_Address,
- Prefix => Obj),
+ Prefix => Obj),
Subscr,
Unchecked_Convert_To (Bits_nn,
Convert_To (Ctyp, Rhs)))));
@@ -1507,13 +1522,13 @@ package body Exp_Pakd is
Left_Opnd => Subscr,
Right_Opnd =>
Make_Attribute_Reference (Ploc,
- Prefix => New_Occurrence_Of (Atyp, Ploc),
+ Prefix => New_Occurrence_Of (Atyp, Ploc),
Attribute_Name => Name_Component_Size));
elsif Nkind (Pref) = N_Selected_Component then
Term :=
Make_Attribute_Reference (Ploc,
- Prefix => Selector_Name (Pref),
+ Prefix => Selector_Name (Pref),
Attribute_Name => Name_Bit_Position);
else
@@ -1541,7 +1556,7 @@ package body Exp_Pakd is
Left_Opnd =>
Unchecked_Convert_To (RTE (RE_Integer_Address),
Make_Attribute_Reference (Loc,
- Prefix => Pref,
+ Prefix => Pref,
Attribute_Name => Name_Address)),
Right_Opnd =>
@@ -1619,7 +1634,8 @@ package body Exp_Pakd is
Right_Opnd =>
Convert_To (BT,
- New_Occurrence_Of (Standard_True, Loc))))));
+ New_Occurrence_Of (Standard_True, Loc)))),
+ Reason => CE_Range_Check_Failed));
end;
end if;
@@ -1701,9 +1717,9 @@ package body Exp_Pakd is
Name => New_Occurrence_Of (RTE (E_Id), Loc),
Parameter_Associations => New_List (
- Make_Attribute_Reference (Loc,
+ Make_Byte_Aligned_Attribute_Reference (Loc,
Attribute_Name => Name_Address,
- Prefix => L),
+ Prefix => L),
Make_Op_Multiply (Loc,
Left_Opnd =>
@@ -1715,9 +1731,9 @@ package body Exp_Pakd is
Right_Opnd =>
Make_Integer_Literal (Loc, Component_Size (Ltyp))),
- Make_Attribute_Reference (Loc,
+ Make_Byte_Aligned_Attribute_Reference (Loc,
Attribute_Name => Name_Address,
- Prefix => R),
+ Prefix => R),
Make_Op_Multiply (Loc,
Left_Opnd =>
@@ -1729,7 +1745,7 @@ package body Exp_Pakd is
Right_Opnd =>
Make_Integer_Literal (Loc, Component_Size (Rtyp))),
- Make_Attribute_Reference (Loc,
+ Make_Byte_Aligned_Attribute_Reference (Loc,
Attribute_Name => Name_Address,
Prefix => New_Occurrence_Of (Result_Ent, Loc))))));
@@ -1841,9 +1857,9 @@ package body Exp_Pakd is
Make_Function_Call (Loc,
Name => New_Occurrence_Of (Get_nn, Loc),
Parameter_Associations => New_List (
- Make_Attribute_Reference (Loc,
+ Make_Byte_Aligned_Attribute_Reference (Loc,
Attribute_Name => Name_Address,
- Prefix => Obj),
+ Prefix => Obj),
Subscr))));
end;
end if;
@@ -1885,7 +1901,7 @@ package body Exp_Pakd is
Left_Opnd =>
Make_Attribute_Reference (Loc,
Attribute_Name => Name_Length,
- Prefix => New_Occurrence_Of (Ltyp, Loc)),
+ Prefix => New_Occurrence_Of (Ltyp, Loc)),
Right_Opnd =>
Make_Integer_Literal (Loc, Component_Size (Ltyp)));
@@ -1894,7 +1910,7 @@ package body Exp_Pakd is
Left_Opnd =>
Make_Attribute_Reference (Loc,
Attribute_Name => Name_Length,
- Prefix => New_Occurrence_Of (Rtyp, Loc)),
+ Prefix => New_Occurrence_Of (Rtyp, Loc)),
Right_Opnd =>
Make_Integer_Literal (Loc, Component_Size (Rtyp)));
@@ -1934,15 +1950,15 @@ package body Exp_Pakd is
Make_Function_Call (Loc,
Name => New_Occurrence_Of (RTE (RE_Bit_Eq), Loc),
Parameter_Associations => New_List (
- Make_Attribute_Reference (Loc,
+ Make_Byte_Aligned_Attribute_Reference (Loc,
Attribute_Name => Name_Address,
- Prefix => L),
+ Prefix => L),
LLexpr,
- Make_Attribute_Reference (Loc,
+ Make_Byte_Aligned_Attribute_Reference (Loc,
Attribute_Name => Name_Address,
- Prefix => R),
+ Prefix => R),
RLexpr)));
end if;
@@ -1995,7 +2011,8 @@ package body Exp_Pakd is
Right_Opnd =>
Make_Attribute_Reference (Loc,
Prefix => New_Occurrence_Of (CT, Loc),
- Attribute_Name => Name_Last))));
+ Attribute_Name => Name_Last)),
+ Reason => CE_Range_Check_Failed));
end;
-- Now that that silliness is taken care of, get packed array type
@@ -2052,9 +2069,9 @@ package body Exp_Pakd is
Name => New_Occurrence_Of (RTE (RE_Bit_Not), Loc),
Parameter_Associations => New_List (
- Make_Attribute_Reference (Loc,
+ Make_Byte_Aligned_Attribute_Reference (Loc,
Attribute_Name => Name_Address,
- Prefix => Opnd),
+ Prefix => Opnd),
Make_Op_Multiply (Loc,
Left_Opnd =>
@@ -2066,7 +2083,7 @@ package body Exp_Pakd is
Right_Opnd =>
Make_Integer_Literal (Loc, Component_Size (Rtyp))),
- Make_Attribute_Reference (Loc,
+ Make_Byte_Aligned_Attribute_Reference (Loc,
Attribute_Name => Name_Address,
Prefix => New_Occurrence_Of (Result_Ent, Loc))))));
@@ -2146,13 +2163,11 @@ package body Exp_Pakd is
-- If we have a specified alignment, see if it is sufficient, if not
-- then we can't possibly be aligned enough in any case.
- elsif Is_Entity_Name (Obj)
- and then Known_Alignment (Entity (Obj))
- then
+ elsif Known_Alignment (Etype (Obj)) then
-- Alignment required is 4 if size is a multiple of 4, and
-- 2 otherwise (e.g. 12 bits requires 4, 10 bits requires 2)
- if Alignment (Entity (Obj)) < 4 - (Csiz mod 4) then
+ if Alignment (Etype (Obj)) < 4 - (Csiz mod 4) then
return False;
end if;
end if;
@@ -2345,7 +2360,7 @@ package body Exp_Pakd is
then
Rewrite (Expr,
Make_Attribute_Reference (Loc,
- Prefix => New_Occurrence_Of (Expr_Typ, Loc),
+ Prefix => New_Occurrence_Of (Expr_Typ, Loc),
Attribute_Name => Name_Pos,
Expressions => New_List (Relocate_Node (Expr))));
Analyze_And_Resolve (Expr, Standard_Natural);