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, 119 insertions, 167 deletions

diff --git a/gcc/ada/memroot.adb b/gcc/ada/memroot.adb
index 2779476a160..edfce668acd 100644
--- a/gcc/ada/memroot.adb
+++ b/gcc/ada/memroot.adb
@@ -6,7 +6,7 @@
 --                                                                          --
 --                                 B o d y                                  --
 --                                                                          --
---            Copyright (C) 1997-2002 Ada Core Technologies, Inc.           --
+--            Copyright (C) 1997-2003 Ada Core Technologies, 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- --
@@ -20,16 +20,20 @@
 -- MA 02111-1307, USA.                                                      --
 --                                                                          --
 -- GNAT was originally developed  by the GNAT team at  New York University. --
--- It is now maintained by Ada Core Technologies Inc (http://www.gnat.com). --
+-- Extensive contributions were provided by Ada Core Technologies Inc.      --
 --                                                                          --
 ------------------------------------------------------------------------------
 
 with GNAT.Table;
 with GNAT.HTable; use GNAT.HTable;
 with Ada.Text_IO; use Ada.Text_IO;
+with System.Storage_Elements; use System.Storage_Elements;
 
 package body Memroot is
 
+   Main_Name_Id : Name_Id;
+   --  The constant "main" where we should stop the backtraces
+
    -------------
    -- Name_Id --
    -------------
@@ -79,13 +83,14 @@ package body Memroot is
    function Image
      (F       : Frame_Id;
       Max_Fil : Integer;
-      Max_Lin : Integer)
-      return String;
+      Max_Lin : Integer;
+      Short   : Boolean := False) return String;
    --  Returns an image for F containing the file name, the Line number,
-   --  and the subprogram name. When possible, spaces are inserted between
-   --  the line number and the subprogram name in order to align images of the
-   --  same frame. Alignement is cimputed with Max_Fil & Max_Lin representing
-   --  the max number of character in a filename or length in a given frame.
+   --  and if 'Short' is not true, the subprogram name. When possible, spaces
+   --  are inserted between the line number and the subprogram name in order
+   --  to align images of the same frame. Alignement is cimputed with Max_Fil
+   --  & Max_Lin representing the max number of character in a filename or
+   --  length in a given frame.
 
    package Frames is new GNAT.Table (
      Table_Component_Type => Frame,
@@ -94,14 +99,14 @@ package body Memroot is
      Table_Initial        => 400,
      Table_Increment      => 100);
 
-   type Frame_Range is range 1 .. 513;
-   function H (N : Frame) return Frame_Range;
+   type Frame_Range is range 1 .. 10000;
+   function H (N : Integer_Address) return Frame_Range;
 
    package Frame_HTable is new GNAT.HTable.Simple_HTable (
      Header_Num => Frame_Range,
      Element    => Frame_Id,
      No_Element => No_Frame_Id,
-     Key        => Frame,
+     Key        => Integer_Address,
      Hash       => H,
      Equal      => "=");
 
@@ -155,22 +160,19 @@ package body Memroot is
    -- Enter_Frame --
    -----------------
 
-   function Enter_Frame (Name, File, Line : Name_Id) return Frame_Id is
-      Res   : Frame_Id;
-
+   function Enter_Frame
+     (Addr : System.Address;
+      Name : Name_Id;
+      File : Name_Id;
+      Line : Name_Id)
+      return Frame_Id
+   is
    begin
       Frames.Increment_Last;
       Frames.Table (Frames.Last) := Frame'(Name, File, Line);
-      Res := Frame_HTable.Get (Frames.Table (Frames.Last));
-
-      if Res /= No_Frame_Id then
-         Frames.Decrement_Last;
-         return Res;
 
-      else
-         Frame_HTable.Set (Frames.Table (Frames.Last), Frames.Last);
-         return Frames.Last;
-      end if;
+      Frame_HTable.Set (To_Integer (Addr), Frames.Last);
+      return Frames.Last;
    end Enter_Frame;
 
    ----------------
@@ -285,10 +287,9 @@ package body Memroot is
       return H (String (Chars.Table (N.First .. N.Last)));
    end H;
 
-   function H (N : Frame) return Frame_Range is
+   function H (N : Integer_Address) return Frame_Range is
    begin
-      return Frame_Range (1 + (7 * N.Name + 13 * N.File + 17 * N.Line)
-                                mod Frame_Range'Range_Length);
+      return Frame_Range (1 + N mod Frame_Range'Range_Length);
    end H;
 
    ---------------------
@@ -314,9 +315,9 @@ package body Memroot is
    function Image
      (F       : Frame_Id;
       Max_Fil : Integer;
-      Max_Lin : Integer)
-      return String is
-
+      Max_Lin : Integer;
+      Short   : Boolean := False) return String
+   is
       Fram : Frame renames Frames.Table (F);
       Fil  : Name renames Names.Table (Fram.File);
       Lin  : Name renames Names.Table (Fram.Line);
@@ -329,12 +330,18 @@ package body Memroot is
 
       Spaces : constant String (1 .. 80) := (1 .. 80 => ' ');
 
-   begin
-      return String (Chars.Table (Fil.First .. Fil.Last))
+      Result : constant String :=
+        String (Chars.Table (Fil.First .. Fil.Last))
         & ':'
-        & String (Chars.Table (Lin.First .. Lin.Last))
-        & Spaces (1 .. 1 + Max_Fil - Fil_Len + Max_Lin - Lin_Len)
-        & String (Chars.Table (Nam.First .. Nam.Last));
+        & String (Chars.Table (Lin.First .. Lin.Last));
+   begin
+      if Short then
+         return Result;
+      else
+         return Result
+           & Spaces (1 .. 1 + Max_Fil - Fil_Len + Max_Lin - Lin_Len)
+           & String (Chars.Table (Nam.First .. Nam.Last));
+      end if;
    end Image;
 
    -------------
@@ -361,7 +368,7 @@ package body Memroot is
    -- Print_BT --
    --------------
 
-   procedure Print_BT (B  : Root_Id) is
+   procedure Print_BT (B  : Root_Id; Short : Boolean := False) is
       Max_Col_Width : constant := 35;
       --  Largest filename length for which backtraces will be
       --  properly aligned. Frames containing longer names won't be
@@ -392,7 +399,7 @@ package body Memroot is
 
       for J in F'Range loop
          Put ("   ");
-         Put_Line (Image (F (J), Max_Fil, Max_Lin));
+         Put_Line (Image (F (J), Max_Fil, Max_Lin, Short));
       end loop;
    end Print_BT;
 
@@ -400,7 +407,7 @@ package body Memroot is
    -- Read_BT --
    -------------
 
-   function Read_BT (BT_Depth : Integer; FT : File_Type) return Root_Id is
+   function Read_BT (BT_Depth : Integer) return Root_Id is
       Max_Line : constant Integer := 500;
       Curs1    : Integer;
       Curs2    : Integer;
@@ -411,9 +418,11 @@ package body Memroot is
       Nam      : Name_Id;
       Fil      : Name_Id;
       Lin      : Name_Id;
-
-      No_File    : Boolean := False;
+      Add      : System.Address;
+      Int_Add  : Integer_Address;
+      Fr       : Frame_Id;
       Main_Found : Boolean := False;
+      pragma Warnings (Off, Line);
 
       procedure Find_File;
       --  Position Curs1 and Curs2 so that Line (Curs1 .. Curs2) contains
@@ -430,79 +439,32 @@ package body Memroot is
       --  Position Curs1 and Curs2 so that Line (Curs1 .. Curs2) contains
       --  the subprogram name.
 
-      procedure Gmem_Read_BT_Frame (Buf : out String; Last : out Natural);
-      --  GMEM functionality binding
+      function Skip_To_Space (Pos : Integer) return Integer;
+      --  Scans Line starting with position Pos, returning the position
+      --  immediately before the first space, or the value of Last if no
+      --  spaces were found
+
+
+      pragma Inline (Find_File, Find_Line, Find_Name, Skip_To_Space);
 
       ---------------
       -- Find_File --
       ---------------
 
       procedure Find_File is
-         Match_Parent : Integer;
-
       begin
-         --  Skip parameters
-
-         Curs1 := Curs2 + 3;
-         Match_Parent := 1;
-         while Curs1 <= Last loop
-            if Line (Curs1) = '(' then
-               Match_Parent := Match_Parent + 1;
-            elsif Line (Curs1) = ')' then
-               Match_Parent := Match_Parent - 1;
-               exit when Match_Parent = 0;
-            end if;
-
-            Curs1 := Curs1 + 1;
-         end loop;
-
          --  Skip " at "
 
-         Curs1 := Curs1 + 5;
-
-         if Curs1 >= Last then
-
-            --  Maybe the file reference is on one of the next lines
-
-            Read : loop
-               Get_Line (FT, Line, Last);
-
-               --  If we have another Frame or if the backtrace is finished
-               --  the file reference was just missing
-
-               if Last <= 1 or else Line (1) = '#' then
-                  No_File := True;
-                  Curs2 := Curs1 - 1;
-                  return;
-
-               else
-                  Curs1 := 1;
-                  while Curs1 <= Last - 2 loop
-                     if Line (Curs1) = '(' then
-                        Match_Parent := Match_Parent + 1;
-                     elsif Line (Curs1) = ')' then
-                        Match_Parent := Match_Parent - 1;
-                     end if;
-
-                     if Match_Parent = 0
-                       and then Line (Curs1 .. Curs1 + 1) = "at"
-                     then
-                        Curs1 := Curs1 + 3;
-                        exit Read;
-                     end if;
-
-                     Curs1 := Curs1 + 1;
-                  end loop;
-               end if;
-            end loop Read;
-         end if;
+         Curs1 := Curs2 + 5;
+         Curs2 := Last;
 
-         --  Let's assume that the filename length is greater than 1
-         --  it simplifies dealing with the potential drive ':' on
-         --  windows systems
+         --  Scan backwards from end of line until ':' is encountered
 
-         Curs2 := Curs1 + 1;
-         while Line (Curs2 + 1) /= ':' loop Curs2 := Curs2 + 1; end loop;
+         for J in reverse Curs1 .. Last loop
+            if Line (J) = ':' then
+               Curs2 := J - 1;
+            end if;
+         end loop;
       end Find_File;
 
       ---------------
@@ -513,8 +475,12 @@ package body Memroot is
       begin
          Curs1 := Curs2 + 2;
          Curs2 := Last;
-         if Curs2 - Curs1 > 5 then
-            raise Constraint_Error;
+
+         --  Check for Curs1 too large. Should never happen with non-corrupt
+         --  output. If it does happen, just reset it to the highest value.
+
+         if Curs1 > Last then
+            Curs1 := Last;
          end if;
       end Find_Line;
 
@@ -524,93 +490,78 @@ package body Memroot is
 
       procedure Find_Name is
       begin
-         Curs1 := 3;
-
-         --  Skip Frame #
+         --  Skip the address value and " in "
 
-         while Line (Curs1) /= ' ' loop Curs1 := Curs1 + 1; end loop;
-
-         --  Skip spaces
-
-         while Line (Curs1)  = ' ' loop Curs1 := Curs1 + 1; end loop;
-
-         Curs2 := Curs1;
-         while Line (Curs2 + 1) /= ' ' loop Curs2 := Curs2 + 1; end loop;
+         Curs1 := Skip_To_Space (1) + 5;
+         Curs2 := Skip_To_Space (Curs1);
       end Find_Name;
 
-      ------------------------
-      -- Gmem_Read_BT_Frame --
-      ------------------------
-
-      procedure Gmem_Read_BT_Frame (Buf : out String; Last : out Natural) is
-         procedure Read_BT_Frame (buf : System.Address);
-         pragma Import (C, Read_BT_Frame, "__gnat_gmem_read_bt_frame");
+      -------------------
+      -- Skip_To_Space --
+      -------------------
 
-         function Strlen (chars : System.Address) return Natural;
-         pragma Import (C, Strlen, "strlen");
-
-         S :  String (1 .. 1000);
+      function Skip_To_Space (Pos : Integer) return Integer is
       begin
-         Read_BT_Frame (S'Address);
-         Last := Strlen (S'Address);
-         Buf (1 .. Last) := S (1 .. Last);
-      end Gmem_Read_BT_Frame;
+         for Cur in Pos .. Last loop
+            if Line (Cur) = ' ' then
+               return Cur - 1;
+            end if;
+         end loop;
+
+         return Last;
+      end Skip_To_Space;
+
+      procedure Gmem_Read_Next_Frame (Addr : out System.Address);
+      pragma Import (C, Gmem_Read_Next_Frame, "__gnat_gmem_read_next_frame");
+      --  Read the next frame in the current traceback. Addr is set to 0 if
+      --  there are no more addresses in this traceback. The pointer is moved
+      --  to the next frame.
+
+      procedure Gmem_Symbolic
+        (Addr : System.Address; Buf : String; Last : out Natural);
+      pragma Import (C, Gmem_Symbolic, "__gnat_gmem_symbolic");
+      --  Get the symbolic traceback for Addr. Note: we cannot use
+      --  GNAT.Tracebacks.Symbolic, since the latter will only work with the
+      --  current executable.
+      --
+      --  "__gnat_gmem_symbolic" will work with the executable whose name is
+      --  given in gnat_argv[0], as initialized by Gnatmem.Gmem_A21_Initialize.
 
    --  Start of processing for Read_BT
 
    begin
+      while F <= BT_Depth and then not Main_Found loop
+         Gmem_Read_Next_Frame (Add);
+         Int_Add := To_Integer (Add);
+         exit when Int_Add = 0;
 
-      if Gmem_Mode then
-         Gmem_Read_BT_Frame (Line, Last);
-      else
-         Line (1) := ' ';
-         while Line (1) /= '#' loop
-               Get_Line (FT, Line, Last);
-         end loop;
-      end if;
+         Fr := Frame_HTable.Get (Int_Add);
 
-      while Last >= 1 and then Line (1) = '#' and then not Main_Found loop
-         if F <= BT_Depth then
+         if Fr = No_Frame_Id then
+            Gmem_Symbolic (Add, Line, Last);
+            Last := Last - 1; -- get rid of the trailing line-feed
             Find_Name;
+
             --  Skip the __gnat_malloc frame itself
+
             if Line (Curs1 .. Curs2) /= "<__gnat_malloc>" then
                Nam := Enter_Name (Line (Curs1 .. Curs2));
-               Main_Found := Line (Curs1 .. Curs2) = "main";
+               Main_Found := (Nam = Main_Name_Id);
 
                Find_File;
+               Fil := Enter_Name (Line (Curs1 .. Curs2));
+               Find_Line;
+               Lin := Enter_Name (Line (Curs1 .. Curs2));
 
-               if No_File then
-                  Fil := No_Name_Id;
-                  Lin := No_Name_Id;
-               else
-                  Fil := Enter_Name (Line (Curs1 .. Curs2));
-
-                  Find_Line;
-                  Lin := Enter_Name (Line (Curs1 .. Curs2));
-               end if;
-
-               Frames (F) := Enter_Frame (Nam, Fil, Lin);
+               Frames (F) := Enter_Frame (Add, Nam, Fil, Lin);
                F := F + 1;
             end if;
-         end if;
-
-         if No_File then
-
-            --  If no file reference was found, the next line has already
-            --  been read because, it may sometimes be found on the next
-            --  line
-
-            No_File := False;
 
          else
-            if Gmem_Mode then
-               Gmem_Read_BT_Frame (Line, Last);
-            else
-               Get_Line (FT, Line, Last);
-               exit when End_Of_File (FT);
-            end if;
+            Frames (F) := Fr;
+            Main_Found := (Memroot.Frames.Table (Fr).Name = Main_Name_Id);
+            F := F + 1;
          end if;
-
       end loop;
 
       return Enter_Root (Frames (1 .. F - 1));
@@ -661,4 +612,5 @@ begin
 
    Names.Increment_Last;
    Names.Table (Names.Last) := Name'(1, 0);
+   Main_Name_Id := Enter_Name ("main");
 end Memroot;