2003-10-21 Arnaud Charlet <charlet@act-europe.fr>

	* 3psoccon.ads, 3veacodu.adb, 3vexpect.adb, 3vsoccon.ads,
	3vsocthi.adb, 3vsocthi.ads, 3vtrasym.adb, 3zsoccon.ads,
	3zsocthi.adb, 3zsocthi.ads, 50system.ads, 51system.ads,
	55system.ads, 56osinte.adb, 56osinte.ads, 56taprop.adb,
	56taspri.ads, 56tpopsp.adb, 57system.ads, 58system.ads,
	59system.ads, 5aml-tgt.adb, 5bml-tgt.adb, 5csystem.ads,
	5dsystem.ads, 5fosinte.adb, 5gml-tgt.adb, 5hml-tgt.adb,
	5isystem.ads, 5lparame.adb, 5msystem.ads, 5psystem.ads,
	5sml-tgt.adb, 5sosprim.adb, 5stpopsp.adb, 5tsystem.ads,
	5usystem.ads, 5vml-tgt.adb, 5vsymbol.adb, 5vtraent.adb,
	5vtraent.ads, 5wml-tgt.adb, 5xparame.ads, 5xsystem.ads,
	5xvxwork.ads, 5yparame.ads, 5ytiitho.adb, 5zinit.adb,
	5zml-tgt.adb, 5zparame.ads, 5ztaspri.ads, 5ztfsetr.adb,
	5zthrini.adb, 5ztiitho.adb, 5ztpopsp.adb, 7stfsetr.adb,
	7straces.adb, 7strafor.adb, 7strafor.ads, 7stratas.adb,
	a-excach.adb, a-exexda.adb, a-exexpr.adb, a-exextr.adb,
	a-exstat.adb, a-strsup.adb, a-strsup.ads, a-stwisu.adb,
	a-stwisu.ads, bld.adb, bld.ads, bld-io.adb,
	bld-io.ads, clean.adb, clean.ads, ctrl_c.c,
	erroutc.adb, erroutc.ads, errutil.adb, errutil.ads,
	err_vars.ads, final.c, g-arrspl.adb, g-arrspl.ads,
	g-boubuf.adb, g-boubuf.ads, g-boumai.ads, g-bubsor.adb,
	g-bubsor.ads, g-comver.adb, g-comver.ads, g-ctrl_c.ads,
	g-dynhta.adb, g-dynhta.ads, g-eacodu.adb, g-excact.adb,
	g-excact.ads, g-heasor.adb, g-heasor.ads, g-memdum.adb,
	g-memdum.ads, gnatclean.adb, gnatsym.adb, g-pehage.adb,
	g-pehage.ads, g-perhas.ads, gpr2make.adb, gpr2make.ads,
	gprcmd.adb, gprep.adb, gprep.ads, g-semaph.adb,
	g-semaph.ads, g-string.adb, g-string.ads, g-strspl.ads,
	g-wistsp.ads, i-vthrea.adb, i-vthrea.ads, i-vxwoio.adb,
	i-vxwoio.ads, Makefile.generic, Makefile.prolog, Makefile.rtl,
	prep.adb, prep.ads, prepcomp.adb, prepcomp.ads,
	prj-err.adb, prj-err.ads, s-boarop.ads, s-carsi8.adb,
	s-carsi8.ads, s-carun8.adb, s-carun8.ads, s-casi16.adb,
	s-casi16.ads, s-casi32.adb, s-casi32.ads, s-casi64.adb,
	s-casi64.ads, s-casuti.adb, s-casuti.ads, s-caun16.adb,
	s-caun16.ads, s-caun32.adb, s-caun32.ads, s-caun64.adb,
	s-caun64.ads, scng.adb, scng.ads, s-exnint.adb,
	s-exnllf.adb, s-exnlli.adb, s-expint.adb, s-explli.adb,
	s-geveop.adb, s-geveop.ads, s-hibaen.ads, s-htable.adb,
	s-htable.ads, sinput-c.adb, sinput-c.ads, s-memcop.ads,
	socket.c, s-purexc.ads, s-scaval.adb, s-stopoo.adb,
	s-strcom.adb, s-strcom.ads, s-strxdr.adb, s-rident.ads,
	s-thread.adb, s-thread.ads, s-tpae65.adb, s-tpae65.ads,
	s-tporft.adb, s-traent.adb, s-traent.ads, styleg.adb,
	styleg.ads, styleg-c.adb, styleg-c.ads, s-veboop.adb,
	s-veboop.ads, s-vector.ads, symbols.adb, symbols.ads,
	tb-alvms.c, tb-alvxw.c, tempdir.adb, tempdir.ads,
	vms_conv.ads, vms_conv.adb, vms_data.ads,
	vxaddr2line.adb: Files added. Merge with ACT tree.

	* 4dintnam.ads, 4mintnam.ads, 4uintnam.ads, 52system.ads,
	5dosinte.ads, 5etpopse.adb, 5mosinte.ads, 5qosinte.adb,
	5qosinte.ads, 5qstache.adb, 5qtaprop.adb, 5qtaspri.ads,
	5stpopse.adb, 5uintman.adb, 5uosinte.ads, adafinal.c,
	g-enblsp.adb, io-aux.c, scn-nlit.adb, scn-slit.adb,
	s-exnflt.ads, s-exngen.adb, s-exngen.ads, s-exnlfl.ads,
	s-exnlin.ads, s-exnsfl.ads, s-exnsin.ads, s-exnssi.ads,
	s-expflt.ads, s-expgen.adb, s-expgen.ads, s-explfl.ads,
	s-explin.ads, s-expllf.ads, s-expsfl.ads, s-expsin.ads,
	s-expssi.ads, style.adb: Files removed. Merge with ACT tree.

	* 1ic.ads, 31soccon.ads, 31soliop.ads, 3asoccon.ads,
	3bsoccon.ads, 3gsoccon.ads, 3hsoccon.ads, 3ssoccon.ads,
	3ssoliop.ads, 3wsoccon.ads, 3wsocthi.adb, 3wsocthi.ads,
	3wsoliop.ads, 41intnam.ads, 42intnam.ads, 4aintnam.ads,
	4cintnam.ads, 4gintnam.ads, 4hexcpol.adb, 4hintnam.ads,
	4lintnam.ads, 4nintnam.ads, 4ointnam.ads, 4onumaux.ads,
	4pintnam.ads, 4sintnam.ads, 4vcaldel.adb, 4vcalend.adb,
	4vintnam.ads, 4wexcpol.adb, 4wintnam.ads, 4zintnam.ads,
	51osinte.adb, 51osinte.ads, 52osinte.adb, 52osinte.ads,
	53osinte.ads, 54osinte.ads, 5aosinte.adb, 5aosinte.ads,
	5asystem.ads, 5ataprop.adb, 5atasinf.ads, 5ataspri.ads,
	5atpopsp.adb, 5avxwork.ads, 5bosinte.adb, 5bosinte.ads,
	5bsystem.ads, 5cosinte.ads, 5esystem.ads, 5fintman.adb,
	5fosinte.ads, 5fsystem.ads, 5ftaprop.adb, 5ftasinf.ads,
	5ginterr.adb, 5gintman.adb, 5gmastop.adb, 5gosinte.ads,
	5gproinf.ads, 5gsystem.ads, 5gtaprop.adb, 5gtasinf.ads,
	5gtpgetc.adb, 5hosinte.adb, 5hosinte.ads, 5hsystem.ads,
	5htaprop.adb, 5htaspri.ads, 5htraceb.adb, 5iosinte.adb,
	5itaprop.adb, 5itaspri.ads, 5ksystem.ads, 5kvxwork.ads,
	5lintman.adb, 5lml-tgt.adb, 5losinte.ads, 5lsystem.ads,
	5mvxwork.ads, 5ninmaop.adb, 5nintman.adb, 5nosinte.ads,
	5ntaprop.adb, 5ntaspri.ads, 5ointerr.adb, 5omastop.adb,
	5oosinte.adb, 5oosinte.ads, 5oosprim.adb, 5oparame.adb,
	5osystem.ads, 5otaprop.adb, 5otaspri.ads, 5posinte.ads,
	5posprim.adb, 5pvxwork.ads, 5sintman.adb, 5sosinte.adb,
	5sosinte.ads, 5ssystem.ads, 5staprop.adb, 5stasinf.ads,
	5staspri.ads, 5svxwork.ads, 5tosinte.ads, 5vasthan.adb,
	5vinmaop.adb, 5vinterr.adb, 5vintman.adb, 5vintman.ads,
	5vmastop.adb, 5vosinte.adb, 5vosinte.ads, 5vosprim.adb,
	5vsystem.ads, 5vtaprop.adb, 5vtaspri.ads, 5vtpopde.adb,
	5vtpopde.ads, 5wgloloc.adb, 5wintman.adb, 5wmemory.adb,
	5wosprim.adb, 5wsystem.ads, 5wtaprop.adb, 5wtaspri.ads,
	5ysystem.ads, 5zinterr.adb, 5zintman.adb, 5zosinte.adb,
	5zosinte.ads, 5zosprim.adb, 5zsystem.ads, 5ztaprop.adb,
	6vcpp.adb, 6vcstrea.adb, 6vinterf.ads, 7sinmaop.adb,
	7sintman.adb, 7sosinte.adb, 7sosprim.adb, 7staprop.adb,
	7staspri.ads, 7stpopsp.adb, 7straceb.adb, 9drpc.adb,
	a-caldel.adb, a-caldel.ads, a-charac.ads, a-colien.ads,
	a-comlin.adb, adaint.c, adaint.h, ada-tree.def,
	a-diocst.adb, a-diocst.ads, a-direio.adb, a-except.adb,
	a-except.ads, a-excpol.adb, a-exctra.adb, a-exctra.ads,
	a-filico.adb, a-interr.adb, a-intsig.adb, a-intsig.ads,
	ali.adb, ali.ads, ali-util.adb, ali-util.ads,
	a-ngcefu.adb, a-ngcoty.adb, a-ngelfu.adb, a-nudira.adb,
	a-nudira.ads, a-nuflra.adb, a-nuflra.ads, a-reatim.adb,
	a-reatim.ads, a-retide.ads, a-sequio.adb, a-siocst.adb,
	a-siocst.ads, a-ssicst.adb, a-ssicst.ads, a-strbou.adb,
	a-strbou.ads, a-strfix.adb, a-strmap.adb, a-strsea.ads,
	a-strunb.adb, a-strunb.ads, a-ststio.adb, a-stunau.adb,
	a-stunau.ads, a-stwibo.adb, a-stwibo.ads, a-stwifi.adb,
	a-stwima.adb, a-stwiun.adb, a-stwiun.ads, a-tags.adb,
	a-tags.ads, a-tasatt.adb, a-taside.adb, a-teioed.adb,
	a-textio.adb, a-textio.ads, a-tienau.adb, a-tifiio.adb,
	a-tiflau.adb, a-tiflio.adb, a-tigeau.adb, a-tigeau.ads,
	a-tiinau.adb, a-timoau.adb, a-tiocst.adb, a-tiocst.ads,
	atree.adb, atree.ads, a-witeio.adb, a-witeio.ads,
	a-wtcstr.adb, a-wtcstr.ads, a-wtdeio.adb, a-wtedit.adb,
	a-wtenau.adb, a-wtflau.adb, a-wtinau.adb, a-wtmoau.adb,
	bcheck.adb, binde.adb, bindgen.adb, bindusg.adb,
	checks.adb, checks.ads, cio.c, comperr.adb,
	comperr.ads, csets.adb, cstand.adb, cstreams.c,
	debug_a.adb, debug_a.ads, debug.adb, decl.c,
	einfo.adb, einfo.ads, errout.adb, errout.ads,
	eval_fat.adb, eval_fat.ads, exp_aggr.adb, expander.adb,
	expander.ads, exp_attr.adb, exp_ch11.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_ch8.adb, exp_ch9.adb, exp_code.adb, exp_dbug.adb,
	exp_dbug.ads, exp_disp.adb, exp_dist.adb, expect.c,
	exp_fixd.adb, exp_imgv.adb, exp_intr.adb, exp_pakd.adb,
	exp_prag.adb, exp_strm.adb, exp_strm.ads, exp_tss.adb,
	exp_tss.ads, exp_util.adb, exp_util.ads, exp_vfpt.adb,
	fe.h, fmap.adb, fmap.ads, fname.adb,
	fname.ads, fname-uf.adb, fname-uf.ads, freeze.adb,
	freeze.ads, frontend.adb, g-awk.adb, g-awk.ads,
	g-busora.adb, g-busora.ads, g-busorg.adb, g-busorg.ads,
	g-casuti.adb, g-casuti.ads, g-catiio.adb, g-catiio.ads,
	g-cgi.adb, g-cgi.ads, g-cgicoo.adb, g-cgicoo.ads,
	g-cgideb.adb, g-cgideb.ads, g-comlin.adb, g-comlin.ads,
	g-crc32.adb, g-crc32.ads, g-debpoo.adb, g-debpoo.ads,
	g-debuti.adb, g-debuti.ads, g-diopit.adb, g-diopit.ads,
	g-dirope.adb, g-dirope.ads, g-dyntab.adb, g-dyntab.ads,
	g-except.ads, g-exctra.adb, g-exctra.ads, g-expect.adb,
	g-expect.ads, g-hesora.adb, g-hesora.ads, g-hesorg.adb,
	g-hesorg.ads, g-htable.adb, g-htable.ads, gigi.h,
	g-io.adb, g-io.ads, g-io_aux.adb, g-io_aux.ads,
	g-locfil.adb, g-locfil.ads, g-md5.adb, g-md5.ads,
	gmem.c, gnat1drv.adb, gnatbind.adb, gnatchop.adb,
	gnatcmd.adb, gnatfind.adb, gnatkr.adb, gnatlbr.adb,
	gnatlink.adb, gnatls.adb, gnatmake.adb, gnatmem.adb,
	gnatname.adb, gnatprep.adb, gnatprep.ads, gnatpsta.adb,
	gnatxref.adb, g-os_lib.adb, g-os_lib.ads, g-regexp.adb,
	g-regexp.ads, g-regist.adb, g-regist.ads, g-regpat.adb,
	g-regpat.ads, g-soccon.ads, g-socket.adb, g-socket.ads,
	g-socthi.adb, g-socthi.ads, g-soliop.ads, g-souinf.ads,
	g-speche.adb, g-speche.ads, g-spipat.adb, g-spipat.ads,
	g-spitbo.adb, g-spitbo.ads, g-sptabo.ads, g-sptain.ads,
	g-sptavs.ads, g-table.adb, g-table.ads, g-tasloc.adb,
	g-tasloc.ads, g-thread.adb, g-thread.ads, g-traceb.adb,
	g-traceb.ads, g-trasym.adb, g-trasym.ads, hostparm.ads,
	i-c.ads, i-cobol.adb, i-cpp.adb, i-cstrea.ads,
	i-cstrin.adb, i-cstrin.ads, impunit.adb, init.c,
	inline.adb, interfac.ads, i-pacdec.ads, itypes.adb,
	itypes.ads, i-vxwork.ads, lang.opt, lang-specs.h,
	layout.adb, lib.adb, lib.ads, lib-list.adb,
	lib-load.adb, lib-load.ads, lib-sort.adb, lib-util.adb,
	lib-writ.adb, lib-writ.ads, lib-xref.adb, lib-xref.ads,
	link.c, live.adb, make.adb, make.ads,
	Makefile.adalib, Makefile.in, Make-lang.in, makeusg.adb,
	mdll.adb, mdll-fil.adb, mdll-fil.ads, mdll-utl.adb,
	mdll-utl.ads, memroot.adb, memroot.ads, memtrack.adb,
	misc.c, mkdir.c, mlib.adb, mlib.ads,
	mlib-fil.adb, mlib-fil.ads, mlib-prj.adb, mlib-prj.ads,
	mlib-tgt.adb, mlib-tgt.ads, mlib-utl.adb, mlib-utl.ads,
	namet.adb, namet.ads, namet.h, nlists.ads,
	nlists.h, nmake.adt, opt.adb, opt.ads,
	osint.adb, osint.ads, osint-b.adb, osint-c.adb,
	par.adb, par-ch10.adb, par-ch11.adb, par-ch2.adb,
	par-ch3.adb, par-ch4.adb, par-ch5.adb, par-ch6.adb,
	par-ch9.adb, par-endh.adb, par-labl.adb, par-load.adb,
	par-prag.adb, par-sync.adb, par-tchk.adb, par-util.adb,
	prj.adb, prj.ads, prj-attr.adb, prj-attr.ads,
	prj-com.adb, prj-com.ads, prj-dect.adb, prj-dect.ads,
	prj-env.adb, prj-env.ads, prj-ext.adb, prj-ext.ads,
	prj-makr.adb, prj-makr.ads, prj-nmsc.adb, prj-nmsc.ads,
	prj-pars.adb, prj-pars.ads, prj-part.adb, prj-part.ads,
	prj-pp.adb, prj-pp.ads, prj-proc.adb, prj-proc.ads,
	prj-strt.adb, prj-strt.ads, prj-tree.adb, prj-tree.ads,
	prj-util.adb, prj-util.ads, raise.c, raise.h,
	repinfo.adb, repinfo.h, restrict.adb, restrict.ads,
	rident.ads, rtsfind.adb, rtsfind.ads, s-addima.ads,
	s-arit64.adb, s-assert.adb, s-assert.ads, s-atacco.adb,
	s-atacco.ads, s-auxdec.adb, s-auxdec.ads, s-bitops.adb,
	scans.ads, scn.adb, scn.ads, s-crc32.adb,
	s-crc32.ads, s-direio.adb, sem.adb, sem.ads,
	sem_aggr.adb, sem_attr.adb, sem_attr.ads, sem_case.adb,
	sem_case.ads, sem_cat.adb, sem_cat.ads, sem_ch10.adb,
	sem_ch11.adb, sem_ch12.adb, sem_ch12.ads, sem_ch13.adb,
	sem_ch13.ads, sem_ch3.adb, sem_ch3.ads, sem_ch4.adb,
	sem_ch5.adb, sem_ch5.ads, sem_ch6.adb, sem_ch6.ads,
	sem_ch7.adb, sem_ch7.ads, sem_ch8.adb, sem_ch8.ads,
	sem_ch9.adb, sem_disp.adb, sem_disp.ads, sem_dist.adb,
	sem_elab.adb, sem_eval.adb, sem_eval.ads, sem_intr.adb,
	sem_maps.adb, sem_mech.adb, sem_prag.adb, sem_prag.ads,
	sem_res.adb, sem_res.ads, sem_type.adb, sem_type.ads,
	sem_util.adb, sem_util.ads, sem_warn.adb, s-errrep.adb,
	s-errrep.ads, s-exctab.adb, s-exctab.ads, s-exnint.ads,
	s-exnllf.ads, s-exnlli.ads, s-expint.ads, s-explli.ads,
	s-expuns.ads, s-fatflt.ads, s-fatgen.adb, s-fatgen.ads,
	s-fatlfl.ads, s-fatllf.ads, s-fatsfl.ads, s-fileio.adb,
	s-fileio.ads, s-finimp.adb, s-finimp.ads, s-finroo.adb,
	s-finroo.ads, sfn_scan.adb, s-gloloc.adb, s-gloloc.ads,
	s-imgdec.adb, s-imgenu.adb, s-imgrea.adb, s-imgwch.adb,
	sinfo.adb, sinfo.ads, s-inmaop.ads, sinput.adb,
	sinput.ads, sinput-d.adb, sinput-l.adb, sinput-l.ads,
	sinput-p.adb, sinput-p.ads, s-interr.adb, s-interr.ads,
	s-intman.ads, s-maccod.ads, s-mastop.adb, s-mastop.ads,
	s-memory.adb, s-memory.ads, snames.adb, snames.ads,
	snames.h, s-osprim.ads, s-parame.ads, s-parint.ads,
	s-pooloc.adb, s-pooloc.ads, s-poosiz.adb, sprint.adb,
	s-proinf.ads, s-scaval.ads, s-secsta.adb, s-secsta.ads,
	s-sequio.adb, s-shasto.adb, s-shasto.ads, s-soflin.ads,
	s-stache.adb, s-stache.ads, s-stalib.adb, s-stalib.ads,
	s-stoele.ads, s-stopoo.ads, s-stratt.adb, s-stratt.ads,
	s-strops.adb, s-strops.ads, 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-taprob.ads,
	s-taprop.ads, s-tarest.adb, s-tarest.ads, s-tasdeb.adb,
	s-tasdeb.ads, s-tasinf.adb, s-tasinf.ads, 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-tasres.ads,
	s-tassta.adb, s-tassta.ads, s-tasuti.adb, s-tasuti.ads,
	s-tataat.adb, s-tataat.ads, s-tpinop.adb, s-tpinop.ads,
	s-tpoben.adb, s-tpoben.ads, s-tpobop.adb, s-tpobop.ads,
	s-tposen.adb, s-tposen.ads, s-traceb.adb, s-traceb.ads,
	stringt.adb, stringt.ads, stringt.h, style.ads,
	stylesw.adb, stylesw.ads, s-unstyp.ads, s-vaflop.ads,
	s-valrea.adb, s-valuti.adb, s-vercon.adb, s-vmexta.adb,
	s-wchcnv.ads, s-wchcon.ads, s-widcha.adb, switch.adb,
	switch.ads, switch-b.adb, switch-c.adb, switch-m.adb,
	s-wwdcha.adb, s-wwdwch.adb, sysdep.c, system.ads,
	table.adb, table.ads, targparm.adb, targparm.ads,
	targtyps.c, tbuild.adb, tbuild.ads, tracebak.c,
	trans.c, tree_io.adb, treepr.adb, treeprs.adt,
	ttypes.ads, types.ads, types.h, uintp.adb,
	uintp.ads, uintp.h, uname.adb, urealp.adb,
	urealp.ads, urealp.h, usage.adb, utils2.c,
	utils.c, validsw.adb, validsw.ads, widechar.adb,
	xeinfo.adb, xnmake.adb, xref_lib.adb, xref_lib.ads,
	xr_tabls.adb, xr_tabls.ads, xtreeprs.adb, xsnames.adb,
	einfo.h, sinfo.h, treeprs.ads, nmake.ads, nmake.adb,
	gnatvsn.ads: Merge with ACT tree.

	* gnatvsn.adb: Rewritten in a simpler and more efficient way.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@72751 138bc75d-0d04-0410-961f-82ee72b054a4

1 files changed, 355 insertions, 75 deletions

diff --git a/gcc/ada/repinfo.adb b/gcc/ada/repinfo.adb
index f7315dbf242..cd4e9db6a71 100644
--- a/gcc/ada/repinfo.adb
+++ b/gcc/ada/repinfo.adb
@@ -6,7 +6,7 @@
 --                                                                          --
 --                                 B o d y                                  --
 --                                                                          --
---          Copyright (C) 1999-2002 Free Software Foundation, Inc.          --
+--          Copyright (C) 1999-2003 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- --
@@ -42,6 +42,8 @@ with Opt;      use Opt;
 with Output;   use Output;
 with Sinfo;    use Sinfo;
 with Sinput;   use Sinput;
+with Snames;   use Snames;
+with Stand;    use Stand;
 with Table;    use Table;
 with Uname;    use Uname;
 with Urealp;   use Urealp;
@@ -52,6 +54,7 @@ package body Repinfo is
    --  Value for Storage_Unit, we do not want to get this from TTypes, since
    --  this introduces problematic dependencies in ASIS, and in any case this
    --  value is assumed to be 8 for the implementation of the DDA.
+
    --  This is wrong for AAMP???
 
    ---------------------------------------
@@ -97,21 +100,27 @@ package body Repinfo is
       Table_Increment      => Alloc.Rep_Table_Increment,
       Table_Name           => "FE_Rep_Table");
 
-   -----------------------
-   -- Local Subprograms --
-   -----------------------
-
    Unit_Casing : Casing_Type;
    --  Identifier casing for current unit
 
-   procedure Spaces (N : Natural);
-   --  Output given number of spaces
+   Need_Blank_Line : Boolean;
+   --  Set True if a blank line is needed before outputting any
+   --  information for the current entity. Set True when a new
+   --  entity is processed, and false when the blank line is output.
+
+   -----------------------
+   -- Local Subprograms --
+   -----------------------
 
    function Back_End_Layout return Boolean;
    --  Test for layout mode, True = back end, False = front end. This
    --  function is used rather than checking the configuration parameter
    --  because we do not want Repinfo to depend on Targparm (for ASIS)
 
+   procedure Blank_Line;
+   --  Called before outputting anything for an entity. Ensures that
+   --  a blank line precedes the output for a particular entity.
+
    procedure List_Entities (Ent : Entity_Id);
    --  This procedure lists the entities associated with the entity E,
    --  starting with the First_Entity and using the Next_Entity link.
@@ -125,6 +134,10 @@ package body Repinfo is
    procedure List_Array_Info (Ent : Entity_Id);
    --  List representation info for array type Ent
 
+   procedure List_Mechanisms (Ent : Entity_Id);
+   --  List mechanism information for parameters of Ent, which is a
+   --  subprogram, subprogram type, or an entry or entry family.
+
    procedure List_Object_Info (Ent : Entity_Id);
    --  List representation info for object Ent
 
@@ -138,6 +151,9 @@ 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 Spaces (N : Natural);
+   --  Output given number of spaces
+
    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.
@@ -146,6 +162,9 @@ package body Repinfo is
    --  to the appropriate routine in Osint requires that the end of line
    --  sequence be stripped off.
 
+   procedure Write_Mechanism (M : Mechanism_Type);
+   --  Writes symbolic string for mechanism represented by M
+
    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
@@ -164,6 +183,18 @@ package body Repinfo is
       return Rep_Table.Last > 0;
    end Back_End_Layout;
 
+   ----------------
+   -- Blank_Line --
+   ----------------
+
+   procedure Blank_Line is
+   begin
+      if Need_Blank_Line then
+         Write_Eol;
+         Need_Blank_Line := False;
+      end if;
+   end Blank_Line;
+
    ------------------------
    -- Create_Discrim_Ref --
    ------------------------
@@ -286,40 +317,104 @@ package body Repinfo is
    -------------------
 
    procedure List_Entities (Ent : Entity_Id) is
-      E : Entity_Id;
+      Body_E : Entity_Id;
+      E      : Entity_Id;
+
+      function Find_Declaration (E : Entity_Id) return Node_Id;
+      --  Utility to retrieve declaration node for entity in the
+      --  case of package bodies and subprograms.
+
+      ----------------------
+      -- Find_Declaration --
+      ----------------------
+
+      function Find_Declaration (E : Entity_Id) return Node_Id is
+         Decl : Node_Id;
+      begin
+         Decl := Parent (E);
+
+         while Present (Decl)
+           and then  Nkind (Decl) /= N_Package_Body
+           and then Nkind (Decl) /= N_Subprogram_Declaration
+           and then Nkind (Decl) /= N_Subprogram_Body
+         loop
+            Decl := Parent (Decl);
+         end loop;
+
+         return Decl;
+      end Find_Declaration;
+
+   --  Start of processing for List_Entities
 
    begin
       if Present (Ent) then
+
+         --  If entity is a subprogram and we are listing mechanisms,
+         --  then we need to list mechanisms for this entity.
+
+         if List_Representation_Info_Mechanisms
+           and then (Is_Subprogram (Ent)
+                       or else Ekind (Ent) = E_Entry
+                       or else Ekind (Ent) = E_Entry_Family)
+         then
+            Need_Blank_Line := True;
+            List_Mechanisms (Ent);
+         end if;
+
          E := First_Entity (Ent);
          while Present (E) loop
+            Need_Blank_Line := True;
 
             --  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 incomplete types or deferred constants, where we will
+            --  list the info for the full view). If debug flag A is set,
+            --  then all entities are listed
+
+            if (Comes_From_Source (E)
+              and then not Is_Incomplete_Or_Private_Type (E)
+              and then not (Ekind (E) = E_Constant
+                              and then Present (Full_View (E))))
               or else Debug_Flag_AA
             then
-               if Is_Record_Type (E) then
-                  List_Record_Info (E);
+               if Is_Subprogram (E)
+                       or else
+                     Ekind (E) = E_Entry
+                       or else
+                     Ekind (E) = E_Entry_Family
+                       or else
+                     Ekind (E) = E_Subprogram_Type
+               then
+                  if List_Representation_Info_Mechanisms then
+                     List_Mechanisms (E);
+                  end if;
+
+               elsif Is_Record_Type (E) then
+                  if List_Representation_Info >= 1 then
+                     List_Record_Info (E);
+                  end if;
 
                elsif Is_Array_Type (E) then
-                  List_Array_Info (E);
+                  if List_Representation_Info >= 1 then
+                     List_Array_Info (E);
+                  end if;
 
-               elsif List_Representation_Info >= 2 then
-                  if Is_Type (E) then
+               elsif Is_Type (E) then
+                  if List_Representation_Info >= 2 then
                      List_Type_Info (E);
+                  end if;
 
-                  elsif Ekind (E) = E_Variable
-                          or else
-                        Ekind (E) = E_Constant
-                          or else
-                        Ekind (E) = E_Loop_Parameter
-                          or else
-                        Is_Formal (E)
-                  then
+               elsif Ekind (E) = E_Variable
+                       or else
+                     Ekind (E) = E_Constant
+                       or else
+                     Ekind (E) = E_Loop_Parameter
+                       or else
+                     Is_Formal (E)
+               then
+                  if List_Representation_Info >= 2 then
                      List_Object_Info (E);
                   end if;
+
                end if;
 
                --  Recurse into nested package, but not if they are
@@ -357,6 +452,35 @@ package body Repinfo is
 
             E := Next_Entity (E);
          end loop;
+
+         --  For a package body, the entities of the visible subprograms
+         --  are declared in the corresponding spec. Iterate over its
+         --  entities in order to handle properly the subprogram bodies.
+         --  Skip bodies in subunits, which are listed independently.
+
+         if Ekind (Ent) = E_Package_Body
+           and then Present (Corresponding_Spec (Find_Declaration (Ent)))
+         then
+            E := First_Entity (Corresponding_Spec (Find_Declaration (Ent)));
+
+            while Present (E) loop
+               if Is_Subprogram (E)
+                 and then
+                   Nkind (Find_Declaration (E)) = N_Subprogram_Declaration
+               then
+                  Body_E := Corresponding_Body (Find_Declaration (E));
+
+                  if Present (Body_E)
+                    and then
+                      Nkind (Parent (Find_Declaration (Body_E))) /= N_Subunit
+                  then
+                     List_Entities (Body_E);
+                  end if;
+               end if;
+
+               Next_Entity (E);
+            end loop;
+         end if;
       end if;
    end List_Entities;
 
@@ -366,10 +490,14 @@ package body Repinfo is
 
    procedure List_GCC_Expression (U : Node_Ref_Or_Val) is
 
-      procedure P (Val : Node_Ref_Or_Val);
+      procedure Print_Expr (Val : Node_Ref_Or_Val);
       --  Internal recursive procedure to print expression
 
-      procedure P (Val : Node_Ref_Or_Val) is
+      ----------------
+      -- Print_Expr --
+      ----------------
+
+      procedure Print_Expr (Val : Node_Ref_Or_Val) is
       begin
          if Val >= 0 then
             UI_Write (Val, Decimal);
@@ -381,26 +509,30 @@ package body Repinfo is
                procedure Binop (S : String);
                --  Output text for binary operator with S being operator name
 
+               -----------
+               -- Binop --
+               -----------
+
                procedure Binop (S : String) is
                begin
                   Write_Char ('(');
-                  P (Node.Op1);
+                  Print_Expr (Node.Op1);
                   Write_Str (S);
-                  P (Node.Op2);
+                  Print_Expr (Node.Op2);
                   Write_Char (')');
                end Binop;
 
-            --  Start of processing for P
+            --  Start of processing for Print_Expr
 
             begin
                case Node.Expr is
                   when Cond_Expr =>
                      Write_Str ("(if ");
-                     P (Node.Op1);
+                     Print_Expr (Node.Op1);
                      Write_Str (" then ");
-                     P (Node.Op2);
+                     Print_Expr (Node.Op2);
                      Write_Str (" else ");
-                     P (Node.Op3);
+                     Print_Expr (Node.Op3);
                      Write_Str (" end)");
 
                   when Plus_Expr =>
@@ -435,7 +567,7 @@ package body Repinfo is
 
                   when Negate_Expr =>
                      Write_Char ('-');
-                     P (Node.Op1);
+                     Print_Expr (Node.Op1);
 
                   when Min_Expr =>
                      Binop (" min ");
@@ -445,7 +577,7 @@ package body Repinfo is
 
                   when Abs_Expr =>
                      Write_Str ("abs ");
-                     P (Node.Op1);
+                     Print_Expr (Node.Op1);
 
                   when Truth_Andif_Expr =>
                      Binop (" and if ");
@@ -464,7 +596,7 @@ package body Repinfo is
 
                   when Truth_Not_Expr =>
                      Write_Str ("not ");
-                     P (Node.Op1);
+                     Print_Expr (Node.Op1);
 
                   when Lt_Expr =>
                      Binop (" < ");
@@ -491,7 +623,7 @@ package body Repinfo is
                end case;
             end;
          end if;
-      end P;
+      end Print_Expr;
 
    --  Start of processing for List_GCC_Expression
 
@@ -499,10 +631,105 @@ package body Repinfo is
       if U = No_Uint then
          Write_Str ("??");
       else
-         P (U);
+         Print_Expr (U);
       end if;
    end List_GCC_Expression;
 
+   ---------------------
+   -- List_Mechanisms --
+   ---------------------
+
+   procedure List_Mechanisms (Ent : Entity_Id) is
+      Plen : Natural;
+      Form : Entity_Id;
+
+   begin
+      Blank_Line;
+
+      case Ekind (Ent) is
+         when E_Function =>
+            Write_Str ("function ");
+
+         when E_Operator =>
+            Write_Str ("operator ");
+
+         when E_Procedure =>
+            Write_Str ("procedure ");
+
+         when E_Subprogram_Type =>
+            Write_Str ("type ");
+
+         when E_Entry | E_Entry_Family =>
+            Write_Str ("entry ");
+
+         when others =>
+            raise Program_Error;
+      end case;
+
+      Get_Unqualified_Decoded_Name_String (Chars (Ent));
+      Write_Str (Name_Buffer (1 .. Name_Len));
+      Write_Str (" declared at ");
+      Write_Location (Sloc (Ent));
+      Write_Eol;
+
+      Write_Str ("  convention : ");
+
+      case Convention (Ent) is
+         when Convention_Ada       => Write_Line ("Ada");
+         when Convention_Intrinsic => Write_Line ("InLineinsic");
+         when Convention_Entry     => Write_Line ("Entry");
+         when Convention_Protected => Write_Line ("Protected");
+         when Convention_Assembler => Write_Line ("Assembler");
+         when Convention_C         => Write_Line ("C");
+         when Convention_COBOL     => Write_Line ("COBOL");
+         when Convention_CPP       => Write_Line ("C++");
+         when Convention_Fortran   => Write_Line ("Fortran");
+         when Convention_Java      => Write_Line ("Java");
+         when Convention_Stdcall   => Write_Line ("Stdcall");
+         when Convention_Stubbed   => Write_Line ("Stubbed");
+      end case;
+
+      --  Find max length of formal name
+
+      Plen := 0;
+      Form := First_Formal (Ent);
+      while Present (Form) loop
+         Get_Unqualified_Decoded_Name_String (Chars (Form));
+
+         if Name_Len > Plen then
+            Plen := Name_Len;
+         end if;
+
+         Next_Formal (Form);
+      end loop;
+
+      --  Output formals and mechanisms
+
+      Form := First_Formal (Ent);
+      while Present (Form) loop
+         Get_Unqualified_Decoded_Name_String (Chars (Form));
+
+         while Name_Len <= Plen loop
+            Name_Len := Name_Len + 1;
+            Name_Buffer (Name_Len) := ' ';
+         end loop;
+
+         Write_Str ("  ");
+         Write_Str (Name_Buffer (1 .. Plen + 1));
+         Write_Str (": passed by ");
+
+         Write_Mechanism (Mechanism (Form));
+         Write_Eol;
+         Next_Formal (Form);
+      end loop;
+
+      if Etype (Ent) /= Standard_Void_Type then
+         Write_Str ("  returns by ");
+         Write_Mechanism (Mechanism (Ent));
+         Write_Eol;
+      end if;
+   end List_Mechanisms;
+
    ---------------
    -- List_Name --
    ---------------
@@ -525,7 +752,7 @@ package body Repinfo is
 
    procedure List_Object_Info (Ent : Entity_Id) is
    begin
-      Write_Eol;
+      Blank_Line;
 
       Write_Str ("for ");
       List_Name (Ent);
@@ -546,7 +773,6 @@ package body Repinfo is
 
    procedure List_Record_Info (Ent : Entity_Id) is
       Comp  : Entity_Id;
-      Esiz  : Uint;
       Cfbit : Uint;
       Sunit : Uint;
 
@@ -554,6 +780,7 @@ package body Repinfo is
       Max_Suni_Length : Natural;
 
    begin
+      Blank_Line;
       List_Type_Info (Ent);
 
       Write_Str ("for ");
@@ -585,7 +812,6 @@ package body Repinfo is
                Set_Normalized_Position (Comp, Cfbit / SSU);
                Set_Normalized_First_Bit (Comp, Cfbit mod SSU);
 
-               Esiz  := Esize (Comp);
                Sunit := Cfbit / SSU;
                UI_Image (Sunit);
             end if;
@@ -746,55 +972,55 @@ package body Repinfo is
       Col : Nat;
 
    begin
-      for U in Main_Unit .. Last_Unit loop
-         if In_Extended_Main_Source_Unit (Cunit_Entity (U)) then
+      if Debug_Flag_AA then
+         List_Representation_Info := 3;
+         List_Representation_Info_Mechanisms := True;
+      end if;
 
-            --  Normal case, list to standard output
+      if List_Representation_Info /= 0
+        or else List_Representation_Info_Mechanisms
+      then
+         for U in Main_Unit .. Last_Unit loop
+            if In_Extended_Main_Source_Unit (Cunit_Entity (U)) then
 
-            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;
+               --  Normal case, list to standard output
 
-               for J in 1 .. Col - 1 loop
-                  Write_Char ('-');
-               end loop;
+               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));
+                  Write_Eol;
+                  List_Entities (Cunit_Entity (U));
 
-            --  List representation information to file
+               --  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;
+               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 if;
-      end loop;
+         end loop;
+      end if;
    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 --
    --------------------
 
    procedure List_Type_Info (Ent : Entity_Id) is
    begin
-      Write_Eol;
+      Blank_Line;
 
       --  Do not list size info for unconstrained arrays, not meaningful
 
@@ -1070,6 +1296,60 @@ package body Repinfo is
       Rep_Table.Tree_Write;
    end Tree_Write;
 
+   ---------------------
+   -- 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;
+
+   ---------------------
+   -- Write_Mechanism --
+   ---------------------
+
+   procedure Write_Mechanism (M : Mechanism_Type) is
+   begin
+      case M is
+         when 0 =>
+            Write_Str ("default");
+
+         when -1 =>
+            Write_Str ("copy");
+
+         when -2 =>
+            Write_Str ("reference");
+
+         when -3 =>
+            Write_Str ("descriptor");
+
+         when -4 =>
+            Write_Str ("descriptor (UBS)");
+
+         when -5 =>
+            Write_Str ("descriptor (UBSB)");
+
+         when -6 =>
+            Write_Str ("descriptor (UBA)");
+
+         when -7 =>
+            Write_Str ("descriptor (S)");
+
+         when -8 =>
+            Write_Str ("descriptor (SB)");
+
+         when -9 =>
+            Write_Str ("descriptor (A)");
+
+         when -10 =>
+            Write_Str ("descriptor (NCA)");
+
+         when others =>
+            raise Program_Error;
+      end case;
+   end Write_Mechanism;
+
    ---------------
    -- Write_Val --
    ---------------