diff options
Diffstat (limited to 'ptr_chck.c')
| -rw-r--r-- | ptr_chck.c | 34 |
1 files changed, 15 insertions, 19 deletions
@@ -18,7 +18,7 @@ #include "private/gc_pmark.h" -void GC_default_same_obj_print_proc(void * p, void * q) +STATIC void GC_default_same_obj_print_proc(void * p, void * q) { GC_err_printf("%p and %p are not in the same object\n", p, q); ABORT("GC_same_obj test failed"); @@ -36,7 +36,7 @@ void (*GC_same_obj_print_proc) (void *, void *) /* We assume this is performance critical. (It shouldn't */ /* be called by production code, but this can easily make */ /* debugging intolerably slow.) */ -void * GC_same_obj(void *p, void *q) +GC_API void * GC_same_obj(void *p, void *q) { struct hblk *h; hdr *hhdr; @@ -99,7 +99,7 @@ fail: return(p); } -void GC_default_is_valid_displacement_print_proc (void *p) +STATIC void GC_default_is_valid_displacement_print_proc (void *p) { GC_err_printf("%p does not point to valid object displacement\n", p); ABORT("GC_is_valid_displacement test failed"); @@ -114,7 +114,7 @@ void (*GC_is_valid_displacement_print_proc)(void *) = /* Always returns its argument. */ /* Note that we don't lock, since nothing relevant about the header */ /* should change while we have a valid object pointer to the block. */ -void * GC_is_valid_displacement(void *p) +GC_API void * GC_is_valid_displacement(void *p) { hdr *hhdr; word pdispl; @@ -149,7 +149,7 @@ fail: return(p); } -void GC_default_is_visible_print_proc(void * p) +STATIC void GC_default_is_visible_print_proc(void * p) { GC_err_printf("%p is not a GC visible pointer location\n", p); ABORT("GC_is_visible test failed"); @@ -157,12 +157,10 @@ void GC_default_is_visible_print_proc(void * p) void (*GC_is_visible_print_proc)(void * p) = GC_default_is_visible_print_proc; +#ifndef THREADS /* Could p be a stack address? */ -GC_bool GC_on_stack(ptr_t p) -{ -# ifdef THREADS - return(TRUE); -# else + STATIC GC_bool GC_on_stack(ptr_t p) + { int dummy; # ifdef STACK_GROWS_DOWN if ((ptr_t)p >= (ptr_t)(&dummy) && (ptr_t)p < GC_stackbottom ) { @@ -174,8 +172,8 @@ GC_bool GC_on_stack(ptr_t p) } # endif return(FALSE); -# endif -} + } +#endif /* Check that p is visible */ /* to the collector as a possibly pointer containing location. */ @@ -185,7 +183,7 @@ GC_bool GC_on_stack(ptr_t p) /* untyped allocations. The idea is that it should be possible, though */ /* slow, to add such a call to all indirect pointer stores.) */ /* Currently useless for multithreaded worlds. */ -void * GC_is_visible(void *p) +GC_API void * GC_is_visible(void *p) { hdr *hhdr; @@ -204,15 +202,13 @@ void * GC_is_visible(void *p) if (GC_on_stack(p)) return(p); hhdr = HDR((word)p); if (hhdr == 0) { - GC_bool result; - if (GC_is_static_root(p)) return(p); /* Else do it again correctly: */ # if (defined(DYNAMIC_LOADING) || defined(MSWIN32) || \ defined(MSWINCE) || defined(PCR)) GC_register_dynamic_libraries(); - result = GC_is_static_root(p); - if (result) return(p); + if (GC_is_static_root(p)) + return(p); # endif goto fail; } else { @@ -259,7 +255,7 @@ fail: } -void * GC_pre_incr (void **p, size_t how_much) +GC_API void * GC_pre_incr (void **p, size_t how_much) { void * initial = *p; void * result = GC_same_obj((void *)((word)initial + how_much), initial); @@ -270,7 +266,7 @@ void * GC_pre_incr (void **p, size_t how_much) return (*p = result); } -void * GC_post_incr (void **p, size_t how_much) +GC_API void * GC_post_incr (void **p, size_t how_much) { void * initial = *p; void * result = GC_same_obj((void *)((word)initial + how_much), initial); |