From 732992fad81a5d42283b07fd9442441acf685b5a Mon Sep 17 00:00:00 2001 From: jason Date: Fri, 12 Dec 1997 04:53:20 +0000 Subject: Thu Dec 11 20:42:18 1997 Teemu Torma Thread-safe EH support for pthreads, DCE threads and Solaris threads. * integrate.c (expand_inline_function): If the inline fn uses eh context, make sure that the current fn has one. * toplev.c (rest_of_compilation): Call emit_eh_context. * except.c (use_eh_context): New fn. (get_eh_context_once): New fn. (call_get_eh_context): New fn. (emit_eh_context): New fn. (get_eh_context): Call either get_eh_context_once or call_get_eh_context, depending on what we have. (get_dynamic_handler_chain): Call get_eh_context_once. * except.h: Prototypes for fns above. * optabs.c (get_eh_context_libfunc): Removed. (init_optabs): Don't initialize it. * expr.h (get_eh_context_libfunc): Removed. * rtl.h, rtl.c: New reg_note REG_EH_CONTEXT. * config/pa/pa.h (CPP_SPEC): Support for -threads. * config/pa/pa-hpux10.h (LIB_SPEC): Ditto. * config/pa/t-pa (MULTILIB_OPTIONS, MULTILIB_DIRNAMES): New multilib for -threads. * config/sparc/t-sol2: Added multilibs for -threads and made -pthreads alias to it. * config/sparc/sol2.h (CPP_SPEC, LIB_SPEC): Added -threads and -pthreads options. * libgcc-thr.h: New file. * libgcc2.c: (__get_cpp_eh_context): Removed. (struct cpp_eh_context): Removed. (struct eh_context): Replaced cpp_eh_context with generic language specific pointer. (__get_eh_info): New function. (__throw): Check eh_context::info. (__sjthrow): Ditto. * libgcc2.c: Include libgcc-thr.h. (new_eh_context, __get_eh_context, eh_pthread_initialize, eh_context_initialize, eh_context_static, eh_context_specific, eh_context_free): New functions. (get_eh_context, eh_context_key): New variables. (__sjthrow, __sjpopnthrow, __eh_pcnthrow, __throw): Use get_eh_context to get the context. (longjmp): Move the declaration inside #ifdef DONT_USE_BUILTIN_SETJMP. * frame.c: Include libgcc-thr.h. (object_mutex): Mutex to protect the object list. (find_fde, __register_frame, __register_frame_table, __deregister_frame): Hold the lock while accessing objects. * except.h (get_eh_context): Declare. * except.c (current_function_ehc): Define. (current_function_dhc, current_function_dcc): Removed. (get_eh_context): New function. (get_dynamic_handler_chain): Use get_eh_context. (get_saved_pc_ref): Ditto. (get_dynamic_cleanup_chain): Removed references to current_function_dcc. (save_eh_status, restore_eh_status): Save and restore current_function_ehc instead. * optabs.c (get_eh_context_libfunc): New variable. (init_optabs): Initialize it. * expr.h: Declare get_eh_context_libfunc. * function.h (struct function): Replaced dhc and dcc with ehc. * except.c (get_saved_pc_ref): New functions. (eh_saved_pc_rtx, eh_saved_pc): Deleted. (expand_internal_throw_indirect): Use get_saved_pc_ref() instead of eh_saved_pc. (end_eh_unwinder): Likewise. (init_eh): Remove initialization of eh_saved_pc. * optabs.c (get_saved_pc_libfunc): New variable. (init_optabs): Initialize it. * expr.h: Declare get_saved_pc_libfunc. * except.h (eh_saved_pc_rtx): Deleted. (get_saved_pc_ref): Declared. From Scott Snyder : * libgcc2.c (__get_saved_pc): New. (__eh_type, __eh_pc): Deleted. (__eh_pcnthrow): Use __get_saved_pc() instead of __eh_pc. (__get_dynamic_handler_chain): Move __dynamic_handler_chain inside this fcn. cp/: Thu Dec 11 20:43:33 1997 Teemu Torma * decl.c (ptr_ptr_type_node): Define. (init_decl_processing): Initialize it. * cp-tree.h: Declare it. * exception.cc (__cp_exception_info): Use __get_eh_info. (__cp_push_exception): Ditto. (__cp_pop_exception): Ditto. From Scott Snyder : * except.c (expand_builtin_throw): Use get_saved_pc_ref instead of saved_pc. (init_exception_processing): Removed saved_pc initialization. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@17052 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/frame.c | 27 ++++++++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) (limited to 'gcc/frame.c') diff --git a/gcc/frame.c b/gcc/frame.c index 747fb9f1c40..296e6a9456d 100644 --- a/gcc/frame.c +++ b/gcc/frame.c @@ -39,6 +39,13 @@ Boston, MA 02111-1307, USA. */ #include "dwarf2.h" #include #include "frame.h" +#include "libgcc-thr.h" + +#ifdef __GTHREAD_MUTEX_INIT +static __gthread_mutex_t object_mutex = __GTHREAD_MUTEX_INIT; +#else +static __gthread_mutex_t object_mutex; +#endif /* Don't use `fancy_abort' here even if config.h says to use it. */ #ifdef abort @@ -296,6 +303,8 @@ find_fde (void *pc) struct object *ob; size_t lo, hi; + __gthread_mutex_lock (&object_mutex); + for (ob = objects; ob; ob = ob->next) { if (ob->pc_begin == 0) @@ -304,6 +313,8 @@ find_fde (void *pc) break; } + __gthread_mutex_unlock (&object_mutex); + if (ob == 0) return 0; @@ -509,8 +520,12 @@ __register_frame (void *begin, struct object *ob) ob->fde_array = 0; ob->count = 0; + __gthread_mutex_lock (&object_mutex); + ob->next = objects; objects = ob; + + __gthread_mutex_unlock (&object_mutex); } /* Similar, but BEGIN is actually a pointer to a table of unwind entries @@ -526,8 +541,12 @@ __register_frame_table (void *begin, struct object *ob) ob->pc_begin = ob->pc_end = 0; ob->count = 0; + __gthread_mutex_lock (&object_mutex); + ob->next = objects; objects = ob; + + __gthread_mutex_unlock (&object_mutex); } /* Called from crtend.o to deregister the unwind info for an object. */ @@ -535,8 +554,11 @@ __register_frame_table (void *begin, struct object *ob) void __deregister_frame (void *begin) { - struct object **p = &objects; + struct object **p; + __gthread_mutex_lock (&object_mutex); + + p = &objects; while (*p) { if ((*p)->fde_begin == begin) @@ -548,10 +570,13 @@ __deregister_frame (void *begin) if (ob->pc_begin) free (ob->fde_array); + __gthread_mutex_unlock (&object_mutex); return; } p = &((*p)->next); } + + __gthread_mutex_unlock (&object_mutex); abort (); } -- cgit v1.2.1