summaryrefslogtreecommitdiff
path: root/misc.c
diff options
context:
space:
mode:
authorivmai <ivmai>2009-12-08 10:09:06 +0100
committerIvan Maidanski <ivmai@mail.ru>2011-07-26 19:06:52 +0200
commit02b76359f5f6429151a9d1c15ccf4302eb927e80 (patch)
tree6b44914424930622f553ce6b799d9a29cf646a1e /misc.c
parent176d5bda1e4416a306005d5ee66a902e9db6af6d (diff)
2009-12-08 Ivan Maidanski <ivmai@mail.ru> (really mostly Hans Boehm)
* darwin_stop_world.c (GC_push_all_stacks): Rename activation_frame to traced_stack_sect. * include/private/gc_priv.h (GC_push_all_stack_frames, GC_push_all_register_frames): Ditto. * include/private/pthread_support.h (GC_Thread_Rep): Ditto. * mark_rts.c (GC_push_all_register_frames, GC_push_all_stack_frames, GC_push_all_stack_part_eager_frames, GC_push_current_stack): Ditto. * pthread_stop_world.c (GC_push_all_stacks): Ditto. * pthread_support.c (GC_call_with_gc_active): Ditto. * win32_threads.c (GC_Thread_Rep, GC_call_with_gc_active, GC_push_stack_for): Ditto. * include/private/gc_priv.h (GC_activation_frame_s): Rename to GC_traced_stack_sect_s. * include/private/gc_priv.h (GC_activation_frame): Rename to GC_traced_stack_sect. * misc.c (GC_activation_frame, GC_call_with_gc_active): Ditto. * doc/README.macros (UNICODE): Document.
Diffstat (limited to 'misc.c')
-rw-r--r--misc.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/misc.c b/misc.c
index 931684d..1c8d00a 100644
--- a/misc.c
+++ b/misc.c
@@ -1481,13 +1481,13 @@ GC_INNER ptr_t GC_blocked_sp = NULL;
STATIC ptr_t GC_blocked_register_sp = NULL;
# endif
-GC_INNER struct GC_activation_frame_s *GC_activation_frame = NULL;
+GC_INNER struct GC_traced_stack_sect_s *GC_traced_stack_sect = NULL;
/* This is nearly the same as in win32_threads.c */
GC_API void * GC_CALL GC_call_with_gc_active(GC_fn_type fn,
void * client_data)
{
- struct GC_activation_frame_s frame;
+ struct GC_traced_stack_sect_s frame;
GC_ASSERT(GC_is_initialized);
/* Adjust our stack base value (this could happen if */
@@ -1510,16 +1510,16 @@ GC_API void * GC_CALL GC_call_with_gc_active(GC_fn_type fn,
/* but that probably doesn't hurt. */
frame.saved_backing_store_ptr = GC_blocked_register_sp;
# endif
- frame.prev = GC_activation_frame;
+ frame.prev = GC_traced_stack_sect;
GC_blocked_sp = NULL;
- GC_activation_frame = &frame;
+ GC_traced_stack_sect = &frame;
client_data = fn(client_data);
GC_ASSERT(GC_blocked_sp == NULL);
- GC_ASSERT(GC_activation_frame == &frame);
+ GC_ASSERT(GC_traced_stack_sect == &frame);
/* Restore original "frame". */
- GC_activation_frame = frame.prev;
+ GC_traced_stack_sect = frame.prev;
# ifdef IA64
GC_blocked_register_sp = frame.saved_backing_store_ptr;
# endif