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, 80 insertions, 483 deletions

diff --git a/gcc/ada/s-tasdeb.adb b/gcc/ada/s-tasdeb.adb
index c437117bc47..f8f50b9a1bb 100644
--- a/gcc/ada/s-tasdeb.adb
+++ b/gcc/ada/s-tasdeb.adb
@@ -27,21 +27,21 @@
 -- covered by the  GNU Public License.                                      --
 --                                                                          --
 -- GNARL was developed by the GNARL team at Florida State University.       --
--- Extensive contributions were provided by Ada Core Technologies Inc.      --
+-- Extensive contributions were provided by Ada Core Technologies, Inc.     --
 --                                                                          --
 ------------------------------------------------------------------------------
 
 --  This package encapsulates all direct interfaces to task debugging services
---  that are needed by gdb with gnat mode (1.13 and higher)
+--  that are needed by gdb with gnat mode.
 
 --  Note : This file *must* be compiled with debugging information
 
 --  Do not add any dependency to GNARL packages since this package is used
 --  in both normal and restricted (ravenscar) environments.
 
-with System.Task_Info,
-     System.Task_Primitives.Operations,
-     Unchecked_Conversion;
+with Interfaces.C;
+with System.Task_Primitives.Operations;
+with Unchecked_Conversion;
 
 package body System.Tasking.Debug is
 
@@ -49,25 +49,8 @@ package body System.Tasking.Debug is
 
    package STPO renames System.Task_Primitives.Operations;
 
-   type Integer_Address is mod 2 ** Standard'Address_Size;
-
-   function "+" is new
-     Unchecked_Conversion (Task_ID, Integer_Address);
-
-   Hex_Address_Width : constant := (Standard'Address_Size / 4);
-
-   Hex_Digits : constant array (0 .. Integer_Address'(15)) of Character :=
-                  "0123456789abcdef";
-
-   subtype Buf_Range is Integer range 1 .. 80;
-   type Buf_Array is array (Buf_Range) of aliased Character;
-
-   type Buffer is record
-      Next  : Buf_Range := Buf_Range'First;
-      Chars : Buf_Array := (Buf_Range => ' ');
-   end record;
-
-   type Buffer_Ptr is access all Buffer;
+   function To_Integer is new
+     Unchecked_Conversion (Task_ID, System.Address);
 
    type Trace_Flag_Set is array (Character) of Boolean;
 
@@ -77,98 +60,31 @@ package body System.Tasking.Debug is
    -- Local Subprograms --
    -----------------------
 
-   procedure Put
-     (T      : ST.Task_ID;
-      Width  : Integer;
-      Buffer : Buffer_Ptr);
-   --  Put TCB pointer T, (coded in hexadecimal) into Buffer
-   --  right-justified in Width characters.
-
-   procedure Put
-     (N      : Integer_Address;
-      Width  : Integer;
-      Buffer : Buffer_Ptr);
-   --  Put N (coded in decimal) into Buf right-justified in Width
-   --  characters starting at Buf (Next).
-
-   procedure Put
-     (S      : String;
-      Width  : Integer;
-      Buffer : Buffer_Ptr);
-   --  Put string S into Buf left-justified in Width characters
-   --  starting with space in Buf (Next), truncated as necessary.
-
-   procedure Put
-     (C      : Character;
-      Buffer : Buffer_Ptr);
-   --  Put character C into Buf, left-justified, starting at Buf (Next)
-
-   procedure Space (Buffer : Buffer_Ptr);
-   --  Increment Next, resulting in a space
-
-   procedure Space
-     (N      : Integer;
-      Buffer : Buffer_Ptr);
-   --  Increment Next by N, resulting in N spaces
-
-   procedure Clear (Buffer : Buffer_Ptr);
-   --  Clear Buf and reset Next to 1
-
-   procedure Write_Buf (Buffer : Buffer_Ptr);
-   --  Write contents of Buf (1 .. Next) to standard output
-
-   -----------
-   -- Clear --
-   -----------
-
-   procedure Clear (Buffer : Buffer_Ptr) is
-      Next : Buf_Range renames Buffer.Next;
-      Buf  : Buf_Array renames Buffer.Chars;
-
-   begin
-      Buf := (Buf_Range => ' ');
-      Next := 1;
-   end Clear;
+   procedure write (Fd : Integer; S : String; Count : size_t);
+   pragma Import (C, write);
 
-   -----------
-   -- Image --
-   -----------
+   procedure Put (S : String);
+   --  Display S on standard output.
 
-   function Image (T : ST.Task_ID) return String is
-      Buf    : aliased Buffer;
-      Result : String (1 .. Hex_Address_Width + 21);
+   procedure Put_Line (S : String := "");
+   --  Display S on standard output with an additional line terminator.
 
-      use type System.Task_Info.Task_Image_Type;
+   --------------------
+   -- Get_User_State --
+   --------------------
 
+   function Get_User_State return Long_Integer is
    begin
-      Clear (Buf'Unchecked_Access);
-      Put (T, Hex_Address_Width, Buf'Unchecked_Access);
-      Put (':', Buf'Unchecked_Access);
-      Put (Integer_Address (T.Serial_Number), 4, Buf'Unchecked_Access);
-      Space (Buf'Unchecked_Access);
-
-      if T.Common.Task_Image = null then
-         Put ("", 15, Buf'Unchecked_Access);
-      else
-         Put (T.Common.Task_Image.all, 15, Buf'Unchecked_Access);
-      end if;
-
-      for J in Result'Range loop
-         Result (J) := Buf.Chars (J);
-      end loop;
-
-      return Result;
-   end Image;
+      return STPO.Self.User_State;
+   end Get_User_State;
 
    ----------------
    -- List_Tasks --
    ----------------
 
    procedure List_Tasks is
-      C : ST.Task_ID;
-
+      C : Task_ID;
    begin
-      Print_Task_Info_Header;
       C := All_Tasks_List;
 
       while C /= null loop
@@ -177,29 +93,6 @@ package body System.Tasking.Debug is
       end loop;
    end List_Tasks;
 
-   -----------------------
-   -- Print_Accept_Info --
-   -----------------------
-
-   procedure Print_Accept_Info (T : ST.Task_ID) is
-      Buf : aliased Buffer;
-
-   begin
-      if T.Open_Accepts = null then
-         return;
-      end if;
-
-      Clear (Buf'Unchecked_Access);
-      Space (10, Buf'Unchecked_Access);
-      Put ("accepting:", 11, Buf'Unchecked_Access);
-
-      for J in T.Open_Accepts.all'Range loop
-         Put (Integer_Address (T.Open_Accepts (J).S), 3, Buf'Unchecked_Access);
-      end loop;
-
-      Write_Buf (Buf'Unchecked_Access);
-   end Print_Accept_Info;
-
    ------------------------
    -- Print_Current_Task --
    ------------------------
@@ -213,311 +106,117 @@ package body System.Tasking.Debug is
    -- Print_Task_Info --
    ---------------------
 
-   procedure Print_Task_Info (T : ST.Task_ID) is
+   procedure Print_Task_Info (T : Task_ID) is
       Entry_Call : Entry_Call_Link;
-      Buf        : aliased Buffer;
-
-      use type System.Task_Info.Task_Image_Type;
+      Parent     : Task_ID;
 
    begin
-      Clear (Buf'Unchecked_Access);
-      Put (T, Hex_Address_Width, Buf'Unchecked_Access);
-      Put (':', Buf'Unchecked_Access);
-      Put (' ', Buf'Unchecked_Access);
-      Put (':', Buf'Unchecked_Access);
-
       if T = null then
-         Put (" null task", 10, Buf'Unchecked_Access);
-         Write_Buf (Buf'Unchecked_Access);
+         Put_Line ("null task");
          return;
       end if;
 
-      Put (Integer_Address (T.Serial_Number), 4, Buf'Unchecked_Access);
-      Space (Buf'Unchecked_Access);
+      Put (T.Common.Task_Image (1 .. T.Common.Task_Image_Len) & ": " &
+           Task_States'Image (T.Common.State));
 
-      if T.Common.Task_Image = null then
-         Put ("", 15, Buf'Unchecked_Access);
-      else
-         Put (T.Common.Task_Image.all, 15, Buf'Unchecked_Access);
-      end if;
+      Parent := T.Common.Parent;
 
-      Space (Buf'Unchecked_Access);
-      Put (Task_States'Image (T.Common.State), 10, Buf'Unchecked_Access);
-      Space (Buf'Unchecked_Access);
-
-      if T.Callable then
-         Put ('C', Buf'Unchecked_Access);
+      if Parent = null then
+         Put (", parent: <none>");
       else
-         Space (Buf'Unchecked_Access);
+         Put (", parent: " &
+              Parent.Common.Task_Image (1 .. Parent.Common.Task_Image_Len));
       end if;
 
-      if T.Open_Accepts /= null then
-         Put ('A', Buf'Unchecked_Access);
-      else
-         Space (Buf'Unchecked_Access);
-      end if;
-
-      if T.Common.Call /= null then
-         Put ('C', Buf'Unchecked_Access);
-      else
-         Space (Buf'Unchecked_Access);
-      end if;
+      Put (", prio:" & T.Common.Current_Priority'Img);
 
-      if T.Terminate_Alternative then
-         Put ('T', Buf'Unchecked_Access);
-      else
-         Space (Buf'Unchecked_Access);
+      if not T.Callable then
+         Put (", not callable");
       end if;
 
       if T.Aborting then
-         Put ('A', Buf'Unchecked_Access);
-      else
-         Space (Buf'Unchecked_Access);
+         Put (", aborting");
       end if;
 
-      if T.Deferral_Level = 0 then
-         Space (3, Buf'Unchecked_Access);
-      else
-         Put ('D', Buf'Unchecked_Access);
-         if T.Deferral_Level < 0 then
-            Put ("<0", 2, Buf'Unchecked_Access);
-         elsif T.Deferral_Level > 1 then
-            Put (Integer_Address (T.Deferral_Level), 2, Buf'Unchecked_Access);
-         else
-            Space (2, Buf'Unchecked_Access);
-         end if;
+      if T.Deferral_Level /= 0 then
+         Put (", abort deferred");
       end if;
 
-      Space (Buf'Unchecked_Access);
-      Put (Integer_Address (T.Master_of_Task), 1, Buf'Unchecked_Access);
-      Space (Buf'Unchecked_Access);
-      Put (Integer_Address (T.Master_Within), 1, Buf'Unchecked_Access);
-      Put (',', Buf'Unchecked_Access);
-      Space (Buf'Unchecked_Access);
-      Put (Integer_Address (T.Awake_Count), 1, Buf'Unchecked_Access);
-      Space (Buf'Unchecked_Access);
-      Put (Integer_Address (T.Alive_Count), 1, Buf'Unchecked_Access);
-      Put (',', Buf'Unchecked_Access);
-      Space (Buf'Unchecked_Access);
-      Put (Integer_Address (T.ATC_Nesting_Level), 1, Buf'Unchecked_Access);
-      Space (Buf'Unchecked_Access);
-      Put (Integer_Address (T.Pending_ATC_Level), 1, Buf'Unchecked_Access);
-      Put (',', Buf'Unchecked_Access);
-      Space (Buf'Unchecked_Access);
-      Put (Integer_Address (T.Common.Wait_Count), 1, Buf'Unchecked_Access);
-      Put (',', Buf'Unchecked_Access);
-      Space (Buf'Unchecked_Access);
-      Put (Integer_Address (T.User_State), 1, Buf'Unchecked_Access);
-      Write_Buf (Buf'Unchecked_Access);
-
       if T.Common.Call /= null then
          Entry_Call := T.Common.Call;
-         Clear (Buf'Unchecked_Access);
-         Space (10, Buf'Unchecked_Access);
-         Put ("serving:", 8, Buf'Unchecked_Access);
+         Put (", serving:");
 
          while Entry_Call /= null loop
-            Put (Integer_Address
-              (Entry_Call.Self.Serial_Number), 5, Buf'Unchecked_Access);
+            Put (To_Integer (Entry_Call.Self)'Img);
             Entry_Call := Entry_Call.Acceptor_Prev_Call;
          end loop;
-
-         Write_Buf (Buf'Unchecked_Access);
       end if;
 
-      Print_Accept_Info (T);
-   end Print_Task_Info;
-
-   ----------------------------
-   -- Print_Task_Info_Header --
-   ----------------------------
-
-   procedure Print_Task_Info_Header is
-      Buf : aliased Buffer;
-
-   begin
-      Clear (Buf'Unchecked_Access);
-      Put ("TASK_ID", Hex_Address_Width, Buf'Unchecked_Access);
-      Put (':', Buf'Unchecked_Access);
-      Put ('F', Buf'Unchecked_Access);
-      Put (':', Buf'Unchecked_Access);
-      Put ("SERIAL_NUMBER", 4, Buf'Unchecked_Access);
-      Space (Buf'Unchecked_Access);
-      Put (" NAME", 15, Buf'Unchecked_Access);
-      Put (" STATE", 10, Buf'Unchecked_Access);
-      Space (11, Buf'Unchecked_Access);
-      Put ("MAST", 5, Buf'Unchecked_Access);
-      Put ("AWAK", 5, Buf'Unchecked_Access);
-      Put ("ATC", 5, Buf'Unchecked_Access);
-      Put ("WT", 3, Buf'Unchecked_Access);
-      Put ("DBG", 3, Buf'Unchecked_Access);
-      Write_Buf (Buf'Unchecked_Access);
-   end Print_Task_Info_Header;
-
-   ---------
-   -- Put --
-   ---------
-
-   procedure Put
-     (T      : ST.Task_ID;
-      Width  : Integer;
-      Buffer : Buffer_Ptr)
-   is
-      J     : Integer;
-      X     : Integer_Address := +T;
-      Next  : Buf_Range renames Buffer.Next;
-      Buf   : Buf_Array renames Buffer.Chars;
-      First : constant Integer := Next;
-      Wdth  : Integer := Width;
-
-   begin
-      if Wdth > Buf'Last - Next then
-         Wdth := Buf'Last - Next;
-      end if;
-
-      J := Next + (Wdth - 1);
-
-      if X = 0 then
-         Buf (J) := '0';
-
-      else
-         while X > 0 loop
-            Buf (J) := Hex_Digits (X rem 16);
-            J := J - 1;
-            X := X / 16;
-
-            --  Check for overflow
-
-            if J < First and then X > 0 then
-               Buf (J + 1) := '*';
-               exit;
-            end if;
+      if T.Open_Accepts /= null then
+         Put (", accepting:");
 
+         for J in T.Open_Accepts'Range loop
+            Put (T.Open_Accepts (J).S'Img);
          end loop;
-      end if;
-
-      Next := Next + Wdth;
-   end Put;
 
-   procedure Put
-     (N      : Integer_Address;
-      Width  : Integer;
-      Buffer : Buffer_Ptr)
-   is
-      J     : Integer;
-      X     : Integer_Address := N;
-      Next  : Buf_Range renames Buffer.Next;
-      Buf   : Buf_Array renames Buffer.Chars;
-      First : constant Integer := Next;
-      Wdth  : Integer := Width;
-
-   begin
-      if Wdth > Buf'Last - Next then
-         Wdth := Buf'Last - Next;
+         if T.Terminate_Alternative then
+            Put (" or terminate");
+         end if;
       end if;
 
-      J := Next + (Wdth - 1);
-
-      if N = 0 then
-         Buf (J) := '0';
-
-      else
-         while X > 0 loop
-            Buf (J) := Hex_Digits (X rem 10);
-            J := J - 1;
-            X := X / 10;
-
-            --  Check for overflow
-
-            if J < First and then X > 0 then
-               Buf (J + 1) := '*';
-               exit;
-            end if;
-         end loop;
+      if T.User_State /= 0 then
+         Put (", state:" & T.User_State'Img);
       end if;
 
-      Next := Next + Wdth;
-   end Put;
+      Put_Line;
+   end Print_Task_Info;
 
-   procedure Put
-     (S      : String;
-      Width  : Integer;
-      Buffer : Buffer_Ptr)
-   is
-      Next  : Buf_Range renames Buffer.Next;
-      Buf   : Buf_Array renames Buffer.Chars;
-      Bound : constant Integer := Integer'Min (Next + Width, Buf'Last);
-      J     : Integer := Next;
+   ---------
+   -- Put --
+   ---------
 
+   procedure Put (S : String) is
    begin
-      for K in S'Range loop
-
-         --  Check overflow
-
-         if J >= Bound then
-            Buf (J - 1) := '*';
-            exit;
-         end if;
-
-         Buf (J) := S (K);
-         J := J + 1;
-      end loop;
-
-      Next := Bound;
+      write (2, S, S'Length);
    end Put;
 
-   procedure Put
-     (C      : Character;
-      Buffer : Buffer_Ptr)
-   is
-      Next : Buf_Range renames Buffer.Next;
-      Buf  : Buf_Array renames Buffer.Chars;
+   --------------
+   -- Put_Line --
+   --------------
 
+   procedure Put_Line (S : String := "") is
    begin
-      if Next >= Buf'Last then
-         Buf (Next) := '*';
-      else Buf (Next) := C;
-         Next := Next + 1;
-      end if;
-   end Put;
+      write (2, S & ASCII.LF, S'Length + 1);
+   end Put_Line;
 
    ----------------------
    -- Resume_All_Tasks --
    ----------------------
 
    procedure Resume_All_Tasks (Thread_Self : OS_Interface.Thread_Id) is
-      C : ST.Task_ID;
-      R : Boolean;
+      C     : Task_ID;
+      Dummy : Boolean;
+      pragma Unreferenced (Dummy);
 
    begin
       STPO.Lock_RTS;
       C := All_Tasks_List;
 
       while C /= null loop
-         R := STPO.Resume_Task (C, Thread_Self);
+         Dummy := STPO.Resume_Task (C, Thread_Self);
          C := C.Common.All_Tasks_Link;
       end loop;
 
       STPO.Unlock_RTS;
    end Resume_All_Tasks;
 
-   ----------
-   -- Self --
-   ----------
-
-   function Self return Task_ID is
-   begin
-      return STPO.Self;
-   end Self;
-
    ---------------
    -- Set_Trace --
    ---------------
 
    procedure Set_Trace
      (Flag  : Character;
-      Value : Boolean := True)
-   is
+      Value : Boolean := True) is
    begin
       Trace_On (Flag) := Value;
    end Set_Trace;
@@ -526,56 +225,26 @@ package body System.Tasking.Debug is
    -- Set_User_State --
    --------------------
 
-   procedure Set_User_State (Value : Integer) is
+   procedure Set_User_State (Value : Long_Integer) is
    begin
       STPO.Self.User_State := Value;
    end Set_User_State;
 
-   -----------
-   -- Space --
-   -----------
-
-   procedure Space (Buffer : Buffer_Ptr) is
-      Next : Buf_Range renames Buffer.Next;
-      Buf  : Buf_Array renames Buffer.Chars;
-
-   begin
-      if Next >= Buf'Last then
-         Buf (Next) := '*';
-      else
-         Next := Next + 1;
-      end if;
-   end Space;
-
-   procedure Space
-     (N      : Integer;
-      Buffer : Buffer_Ptr)
-   is
-      Next : Buf_Range renames Buffer.Next;
-      Buf  : Buf_Array renames Buffer.Chars;
-
-   begin
-      if Next + N > Buf'Last then
-         Buf (Next) := '*';
-      else
-         Next := Next + N;
-      end if;
-   end Space;
-
    -----------------------
    -- Suspend_All_Tasks --
    -----------------------
 
    procedure Suspend_All_Tasks (Thread_Self : OS_Interface.Thread_Id) is
-      C : ST.Task_ID;
-      R : Boolean;
+      C     : Task_ID;
+      Dummy : Boolean;
+      pragma Unreferenced (Dummy);
 
    begin
       STPO.Lock_RTS;
       C := All_Tasks_List;
 
       while C /= null loop
-         R := STPO.Suspend_Task (C, Thread_Self);
+         Dummy := STPO.Suspend_Task (C, Thread_Self);
          C := C.Common.All_Tasks_Link;
       end loop;
 
@@ -609,95 +278,23 @@ package body System.Tasking.Debug is
    -----------
 
    procedure Trace
-     (Self_ID  : ST.Task_ID;
+     (Self_Id  : Task_ID;
       Msg      : String;
-      Other_ID : ST.Task_ID;
-      Flag     : Character)
-   is
-      Buf : aliased Buffer;
-      use type System.Task_Info.Task_Image_Type;
-
+      Flag     : Character;
+      Other_Id : Task_ID := null) is
    begin
       if Trace_On (Flag) then
-         Clear (Buf'Unchecked_Access);
-         Put (Self_ID, Hex_Address_Width, Buf'Unchecked_Access);
-         Put (':', Buf'Unchecked_Access);
-         Put (Flag, Buf'Unchecked_Access);
-         Put (':', Buf'Unchecked_Access);
-         Put
-           (Integer_Address (Self_ID.Serial_Number),
-            4, Buf'Unchecked_Access);
-         Space (Buf'Unchecked_Access);
-
-         if Self_ID.Common.Task_Image = null then
-            Put ("", 15, Buf'Unchecked_Access);
-         else
-            Put (Self_ID.Common.Task_Image.all, 15, Buf'Unchecked_Access);
-         end if;
-
-         Space (Buf'Unchecked_Access);
+         Put (To_Integer (Self_Id)'Img &
+              ':' & Flag & ':' &
+              Self_Id.Common.Task_Image (1 .. Self_Id.Common.Task_Image_Len) &
+              ':');
 
-         if Other_ID /= null then
-            Put
-              (Integer_Address (Other_ID.Serial_Number),
-               4, Buf'Unchecked_Access);
-            Space (Buf'Unchecked_Access);
+         if Other_Id /= null then
+            Put (To_Integer (Other_Id)'Img & ':');
          end if;
 
-         Put (Msg, Buf.Chars'Last - Buf.Next + 1, Buf'Unchecked_Access);
-         Write_Buf (Buf'Unchecked_Access);
+         Put_Line (Msg);
       end if;
    end Trace;
 
-   procedure Trace
-     (Self_ID : ST.Task_ID;
-      Msg     : String;
-      Flag    : Character)
-   is
-   begin
-      Trace (Self_ID, Msg, null, Flag);
-   end Trace;
-
-   procedure Trace
-     (Msg : String;
-      Flag : Character)
-   is
-      Self_ID : constant ST.Task_ID := STPO.Self;
-
-   begin
-      Trace (Self_ID, Msg, null, Flag);
-   end Trace;
-
-   procedure Trace
-     (Msg      : String;
-      Other_ID : ST.Task_ID;
-      Flag     : Character)
-   is
-      pragma Warnings (Off, Other_ID);
-
-      Self_ID : constant ST.Task_ID := STPO.Self;
-
-   begin
-      Trace (Self_ID, Msg, null, Flag);
-   end Trace;
-
-   ---------------
-   -- Write_Buf --
-   ---------------
-
-   procedure Write_Buf (Buffer : Buffer_Ptr) is
-      Next : Buf_Range renames Buffer.Next;
-      Buf  : Buf_Array renames Buffer.Chars;
-
-      procedure put_char (C : Integer);
-      pragma Import (C, put_char, "put_char");
-
-   begin
-      for J in 1 .. Next - 1 loop
-         put_char (Character'Pos (Buf (J)));
-      end loop;
-
-      put_char (Character'Pos (ASCII.LF));
-   end Write_Buf;
-
 end System.Tasking.Debug;