From b68e0c9e6bbebf2343b4e1d93a6cc396fc3d7acc Mon Sep 17 00:00:00 2001 From: hunt Date: Wed, 7 Dec 2005 20:14:56 +0000 Subject: [PATCH] 2005-12-07 Martin Hunt * translate.cxx (mapvar::fini): Use _stp_pmap_del() on pmaps. (emit_global): For pmaps, use "PMAP" instead of "MAP". --- ChangeLog | 5 +++++ translate.cxx | 18 ++++++++++++++---- 2 files changed, 19 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index dd809df73..29de812ab 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2005-12-07 Martin Hunt + + * translate.cxx (mapvar::fini): Use _stp_pmap_del() on pmaps. + (emit_global): For pmaps, use "PMAP" instead of "MAP". + 2005-12-06 Frank Ch. Eigler PR 1934. diff --git a/translate.cxx b/translate.cxx index e84f9373f..fe1de0a53 100644 --- a/translate.cxx +++ b/translate.cxx @@ -675,8 +675,11 @@ struct mapvar string fini () const { - return "_stp_map_del (" + qname() + ");"; - } + if (is_parallel()) + return "_stp_pmap_del (" + qname() + ");"; + else + return "_stp_map_del (" + qname() + ");"; + } }; @@ -917,9 +920,16 @@ c_unparser::emit_global (vardecl *v) << " " << "global_" << c_varname (v->name) << ";"; + else if (v->type == pe_stats) + { + o->newline() << "static PMAP global_" + << c_varname(v->name) << ";"; + } else - o->newline() << "static MAP global_" - << c_varname(v->name) << ";"; + { + o->newline() << "static MAP global_" + << c_varname(v->name) << ";"; + } o->newline() << "static rwlock_t " << "global_" << c_varname (v->name) << "_lock;"; } -- 2.43.5