From 9dfe12ae5b94d03c997ea2903022a5d2d5c5f266 Mon Sep 17 00:00:00 2001 From: charlet Date: Tue, 21 Oct 2003 13:42:24 +0000 Subject: 2003-10-21 Arnaud Charlet * 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 --- gcc/ada/s-tassta.adb | 304 ++++++++++++++++++++++++++------------------------- 1 file changed, 158 insertions(+), 146 deletions(-) (limited to 'gcc/ada/s-tassta.adb') diff --git a/gcc/ada/s-tassta.adb b/gcc/ada/s-tassta.adb index 6e73cde6b80..8fc01030702 100644 --- a/gcc/ada/s-tassta.adb +++ b/gcc/ada/s-tassta.adb @@ -6,7 +6,7 @@ -- -- -- B o d y -- -- -- --- Copyright (C) 1992-2002, Free Software Foundation, Inc. -- +-- Copyright (C) 1992-2003, Free Software Foundation, Inc. -- -- -- -- GNARL 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- -- @@ -26,8 +26,8 @@ -- however invalidate any other reasons why the executable file might be -- -- covered by the GNU Public License. -- -- -- --- GNARL was developed by the GNARL team at Florida State University. It is -- --- now maintained by Ada Core Technologies, Inc. (http://www.gnat.com). -- +-- GNARL was developed by the GNARL team at Florida State University. -- +-- Extensive contributions were provided by Ada Core Technologies, Inc. -- -- -- ------------------------------------------------------------------------------ @@ -39,7 +39,6 @@ with Ada.Exceptions; -- used for Raise_Exception with System.Tasking.Debug; -pragma Warnings (Off, System.Tasking.Debug); -- used for enabling tasking facilities with gdb with System.Address_Image; @@ -52,7 +51,6 @@ with System.Parameters; with System.Task_Info; -- used for Task_Info_Type --- Task_Image_Type with System.Task_Primitives.Operations; -- used for Finalize_Lock @@ -99,9 +97,6 @@ with System.OS_Primitives; with System.Finalization_Implementation; -- Used for System.Finalization_Implementation.Finalize_Global_List -with Interfaces.C; --- Used for type Unsigned. - with System.Secondary_Stack; -- used for SS_Init; @@ -135,11 +130,9 @@ package body System.Tasking.Stages is -- Local Subprograms -- ----------------------- - procedure Notify_Exception - (Self_Id : Task_ID; - Excep : Exception_Occurrence); - -- This procedure will output the task ID and the exception information, - -- including traceback if available. + procedure Trace_Unhandled_Exception_In_Task (Self_Id : Task_ID); + -- This procedure outputs the task specific message for exception + -- tracing purposes. procedure Task_Wrapper (Self_ID : Task_ID); -- This is the procedure that is called by the GNULL from the @@ -184,10 +177,6 @@ package body System.Tasking.Stages is -- Different code is used at master completion, in Terminate_Dependents, -- due to a need for tighter synchronization with the master. - procedure Terminate_Task (Self_ID : Task_ID); - -- Terminate the calling task. - -- This should only be called by the Task_Wrapper procedure. - ---------------------- -- Abort_Dependents -- ---------------------- @@ -339,10 +328,10 @@ package body System.Tasking.Stages is (C.Common.Compiler_Data.Pri_Stack_Info.Size), Activate_Prio, Success); - -- There would be a race between the created task and - -- the creator to do the following initialization, - -- if we did not have a Lock/Unlock_RTS pair - -- in the task wrapper, to prevent it from racing ahead. + -- There would be a race between the created task and the + -- creator to do the following initialization, if we did not + -- have a Lock/Unlock_RTS pair in the task wrapper to prevent + -- it from racing ahead. if Success then C.Common.State := Runnable; @@ -404,9 +393,8 @@ package body System.Tasking.Stages is C := P; end loop; - -- Wait for the activated tasks to complete activation. - -- It is unsafe to abort any of these tasks until the count goes to - -- zero. + -- Wait for the activated tasks to complete activation. It is + -- unsafe to abort any of these tasks until the count goes to zero. loop Initialization.Poll_Base_Priority_Change (Self_ID); @@ -421,7 +409,7 @@ package body System.Tasking.Stages is Unlock_RTS; end if; - -- Remove the tasks from the chain. + -- Remove the tasks from the chain Chain_Access.T_ID := null; Initialization.Undefer_Abort_Nestable (Self_ID); @@ -467,7 +455,7 @@ package body System.Tasking.Stages is --------------------- procedure Complete_Master is - Self_ID : Task_ID := STPO.Self; + Self_ID : constant Task_ID := STPO.Self; begin pragma Assert (Self_ID.Deferral_Level > 0); @@ -479,7 +467,7 @@ package body System.Tasking.Stages is -- Complete_Task -- ------------------- - -- See comments on Vulnerable_Complete_Task for details. + -- See comments on Vulnerable_Complete_Task for details procedure Complete_Task is Self_ID : constant Task_ID := STPO.Self; @@ -488,8 +476,8 @@ package body System.Tasking.Stages is Vulnerable_Complete_Task (Self_ID); - -- All of our dependents have terminated. - -- Never undefer abort again! + -- All of our dependents have terminated. Never undefer abort again! + end Complete_Task; ----------------- @@ -509,13 +497,14 @@ package body System.Tasking.Stages is Discriminants : System.Address; Elaborated : Access_Boolean; Chain : in out Activation_Chain; - Task_Image : System.Task_Info.Task_Image_Type; + Task_Image : String; Created_Task : out Task_ID) is T, P : Task_ID; Self_ID : constant Task_ID := STPO.Self; Success : Boolean; Base_Priority : System.Any_Priority; + Len : Natural; begin pragma Debug @@ -527,7 +516,7 @@ package body System.Tasking.Stages is Base_Priority := System.Any_Priority (Priority); end if; - -- Find parent P of new Task, via master level number. + -- Find parent P of new Task, via master level number P := Self_ID; @@ -595,7 +584,29 @@ package body System.Tasking.Stages is T.Entry_Calls (L).Level := L; end loop; - T.Common.Task_Image := Task_Image; + if Task_Image'Length = 0 then + T.Common.Task_Image_Len := 0; + else + Len := 1; + T.Common.Task_Image (1) := Task_Image (Task_Image'First); + + for J in Task_Image'First + 1 .. Task_Image'Last loop + + -- Remove unwanted blank space generated by 'Image + + if Task_Image (J) /= ' ' + or else Task_Image (J - 1) /= '(' + then + Len := Len + 1; + T.Common.Task_Image (Len) := Task_Image (J); + + exit when Len = T.Common.Task_Image'Last; + end if; + end loop; + + T.Common.Task_Image_Len := Len; + end if; + Unlock (Self_ID); Unlock_RTS; @@ -655,6 +666,7 @@ package body System.Tasking.Stages is -- ??? -- Experimentation has shown that abort is sometimes (but not -- always) already deferred when this is called. + -- That may indicate an error. Find out what is going on. C := Chain.T_ID; @@ -742,10 +754,9 @@ package body System.Tasking.Stages is Unlock_RTS; end if; - -- We need to explicitly wait for the task to be - -- terminated here because on true concurrent system, we - -- may end this procedure before the tasks are really - -- terminated. + -- We need to explicitely wait for the task to be terminated here + -- because on true concurrent system, we may end this procedure + -- before the tasks are really terminated. Write_Lock (Self_ID); @@ -774,7 +785,7 @@ package body System.Tasking.Stages is Unlock_RTS; end if; - -- Complete the environment task. + -- Complete the environment task Vulnerable_Complete_Task (Self_ID); @@ -807,14 +818,11 @@ package body System.Tasking.Stages is begin if T.Common.State = Terminated then + -- It is not safe to call Abort_Defer or Write_Lock at this stage Initialization.Task_Lock (Self_Id); - if T.Common.Task_Image /= null then - Free_Task_Image (T.Common.Task_Image); - end if; - Lock_RTS; Initialization.Remove_From_All_Tasks_List (T); Unlock_RTS; @@ -832,43 +840,6 @@ package body System.Tasking.Stages is end if; end Free_Task; - ---------------------- - -- Notify_Exception -- - ---------------------- - - procedure Notify_Exception - (Self_Id : Task_ID; - Excep : Exception_Occurrence) - is - procedure To_Stderr (S : String); - pragma Import (Ada, To_Stderr, "__gnat_to_stderr"); - - use System.Task_Info; - use System.Soft_Links; - - function To_Address is new - Unchecked_Conversion (Task_ID, System.Address); - - function Tailored_Exception_Information - (E : Exception_Occurrence) return String; - pragma Import - (Ada, Tailored_Exception_Information, - "__gnat_tailored_exception_information"); - - begin - To_Stderr ("task "); - - if Self_Id.Common.Task_Image /= null then - To_Stderr (Self_Id.Common.Task_Image.all); - To_Stderr ("_"); - end if; - - To_Stderr (System.Address_Image (To_Address (Self_Id))); - To_Stderr (" terminated by unhandled exception"); - To_Stderr ((1 => ASCII.LF)); - To_Stderr (Tailored_Exception_Information (Excep)); - end Notify_Exception; - ------------------ -- Task_Wrapper -- ------------------ @@ -880,36 +851,13 @@ package body System.Tasking.Stages is -- data. Task finalization is done by Complete_Task, which is called from -- an at-end handler that the compiler generates. - -- The variable ID in the task wrapper is used to implement the Self - -- function on targets where there is a fast way to find the stack base - -- of the current thread, since it should be at a fixed offset from the - -- stack base. - - -- The variable Magic_Number is also used in such implementations - -- of Self, to check whether the current task is an Ada task, as - -- compared to other-language threads. - - -- Both act as constants, once initialized, but need to be marked as - -- volatile or aliased to prevent the compiler from optimizing away the - -- storage. See System.Task_Primitives.Operations.Self for more info. - procedure Task_Wrapper (Self_ID : Task_ID) is - ID : Task_ID := Self_ID; - pragma Volatile (ID); - -- Do not delete this variable. - -- In some targets, we need this variable to implement a fast Self. - - Magic_Number : Interfaces.C.unsigned := 16#ADAADAAD#; - pragma Volatile (Magic_Number); - -- We use this to verify that we are looking at an Ada task, - -- inside of System.Task_Primitives.Operations.Self. - use type System.Parameters.Size_Type; use type SSE.Storage_Offset; use System.Standard_Library; Secondary_Stack : aliased SSE.Storage_Array - (1 .. ID.Common.Compiler_Data.Pri_Stack_Info.Size * + (1 .. Self_ID.Common.Compiler_Data.Pri_Stack_Info.Size * SSE.Storage_Offset (Parameters.Sec_Stack_Ratio) / 100); Secondary_Stack_Address : System.Address := Secondary_Stack'Address; @@ -917,63 +865,83 @@ package body System.Tasking.Stages is pragma Assert (Self_ID.Deferral_Level = 1); if not Parameters.Sec_Stack_Dynamic then - ID.Common.Compiler_Data.Sec_Stack_Addr := Secondary_Stack'Address; + Self_ID.Common.Compiler_Data.Sec_Stack_Addr := + Secondary_Stack'Address; SST.SS_Init (Secondary_Stack_Address, Integer (Secondary_Stack'Last)); end if; - -- Set the guard page at the bottom of the stack. - -- The call to unprotect the page is done in Terminate_Task + -- Set the guard page at the bottom of the stack. The call to + -- unprotect the page is done in Terminate_Task Stack_Guard (Self_ID, True); - -- Initialize low-level TCB components, that - -- cannot be initialized by the creator. - -- Enter_Task sets Self_ID.Known_Tasks_Index - -- and Self_ID.LL.Thread + -- Initialize low-level TCB components, that cannot be initialized + -- by the creator. Enter_Task sets Self_ID.Known_Tasks_Index and + -- also Self_ID.LL.Thread Enter_Task (Self_ID); -- We lock RTS_Lock to wait for activator to finish activating -- the rest of the chain, so that everyone in the chain comes out -- in priority order. + -- This also protects the value of - -- Self_ID.Common.Activator.Common.Wait_Count. + -- Self_ID.Common.Activator.Common.Wait_Count. Lock_RTS; Unlock_RTS; begin -- We are separating the following portion of the code in order to - -- place the exception handlers in a different block. - -- In this way we do not call Set_Jmpbuf_Address (which needs - -- Self) before we set Self in Enter_Task + -- place the exception handlers in a different block. In this way, + -- we do not call Set_Jmpbuf_Address (which needs Self) before we + -- set Self in Enter_Task - -- Call the task body procedure. + -- Call the task body procedure -- The task body is called with abort still deferred. That -- eliminates a dangerous window, for which we had to patch-up in -- Terminate_Task. + -- During the expansion of the task body, we insert an RTS-call -- to Abort_Undefer, at the first point where abort should be -- allowed. Self_ID.Common.Task_Entry_Point (Self_ID.Common.Task_Arg); - Terminate_Task (Self_ID); + Initialization.Defer_Abort_Nestable (Self_ID); exception + -- We can't call Terminate_Task in the exception handlers below, + -- since there may be (e.g. in the case of GCC exception handling) + -- clean ups associated with the exception handler that need to + -- access task specific data. + + -- Defer abortion so that this task can't be aborted while exiting + when Standard'Abort_Signal => - Terminate_Task (Self_ID); + Initialization.Defer_Abort_Nestable (Self_ID); when others => -- ??? Using an E : others here causes CD2C11A to fail on -- DEC Unix, see 7925-005. + Initialization.Defer_Abort_Nestable (Self_ID); + + -- Perform the task specific exception tracing duty. We handle + -- these outputs here and not in the common notification routine + -- because we need access to tasking related data and we don't + -- want to drag dependencies against tasking related units in the + -- the common notification units. Additionally, no trace is ever + -- triggered from the common routine for the Unhandled_Raise case + -- in tasks, since an exception never appears unhandled in this + -- context because of this handler. + if Exception_Trace = Unhandled_Raise then - Notify_Exception (Self_ID, SSL.Get_Current_Excep.all.all); + Trace_Unhandled_Exception_In_Task (Self_ID); end if; - - Terminate_Task (Self_ID); end; + + Terminate_Task (Self_ID); end Task_Wrapper; -------------------- @@ -985,12 +953,11 @@ package body System.Tasking.Stages is -- try to deallocate the ATCB out from under the current task WHILE IT IS -- STILL EXECUTING. - -- To avoid this, the parent task must be blocked up to the last thing - -- done before the call to Exit_Task. The trouble is that we have another - -- step that we also want to postpone to the very end, i.e., calling - -- SSL.Destroy_TSD. We have to postpone that until the end because - -- compiler-generated code is likely to try to access that data at just - -- about any point. + -- To avoid this, the parent task must be blocked up to the latest + -- statement executed. The trouble is that we have another step that we + -- also want to postpone to the very end, i.e., calling SSL.Destroy_TSD. + -- We have to postpone that until the end because compiler-generated code + -- is likely to try to access that data at just about any point. -- We can't call Destroy_TSD while we are holding any other locks, because -- it locks Global_Task_Lock, and our deadlock prevention rules require @@ -1008,8 +975,11 @@ package body System.Tasking.Stages is procedure Terminate_Task (Self_ID : Task_ID) is Environment_Task : constant Task_ID := STPO.Environment_Task; + Master_of_Task : Integer; begin + Debug.Task_Termination_Hook; + if Runtime_Traces then Send_Trace_Info (T_Terminate); end if; @@ -1029,10 +999,12 @@ package body System.Tasking.Stages is Lock_RTS; end if; + Master_of_Task := Self_ID.Master_of_Task; + -- Check if the current task is an independent task -- If so, decrement the Independent_Task_Count value. - if Self_ID.Master_of_Task = 2 then + if Master_of_Task = 2 then if Single_Lock then Utilities.Independent_Task_Count := Utilities.Independent_Task_Count - 1; @@ -1045,7 +1017,7 @@ package body System.Tasking.Stages is end if; end if; - -- Unprotect the guard page if needed. + -- Unprotect the guard page if needed Stack_Guard (Self_ID, False); @@ -1064,7 +1036,9 @@ package body System.Tasking.Stages is -- past this point, this thread must assume that the ATCB -- has been deallocated. It should not be accessed again. - STPO.Exit_Task; + if Master_of_Task > 0 then + STPO.Exit_Task; + end if; end Terminate_Task; ---------------- @@ -1072,8 +1046,8 @@ package body System.Tasking.Stages is ---------------- function Terminated (T : Task_ID) return Boolean is + Self_ID : constant Task_ID := STPO.Self; Result : Boolean; - Self_ID : Task_ID := STPO.Self; begin Initialization.Defer_Abort_Nestable (Self_ID); @@ -1094,6 +1068,49 @@ package body System.Tasking.Stages is return Result; end Terminated; + ---------------------------------------- + -- Trace_Unhandled_Exception_In_Task -- + ---------------------------------------- + + procedure Trace_Unhandled_Exception_In_Task (Self_Id : Task_ID) is + procedure To_Stderr (S : String); + pragma Import (Ada, To_Stderr, "__gnat_to_stderr"); + + use System.Task_Info; + use System.Soft_Links; + use System.Standard_Library; + + function To_Address is new + Unchecked_Conversion (Task_ID, System.Address); + + function Tailored_Exception_Information + (E : Exception_Occurrence) return String; + pragma Import + (Ada, Tailored_Exception_Information, + "__gnat_tailored_exception_information"); + + Excep : Exception_Occurrence_Access := SSL.Get_Current_Excep.all; + + begin + -- This procedure is called by the task outermost handler in + -- Task_Wrapper below, so only once the task stack has been fully + -- unwound. The common notification routine has been called at the + -- raise point already. + + To_Stderr ("task "); + + if Self_Id.Common.Task_Image_Len /= 0 then + To_Stderr + (Self_Id.Common.Task_Image (1 .. Self_Id.Common.Task_Image_Len)); + To_Stderr ("_"); + end if; + + To_Stderr (System.Address_Image (To_Address (Self_Id))); + To_Stderr (" terminated by unhandled exception"); + To_Stderr ((1 => ASCII.LF)); + To_Stderr (Tailored_Exception_Information (Excep.all)); + end Trace_Unhandled_Exception_In_Task; + ------------------------------------ -- Vulnerable_Complete_Activation -- ------------------------------------ @@ -1114,14 +1131,13 @@ package body System.Tasking.Stages is pragma Assert (Self_ID.Common.Activator /= null); - -- Remove dangling reference to Activator, - -- since a task may outlive its activator. + -- Remove dangling reference to Activator, since a task may + -- outlive its activator. Self_ID.Common.Activator := null; - -- Wake up the activator, if it is waiting for a chain - -- of tasks to activate, and we are the last in the chain - -- to complete activation + -- Wake up the activator, if it is waiting for a chain of tasks to + -- activate, and we are the last in the chain to complete activation. if Activator.Common.State = Activator_Sleep then Activator.Common.Wait_Count := Activator.Common.Wait_Count - 1; @@ -1131,10 +1147,10 @@ package body System.Tasking.Stages is end if; end if; - -- The activator raises a Tasking_Error if any task - -- it is activating is completed before the activation is - -- done. However, if the reason for the task completion is - -- an abortion, we do not raise an exception. ARM 9.2(5). + -- The activator raises a Tasking_Error if any task it is activating + -- is completed before the activation is done. However, if the reason + -- for the task completion is an abortion, we do not raise an exception. + -- See RM 9.2(5). if not Self_ID.Callable and then Self_ID.Pending_ATC_Level /= 0 then Activator.Common.Activation_Failed := True; @@ -1161,7 +1177,7 @@ package body System.Tasking.Stages is procedure Vulnerable_Complete_Master (Self_ID : Task_ID) is C : Task_ID; P : Task_ID; - CM : Master_Level := Self_ID.Master_Within; + CM : constant Master_Level := Self_ID.Master_Within; T : aliased Task_ID; To_Be_Freed : Task_ID; @@ -1455,7 +1471,7 @@ package body System.Tasking.Stages is if T.Interrupt_Entry and Interrupt_Manager_ID /= null then declare - Detach_Interrupt_Entries_Index : Task_Entry_Index := 1; + Detach_Interrupt_Entries_Index : constant Task_Entry_Index := 1; -- Corresponds to the entry index of System.Interrupts. -- Interrupt_Manager.Detach_Interrupt_Entries. -- Be sure to update this value when changing @@ -1592,8 +1608,7 @@ package body System.Tasking.Stages is procedure Vulnerable_Free_Task (T : Task_ID) is begin - pragma Debug - (Debug.Trace ("Vulnerable_Free_Task", T, 'C')); + pragma Debug (Debug.Trace (Self, "Vulnerable_Free_Task", 'C', T)); if Single_Lock then Lock_RTS; @@ -1607,15 +1622,12 @@ package body System.Tasking.Stages is Unlock_RTS; end if; - if T.Common.Task_Image /= null then - Free_Task_Image (T.Common.Task_Image); - end if; - System.Task_Primitives.Operations.Finalize_TCB (T); end Vulnerable_Free_Task; begin -- Establish the Adafinal softlink. + -- This is not done inside the central RTS initialization routine -- to avoid with-ing this package from System.Tasking.Initialization. -- cgit v1.2.1