* 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

1 files changed, 162 insertions, 71 deletions

diff --git a/gcc/ada/repinfo.adb b/gcc/ada/repinfo.adb
index a5bbaf4c777..4a19eacf88b 100644
--- a/gcc/ada/repinfo.adb
+++ b/gcc/ada/repinfo.adb
@@ -6,9 +6,9 @@
 --                                                                          --
 --                                 B o d y                                  --
 --                                                                          --
---                            $Revision: 1.1 $
+--                            $Revision$
 --                                                                          --
---          Copyright (C) 1999-2001 Free Software Foundation, Inc.          --
+--          Copyright (C) 1999-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- --
@@ -140,6 +140,14 @@ package body Repinfo is
    --  Returns True if Val represents a variable value, and False if it
    --  represents a value that is fixed at compile time.
 
+   procedure Write_Info_Line (S : String);
+   --  Routine to write a line to Repinfo output file. This routine is
+   --  passed as a special output procedure to Output.Set_Special_Output.
+   --  Note that Write_Info_Line is called with an EOL character at the
+   --  end of each line, as per the Output spec, but the internal call
+   --  to the appropriate routine in Osint requires that the end of line
+   --  sequence be stripped off.
+
    procedure Write_Val (Val : Node_Ref_Or_Val; Paren : Boolean := False);
    --  Given a representation value, write it out. No_Uint values or values
    --  dependent on discriminants are written as two question marks. If the
@@ -286,8 +294,14 @@ package body Repinfo is
       if Present (Ent) then
          E := First_Entity (Ent);
          while Present (E) loop
-            if Comes_From_Source (E) or else Debug_Flag_AA then
 
+            --  We list entities that come from source (excluding private
+            --  types, where we will list the info for the full view). If
+            --  debug flag A is set, all entities are listed
+
+            if (Comes_From_Source (E) and then not Is_Private_Type (E))
+              or else Debug_Flag_AA
+            then
                if Is_Record_Type (E) then
                   List_Record_Info (E);
 
@@ -295,7 +309,6 @@ package body Repinfo is
                   List_Array_Info (E);
 
                elsif List_Representation_Info >= 2 then
-
                   if Is_Type (E) then
                      List_Type_Info (E);
 
@@ -311,15 +324,19 @@ package body Repinfo is
                   end if;
                end if;
 
-               --  Recurse over nested package, but not if they are
+               --  Recurse into nested package, but not if they are
                --  package renamings (in particular renamings of the
                --  enclosing package, as for some Java bindings and
                --  for generic instances).
 
-               if (Ekind (E) = E_Package
-                         and then No (Renamed_Object (E)))
-                       or else
-                     Ekind (E) = E_Protected_Type
+               if Ekind (E) = E_Package then
+                  if No (Renamed_Object (E)) then
+                     List_Entities (E);
+                  end if;
+
+               --  Recurse into bodies
+
+               elsif Ekind (E) = E_Protected_Type
                        or else
                      Ekind (E) = E_Task_Type
                        or else
@@ -332,6 +349,11 @@ package body Repinfo is
                      Ekind (E) = E_Protected_Body
                then
                   List_Entities (E);
+
+               --  Recurse into blocks
+
+               elsif Ekind (E) = E_Block then
+                  List_Entities (E);
                end if;
             end if;
 
@@ -477,7 +499,7 @@ package body Repinfo is
 
    begin
       if U = No_Uint then
-         Write_Line ("??");
+         Write_Str ("??");
       else
          P (U);
       end if;
@@ -507,21 +529,17 @@ package body Repinfo is
    begin
       Write_Eol;
 
-      if Known_Esize (Ent) then
-         Write_Str ("for ");
-         List_Name (Ent);
-         Write_Str ("'Size use ");
-         Write_Val (Esize (Ent));
-         Write_Line (";");
-      end if;
+      Write_Str ("for ");
+      List_Name (Ent);
+      Write_Str ("'Size use ");
+      Write_Val (Esize (Ent));
+      Write_Line (";");
 
-      if Known_Alignment (Ent) then
-         Write_Str ("for ");
-         List_Name (Ent);
-         Write_Str ("'Alignment use ");
-         Write_Val (Alignment (Ent));
-         Write_Line (";");
-      end if;
+      Write_Str ("for ");
+      List_Name (Ent);
+      Write_Str ("'Alignment use ");
+      Write_Val (Alignment (Ent));
+      Write_Line (";");
    end List_Object_Info;
 
    ----------------------
@@ -574,7 +592,13 @@ package body Repinfo is
                UI_Image (Sunit);
             end if;
 
-            if Unknown_Normalized_First_Bit (Comp) then
+            --  If the record is not packed, then we know that all
+            --  fields whose position is not specified have a starting
+            --  normalized bit position of zero
+
+            if Unknown_Normalized_First_Bit (Comp)
+              and then not Is_Packed (Ent)
+            then
                Set_Normalized_First_Bit (Comp, Uint_0);
             end if;
 
@@ -620,8 +644,12 @@ package body Repinfo is
                  and then List_Representation_Info = 3
                then
                   Spaces (Max_Suni_Length - 2);
+                  Write_Str ("bit offset");
                   Write_Val (Bofs, Paren => True);
-                  Write_Str (" / 8");
+                  Write_Str (" size in bits = ");
+                  Write_Val (Esiz, Paren => True);
+                  Write_Eol;
+                  goto Continue;
 
                elsif Known_Normalized_Position (Comp)
                  and then List_Representation_Info = 3
@@ -630,14 +658,33 @@ package body Repinfo is
                   Write_Val (Npos);
 
                else
-                  Write_Str ("??");
+                  --  For the packed case, we don't know the bit positions
+                  --  if we don't know the starting position!
+
+                  if Is_Packed (Ent) then
+                     Write_Line ("?? range  ? .. ??;");
+                     goto Continue;
+
+                  --  Otherwise we can continue
+
+                  else
+                     Write_Str ("??");
+                  end if;
                end if;
 
                Write_Str (" range  ");
                UI_Write (Fbit);
                Write_Str (" .. ");
 
-               if not Is_Dynamic_SO_Ref (Esize (Comp)) then
+               --  Allowing Uint_0 here is a kludge, really this should be
+               --  a fine Esize value but currently it means unknown, except
+               --  that we know after gigi has back annotated that a size of
+               --  zero is real, since otherwise gigi back annotates using
+               --  No_Uint as the value to indicate unknown).
+
+               if (Esize (Comp) = Uint_0 or else Known_Static_Esize (Comp))
+                 and then Known_Static_Normalized_First_Bit (Comp)
+               then
                   Lbit := Fbit + Esiz - 1;
 
                   if Lbit < 10 then
@@ -646,10 +693,17 @@ package body Repinfo is
 
                   UI_Write (Lbit);
 
-               elsif List_Representation_Info < 3 then
+               --  The test for Esize (Comp) not being Uint_0 here is a kludge.
+               --  Officially a value of zero for Esize means unknown, but here
+               --  we use the fact that we know that gigi annotates Esize with
+               --  No_Uint, not Uint_0. Really everyone should use No_Uint???
+
+               elsif List_Representation_Info < 3
+                 or else (Esize (Comp) /= Uint_0 and then Unknown_Esize (Comp))
+               then
                   Write_Str ("??");
 
-               else -- List_Representation >= 3
+               else -- List_Representation >= 3 and Known_Esize (Comp)
 
                   Write_Val (Esiz, Paren => True);
 
@@ -679,6 +733,7 @@ package body Repinfo is
             end;
          end if;
 
+      <<Continue>>
          Comp := Next_Entity (Comp);
       end loop;
 
@@ -695,23 +750,46 @@ package body Repinfo is
    begin
       for U in Main_Unit .. Last_Unit loop
          if In_Extended_Main_Source_Unit (Cunit_Entity (U)) then
-            Unit_Casing := Identifier_Casing (Source_Index (U));
-            Write_Eol;
-            Write_Str ("Representation information for unit ");
-            Write_Unit_Name (Unit_Name (U));
-            Col := Column;
-            Write_Eol;
-
-            for J in 1 .. Col - 1 loop
-               Write_Char ('-');
-            end loop;
-
-            Write_Eol;
-            List_Entities (Cunit_Entity (U));
+
+            --  Normal case, list to standard output
+
+            if not List_Representation_Info_To_File then
+               Unit_Casing := Identifier_Casing (Source_Index (U));
+               Write_Eol;
+               Write_Str ("Representation information for unit ");
+               Write_Unit_Name (Unit_Name (U));
+               Col := Column;
+               Write_Eol;
+
+               for J in 1 .. Col - 1 loop
+                  Write_Char ('-');
+               end loop;
+
+               Write_Eol;
+               List_Entities (Cunit_Entity (U));
+
+            --  List representation information to file
+
+            else
+               Creat_Repinfo_File_Access.all (File_Name (Source_Index (U)));
+               Set_Special_Output (Write_Info_Line'Access);
+               List_Entities (Cunit_Entity (U));
+               Set_Special_Output (null);
+               Close_Repinfo_File_Access.all;
+            end if;
          end if;
       end loop;
    end List_Rep_Info;
 
+   ---------------------
+   -- Write_Info_Line --
+   ---------------------
+
+   procedure Write_Info_Line (S : String) is
+   begin
+      Write_Repinfo_Line_Access.all (S (S'First .. S'Last - 1));
+   end Write_Info_Line;
+
    --------------------
    -- List_Type_Info --
    --------------------
@@ -720,46 +798,45 @@ package body Repinfo is
    begin
       Write_Eol;
 
-      --  If Esize and RM_Size are the same and known, list as Size. This
-      --  is a common case, which we may as well list in simple form.
+      --  Do not list size info for unconstrained arrays, not meaningful
+
+      if Is_Array_Type (Ent) and then not Is_Constrained (Ent) then
+         null;
+
+      else
+         --  If Esize and RM_Size are the same and known, list as Size. This
+         --  is a common case, which we may as well list in simple form.
 
-      if Esize (Ent) = RM_Size (Ent) then
-         if Known_Esize (Ent) then
+         if Esize (Ent) = RM_Size (Ent) then
             Write_Str ("for ");
             List_Name (Ent);
             Write_Str ("'Size use ");
             Write_Val (Esize (Ent));
             Write_Line (";");
-         end if;
 
-      --  For now, temporary case, to be removed when gigi properly back
-      --  annotates RM_Size, if RM_Size is not set, then list Esize as
-      --  Size. This avoids odd Object_Size output till we fix things???
+         --  For now, temporary case, to be removed when gigi properly back
+         --  annotates RM_Size, if RM_Size is not set, then list Esize as
+         --  Size. This avoids odd Object_Size output till we fix things???
 
-      elsif Unknown_RM_Size (Ent) then
-         if Known_Esize (Ent) then
+         elsif Unknown_RM_Size (Ent) then
             Write_Str ("for ");
             List_Name (Ent);
             Write_Str ("'Size use ");
             Write_Val (Esize (Ent));
             Write_Line (";");
-         end if;
 
-      --  Otherwise list size values separately if they are set
+         --  Otherwise list size values separately if they are set
 
-      else
-         if Known_Esize (Ent) then
+         else
             Write_Str ("for ");
             List_Name (Ent);
             Write_Str ("'Object_Size use ");
             Write_Val (Esize (Ent));
             Write_Line (";");
-         end if;
 
-         --  Note on following check: The RM_Size of a discrete type can
-         --  legitimately be set to zero, so a special check is needed.
+            --  Note on following check: The RM_Size of a discrete type can
+            --  legitimately be set to zero, so a special check is needed.
 
-         if Known_RM_Size (Ent) or else Is_Discrete_Type (Ent) then
             Write_Str ("for ");
             List_Name (Ent);
             Write_Str ("'Value_Size use ");
@@ -768,13 +845,11 @@ package body Repinfo is
          end if;
       end if;
 
-      if Known_Alignment (Ent) then
-         Write_Str ("for ");
-         List_Name (Ent);
-         Write_Str ("'Alignment use ");
-         Write_Val (Alignment (Ent));
-         Write_Line (";");
-      end if;
+      Write_Str ("for ");
+      List_Name (Ent);
+      Write_Str ("'Alignment use ");
+      Write_Val (Alignment (Ent));
+      Write_Line (";");
    end List_Type_Info;
 
    ----------------------
@@ -1004,15 +1079,31 @@ package body Repinfo is
    procedure Write_Val (Val : Node_Ref_Or_Val; Paren : Boolean := False) is
    begin
       if Rep_Not_Constant (Val) then
-         if List_Representation_Info < 3 then
+         if List_Representation_Info < 3 or else Val = No_Uint then
             Write_Str ("??");
+
          else
             if Back_End_Layout then
                Write_Char (' ');
-               List_GCC_Expression (Val);
+
+               if Paren then
+                  Write_Char ('(');
+                  List_GCC_Expression (Val);
+                  Write_Char (')');
+               else
+                  List_GCC_Expression (Val);
+               end if;
+
                Write_Char (' ');
+
             else
-               Write_Name_Decoded (Chars (Get_Dynamic_SO_Entity (Val)));
+               if Paren then
+                  Write_Char ('(');
+                  Write_Name_Decoded (Chars (Get_Dynamic_SO_Entity (Val)));
+                  Write_Char (')');
+               else
+                  Write_Name_Decoded (Chars (Get_Dynamic_SO_Entity (Val)));
+               end if;
             end if;
          end if;