X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=src%2Fmm%2Fboehm-gc%2Ftypd_mlc.c;h=b031f61e8bbf8c3f3f01debcf932f1893fa2af84;hb=c9ee016a64e925938f84fcb85521f82febcc4f63;hp=9e53966c6b75d501ea0fc06bbb1df11c399b1e48;hpb=29c5375943f6b0d6c2e2f77c07c13ae04dae5565;p=cacao.git diff --git a/src/mm/boehm-gc/typd_mlc.c b/src/mm/boehm-gc/typd_mlc.c index 9e53966c6..b031f61e8 100644 --- a/src/mm/boehm-gc/typd_mlc.c +++ b/src/mm/boehm-gc/typd_mlc.c @@ -13,6 +13,7 @@ * */ +#include "private/gc_pmark.h" /* * Some simple primitives for allocation with explicit type information. @@ -28,7 +29,7 @@ * must trace the complex_descriptor. * * Note that descriptors inside objects may appear cleared, if we encounter a - * false refrence to an object on a free list. In the GC_descr case, this + * false reference to an object on a free list. In the GC_descr case, this * is OK, since a 0 descriptor corresponds to examining no fields. * In the complex_descriptor case, we explicitly check for that case. * @@ -36,111 +37,114 @@ * since they are not accessible through the current interface. */ -#include "config.h" - -#include "private/gc_pmark.h" #include "gc_typed.h" -# define TYPD_EXTRA_BYTES (sizeof(word) - EXTRA_BYTES) +#define TYPD_EXTRA_BYTES (sizeof(word) - EXTRA_BYTES) -GC_bool GC_explicit_typing_initialized = FALSE; +STATIC GC_bool GC_explicit_typing_initialized = FALSE; -int GC_explicit_kind; /* Object kind for objects with indirect */ - /* (possibly extended) descriptors. */ +STATIC int GC_explicit_kind = 0; + /* Object kind for objects with indirect */ + /* (possibly extended) descriptors. */ -int GC_array_kind; /* Object kind for objects with complex */ - /* descriptors and GC_array_mark_proc. */ +STATIC int GC_array_kind = 0; + /* Object kind for objects with complex */ + /* descriptors and GC_array_mark_proc. */ -/* Extended descriptors. GC_typed_mark_proc understands these. */ -/* These are used for simple objects that are larger than what */ -/* can be described by a BITMAP_BITS sized bitmap. */ +/* Extended descriptors. GC_typed_mark_proc understands these. */ +/* These are used for simple objects that are larger than what */ +/* can be described by a BITMAP_BITS sized bitmap. */ typedef struct { - word ed_bitmap; /* lsb corresponds to first word. */ - GC_bool ed_continued; /* next entry is continuation. */ + word ed_bitmap; /* lsb corresponds to first word. */ + GC_bool ed_continued; /* next entry is continuation. */ } ext_descr; -/* Array descriptors. GC_array_mark_proc understands these. */ -/* We may eventually need to add provisions for headers and */ +/* Array descriptors. GC_array_mark_proc understands these. */ +/* We may eventually need to add provisions for headers and */ /* trailers. Hence we provide for tree structured descriptors, */ -/* though we don't really use them currently. */ +/* though we don't really use them currently. */ typedef union ComplexDescriptor { - struct LeafDescriptor { /* Describes simple array */ + struct LeafDescriptor { /* Describes simple array */ word ld_tag; -# define LEAF_TAG 1 - word ld_size; /* bytes per element */ - /* multiple of ALIGNMENT */ - word ld_nelements; /* Number of elements. */ - GC_descr ld_descriptor; /* A simple length, bitmap, */ - /* or procedure descriptor. */ +# define LEAF_TAG 1 + size_t ld_size; /* bytes per element */ + /* multiple of ALIGNMENT */ + size_t ld_nelements; /* Number of elements. */ + GC_descr ld_descriptor; /* A simple length, bitmap, */ + /* or procedure descriptor. */ } ld; struct ComplexArrayDescriptor { word ad_tag; -# define ARRAY_TAG 2 - word ad_nelements; - union ComplexDescriptor * ad_element_descr; +# define ARRAY_TAG 2 + size_t ad_nelements; + union ComplexDescriptor * ad_element_descr; } ad; struct SequenceDescriptor { word sd_tag; -# define SEQUENCE_TAG 3 - union ComplexDescriptor * sd_first; - union ComplexDescriptor * sd_second; +# define SEQUENCE_TAG 3 + union ComplexDescriptor * sd_first; + union ComplexDescriptor * sd_second; } sd; } complex_descriptor; #define TAG ld.ld_tag -ext_descr * GC_ext_descriptors; /* Points to array of extended */ - /* descriptors. */ +STATIC ext_descr * GC_ext_descriptors = NULL; + /* Points to array of extended */ + /* descriptors. */ -word GC_ed_size = 0; /* Current size of above arrays. */ -# define ED_INITIAL_SIZE 100; +STATIC size_t GC_ed_size = 0; /* Current size of above arrays. */ +#define ED_INITIAL_SIZE 100 -word GC_avail_descr = 0; /* Next available slot. */ +STATIC size_t GC_avail_descr = 0; /* Next available slot. */ -int GC_typed_mark_proc_index; /* Indices of my mark */ -int GC_array_mark_proc_index; /* procedures. */ +STATIC int GC_typed_mark_proc_index = 0; /* Indices of my mark */ +STATIC int GC_array_mark_proc_index = 0; /* procedures. */ -/* Add a multiword bitmap to GC_ext_descriptors arrays. Return */ -/* starting index. */ -/* Returns -1 on failure. */ -/* Caller does not hold allocation lock. */ -signed_word GC_add_ext_descriptor(bm, nbits) -GC_bitmap bm; -word nbits; +STATIC void GC_push_typed_structures_proc(void) { - register size_t nwords = divWORDSZ(nbits + WORDSZ-1); - register signed_word result; - register word i; - register word last_part; - register int extra_bits; + GC_push_all((ptr_t)&GC_ext_descriptors, + (ptr_t)&GC_ext_descriptors + sizeof(word)); +} + +/* Add a multiword bitmap to GC_ext_descriptors arrays. Return */ +/* starting index. */ +/* Returns -1 on failure. */ +/* Caller does not hold allocation lock. */ +STATIC signed_word GC_add_ext_descriptor(GC_bitmap bm, word nbits) +{ + size_t nwords = divWORDSZ(nbits + WORDSZ-1); + signed_word result; + size_t i; + word last_part; + size_t extra_bits; DCL_LOCK_STATE; - DISABLE_SIGNALS(); LOCK(); while (GC_avail_descr + nwords >= GC_ed_size) { - ext_descr * new; - size_t new_size; - word ed_size = GC_ed_size; - - UNLOCK(); - ENABLE_SIGNALS(); - if (ed_size == 0) { - new_size = ED_INITIAL_SIZE; - } else { - new_size = 2 * ed_size; - if (new_size > MAX_ENV) return(-1); - } - new = (ext_descr *) GC_malloc_atomic(new_size * sizeof(ext_descr)); - if (new == 0) return(-1); - DISABLE_SIGNALS(); + ext_descr * new; + size_t new_size; + word ed_size = GC_ed_size; + + if (ed_size == 0) { + GC_push_typed_structures = GC_push_typed_structures_proc; + UNLOCK(); + new_size = ED_INITIAL_SIZE; + } else { + UNLOCK(); + new_size = 2 * ed_size; + if (new_size > MAX_ENV) return(-1); + } + new = (ext_descr *) GC_malloc_atomic(new_size * sizeof(ext_descr)); + if (new == 0) return(-1); LOCK(); if (ed_size == GC_ed_size) { if (GC_avail_descr != 0) { - BCOPY(GC_ext_descriptors, new, - GC_avail_descr * sizeof(ext_descr)); - } - GC_ed_size = new_size; - GC_ext_descriptors = new; - } /* else another thread already resized it in the meantime */ + BCOPY(GC_ext_descriptors, new, + GC_avail_descr * sizeof(ext_descr)); + } + GC_ed_size = new_size; + GC_ext_descriptors = new; + } /* else another thread already resized it in the meantime */ } result = GC_avail_descr; for (i = 0; i < nwords-1; i++) { @@ -156,21 +160,18 @@ word nbits; GC_ext_descriptors[result + i].ed_continued = FALSE; GC_avail_descr += nwords; UNLOCK(); - ENABLE_SIGNALS(); return(result); } -/* Table of bitmap descriptors for n word long all pointer objects. */ -GC_descr GC_bm_table[WORDSZ/2]; - -/* Return a descriptor for the concatenation of 2 nwords long objects, */ -/* each of which is described by descriptor. */ -/* The result is known to be short enough to fit into a bitmap */ -/* descriptor. */ -/* Descriptor is a GC_DS_LENGTH or GC_DS_BITMAP descriptor. */ -GC_descr GC_double_descr(descriptor, nwords) -register GC_descr descriptor; -register word nwords; +/* Table of bitmap descriptors for n word long all pointer objects. */ +STATIC GC_descr GC_bm_table[WORDSZ/2]; + +/* Return a descriptor for the concatenation of 2 nwords long objects, */ +/* each of which is described by descriptor. */ +/* The result is known to be short enough to fit into a bitmap */ +/* descriptor. */ +/* Descriptor is a GC_DS_LENGTH or GC_DS_BITMAP descriptor. */ +STATIC GC_descr GC_double_descr(GC_descr descriptor, word nwords) { if ((descriptor & GC_DS_TAGS) == GC_DS_LENGTH) { descriptor = GC_bm_table[BYTES_TO_WORDS((word)descriptor)]; @@ -179,44 +180,42 @@ register word nwords; return(descriptor); } -complex_descriptor * GC_make_sequence_descriptor(); +STATIC complex_descriptor * +GC_make_sequence_descriptor(complex_descriptor *first, + complex_descriptor *second); -/* Build a descriptor for an array with nelements elements, */ -/* each of which can be described by a simple descriptor. */ -/* We try to optimize some common cases. */ +/* Build a descriptor for an array with nelements elements, */ +/* each of which can be described by a simple descriptor. */ +/* We try to optimize some common cases. */ /* If the result is COMPLEX, then a complex_descr* is returned */ -/* in *complex_d. */ -/* If the result is LEAF, then we built a LeafDescriptor in */ -/* the structure pointed to by leaf. */ -/* The tag in the leaf structure is not set. */ -/* If the result is SIMPLE, then a GC_descr */ -/* is returned in *simple_d. */ -/* If the result is NO_MEM, then */ -/* we failed to allocate the descriptor. */ -/* The implementation knows that GC_DS_LENGTH is 0. */ -/* *leaf, *complex_d, and *simple_d may be used as temporaries */ -/* during the construction. */ -# define COMPLEX 2 -# define LEAF 1 -# define SIMPLE 0 -# define NO_MEM (-1) -int GC_make_array_descriptor(nelements, size, descriptor, - simple_d, complex_d, leaf) -word size; -word nelements; -GC_descr descriptor; -GC_descr *simple_d; -complex_descriptor **complex_d; -struct LeafDescriptor * leaf; +/* in *complex_d. */ +/* If the result is LEAF, then we built a LeafDescriptor in */ +/* the structure pointed to by leaf. */ +/* The tag in the leaf structure is not set. */ +/* If the result is SIMPLE, then a GC_descr */ +/* is returned in *simple_d. */ +/* If the result is NO_MEM, then */ +/* we failed to allocate the descriptor. */ +/* The implementation knows that GC_DS_LENGTH is 0. */ +/* *leaf, *complex_d, and *simple_d may be used as temporaries */ +/* during the construction. */ +#define COMPLEX 2 +#define LEAF 1 +#define SIMPLE 0 +#define NO_MEM (-1) +STATIC int GC_make_array_descriptor(size_t nelements, size_t size, + GC_descr descriptor, GC_descr *simple_d, + complex_descriptor **complex_d, + struct LeafDescriptor * leaf) { # define OPT_THRESHOLD 50 - /* For larger arrays, we try to combine descriptors of adjacent */ - /* descriptors to speed up marking, and to reduce the amount */ - /* of space needed on the mark stack. */ + /* For larger arrays, we try to combine descriptors of adjacent */ + /* descriptors to speed up marking, and to reduce the amount */ + /* of space needed on the mark stack. */ if ((descriptor & GC_DS_TAGS) == GC_DS_LENGTH) { - if ((word)descriptor == size) { - *simple_d = nelements * descriptor; - return(SIMPLE); + if (descriptor == (GC_descr)size) { + *simple_d = nelements * descriptor; + return(SIMPLE); } else if ((word)descriptor == 0) { *simple_d = (GC_descr)0; return(SIMPLE); @@ -233,20 +232,20 @@ struct LeafDescriptor * leaf; } } } else if (size <= BITMAP_BITS/2 - && (descriptor & GC_DS_TAGS) != GC_DS_PROC - && (size & (sizeof(word)-1)) == 0) { - int result = + && (descriptor & GC_DS_TAGS) != GC_DS_PROC + && (size & (sizeof(word)-1)) == 0) { + int result = GC_make_array_descriptor(nelements/2, 2*size, - GC_double_descr(descriptor, - BYTES_TO_WORDS(size)), - simple_d, complex_d, leaf); + GC_double_descr(descriptor, + BYTES_TO_WORDS(size)), + simple_d, complex_d, leaf); if ((nelements & 1) == 0) { return(result); } else { struct LeafDescriptor * one_element = (struct LeafDescriptor *) - GC_malloc_atomic(sizeof(struct LeafDescriptor)); - + GC_malloc_atomic(sizeof(struct LeafDescriptor)); + if (result == NO_MEM || one_element == 0) return(NO_MEM); one_element -> ld_tag = LEAF_TAG; one_element -> ld_size = size; @@ -257,61 +256,60 @@ struct LeafDescriptor * leaf; { struct LeafDescriptor * beginning = (struct LeafDescriptor *) - GC_malloc_atomic(sizeof(struct LeafDescriptor)); + GC_malloc_atomic(sizeof(struct LeafDescriptor)); if (beginning == 0) return(NO_MEM); beginning -> ld_tag = LEAF_TAG; beginning -> ld_size = size; beginning -> ld_nelements = 1; beginning -> ld_descriptor = *simple_d; *complex_d = GC_make_sequence_descriptor( - (complex_descriptor *)beginning, - (complex_descriptor *)one_element); + (complex_descriptor *)beginning, + (complex_descriptor *)one_element); break; } case LEAF: { struct LeafDescriptor * beginning = (struct LeafDescriptor *) - GC_malloc_atomic(sizeof(struct LeafDescriptor)); + GC_malloc_atomic(sizeof(struct LeafDescriptor)); if (beginning == 0) return(NO_MEM); beginning -> ld_tag = LEAF_TAG; beginning -> ld_size = leaf -> ld_size; beginning -> ld_nelements = leaf -> ld_nelements; beginning -> ld_descriptor = leaf -> ld_descriptor; *complex_d = GC_make_sequence_descriptor( - (complex_descriptor *)beginning, - (complex_descriptor *)one_element); + (complex_descriptor *)beginning, + (complex_descriptor *)one_element); break; } case COMPLEX: *complex_d = GC_make_sequence_descriptor( - *complex_d, - (complex_descriptor *)one_element); + *complex_d, + (complex_descriptor *)one_element); break; } return(COMPLEX); } } - { - leaf -> ld_size = size; - leaf -> ld_nelements = nelements; - leaf -> ld_descriptor = descriptor; - return(LEAF); - } + + leaf -> ld_size = size; + leaf -> ld_nelements = nelements; + leaf -> ld_descriptor = descriptor; + return(LEAF); } -complex_descriptor * GC_make_sequence_descriptor(first, second) -complex_descriptor * first; -complex_descriptor * second; +STATIC complex_descriptor * +GC_make_sequence_descriptor(complex_descriptor *first, + complex_descriptor *second) { struct SequenceDescriptor * result = (struct SequenceDescriptor *) - GC_malloc(sizeof(struct SequenceDescriptor)); - /* Can't result in overly conservative marking, since tags are */ - /* very small integers. Probably faster than maintaining type */ - /* info. */ + GC_malloc(sizeof(struct SequenceDescriptor)); + /* Can't result in overly conservative marking, since tags are */ + /* very small integers. Probably faster than maintaining type */ + /* info. */ if (result != 0) { - result -> sd_tag = SEQUENCE_TAG; + result -> sd_tag = SEQUENCE_TAG; result -> sd_first = first; result -> sd_second = second; } @@ -319,134 +317,113 @@ complex_descriptor * second; } #ifdef UNDEFINED -complex_descriptor * GC_make_complex_array_descriptor(nelements, descr) -word nelements; -complex_descriptor * descr; -{ + complex_descriptor * GC_make_complex_array_descriptor(word nelements, + complex_descriptor *descr) + { struct ComplexArrayDescriptor * result = (struct ComplexArrayDescriptor *) - GC_malloc(sizeof(struct ComplexArrayDescriptor)); - + GC_malloc(sizeof(struct ComplexArrayDescriptor)); + if (result != 0) { - result -> ad_tag = ARRAY_TAG; + result -> ad_tag = ARRAY_TAG; result -> ad_nelements = nelements; result -> ad_element_descr = descr; } return((complex_descriptor *)result); -} + } #endif -ptr_t * GC_eobjfreelist; +STATIC ptr_t * GC_eobjfreelist = NULL; -ptr_t * GC_arobjfreelist; +STATIC ptr_t * GC_arobjfreelist = NULL; -mse * GC_typed_mark_proc GC_PROTO((register word * addr, - register mse * mark_stack_ptr, - mse * mark_stack_limit, - word env)); +STATIC mse * GC_typed_mark_proc(word * addr, mse * mark_stack_ptr, + mse * mark_stack_limit, word env); -mse * GC_array_mark_proc GC_PROTO((register word * addr, - register mse * mark_stack_ptr, - mse * mark_stack_limit, - word env)); +STATIC mse * GC_array_mark_proc(word * addr, mse * mark_stack_ptr, + mse * mark_stack_limit, word env); /* Caller does not hold allocation lock. */ -void GC_init_explicit_typing() +STATIC void GC_init_explicit_typing(void) { register int i; DCL_LOCK_STATE; - -# ifdef PRINTSTATS - if (sizeof(struct LeafDescriptor) % sizeof(word) != 0) - ABORT("Bad leaf descriptor size"); -# endif - DISABLE_SIGNALS(); + GC_STATIC_ASSERT(sizeof(struct LeafDescriptor) % sizeof(word) == 0); LOCK(); if (GC_explicit_typing_initialized) { UNLOCK(); - ENABLE_SIGNALS(); return; } GC_explicit_typing_initialized = TRUE; /* Set up object kind with simple indirect descriptor. */ GC_eobjfreelist = (ptr_t *)GC_new_free_list_inner(); GC_explicit_kind = GC_new_kind_inner( - (void **)GC_eobjfreelist, - (((word)WORDS_TO_BYTES(-1)) | GC_DS_PER_OBJECT), - TRUE, TRUE); - /* Descriptors are in the last word of the object. */ + (void **)GC_eobjfreelist, + (((word)WORDS_TO_BYTES(-1)) | GC_DS_PER_OBJECT), + TRUE, TRUE); + /* Descriptors are in the last word of the object. */ GC_typed_mark_proc_index = GC_new_proc_inner(GC_typed_mark_proc); /* Set up object kind with array descriptor. */ GC_arobjfreelist = (ptr_t *)GC_new_free_list_inner(); GC_array_mark_proc_index = GC_new_proc_inner(GC_array_mark_proc); GC_array_kind = GC_new_kind_inner( - (void **)GC_arobjfreelist, - GC_MAKE_PROC(GC_array_mark_proc_index, 0), - FALSE, TRUE); + (void **)GC_arobjfreelist, + GC_MAKE_PROC(GC_array_mark_proc_index, 0), + FALSE, TRUE); for (i = 0; i < WORDSZ/2; i++) { GC_descr d = (((word)(-1)) >> (WORDSZ - i)) << (WORDSZ - i); d |= GC_DS_BITMAP; GC_bm_table[i] = d; } UNLOCK(); - ENABLE_SIGNALS(); } -# if defined(__STDC__) || defined(__cplusplus) - mse * GC_typed_mark_proc(register word * addr, - register mse * mark_stack_ptr, - mse * mark_stack_limit, - word env) -# else - mse * GC_typed_mark_proc(addr, mark_stack_ptr, mark_stack_limit, env) - register word * addr; - register mse * mark_stack_ptr; - mse * mark_stack_limit; - word env; -# endif +STATIC mse * GC_typed_mark_proc(word * addr, mse * mark_stack_ptr, + mse * mark_stack_limit, word env) { - register word bm = GC_ext_descriptors[env].ed_bitmap; - register word * current_p = addr; - register word current; - register ptr_t greatest_ha = GC_greatest_plausible_heap_addr; - register ptr_t least_ha = GC_least_plausible_heap_addr; - + word bm = GC_ext_descriptors[env].ed_bitmap; + word * current_p = addr; + word current; + ptr_t greatest_ha = GC_greatest_plausible_heap_addr; + ptr_t least_ha = GC_least_plausible_heap_addr; + DECLARE_HDR_CACHE; + + INIT_HDR_CACHE; for (; bm != 0; bm >>= 1, current_p++) { - if (bm & 1) { - current = *current_p; - FIXUP_POINTER(current); - if ((ptr_t)current >= least_ha && (ptr_t)current <= greatest_ha) { - PUSH_CONTENTS((ptr_t)current, mark_stack_ptr, - mark_stack_limit, current_p, exit1); - } - } + if (bm & 1) { + current = *current_p; + FIXUP_POINTER(current); + if ((ptr_t)current >= least_ha && (ptr_t)current <= greatest_ha) { + PUSH_CONTENTS((ptr_t)current, mark_stack_ptr, + mark_stack_limit, (ptr_t)current_p, exit1); + } + } } if (GC_ext_descriptors[env].ed_continued) { - /* Push an entry with the rest of the descriptor back onto the */ - /* stack. Thus we never do too much work at once. Note that */ - /* we also can't overflow the mark stack unless we actually */ - /* mark something. */ + /* Push an entry with the rest of the descriptor back onto the */ + /* stack. Thus we never do too much work at once. Note that */ + /* we also can't overflow the mark stack unless we actually */ + /* mark something. */ mark_stack_ptr++; if (mark_stack_ptr >= mark_stack_limit) { mark_stack_ptr = GC_signal_mark_stack_overflow(mark_stack_ptr); } - mark_stack_ptr -> mse_start = addr + WORDSZ; + mark_stack_ptr -> mse_start = (ptr_t)(addr + WORDSZ); mark_stack_ptr -> mse_descr = - GC_MAKE_PROC(GC_typed_mark_proc_index, env+1); + GC_MAKE_PROC(GC_typed_mark_proc_index, env+1); } return(mark_stack_ptr); } -/* Return the size of the object described by d. It would be faster to */ -/* store this directly, or to compute it as part of */ -/* GC_push_complex_descriptor, but hopefully it doesn't matter. */ -word GC_descr_obj_size(d) -register complex_descriptor *d; +/* Return the size of the object described by d. It would be faster to */ +/* store this directly, or to compute it as part of */ +/* GC_push_complex_descriptor, but hopefully it doesn't matter. */ +STATIC word GC_descr_obj_size(complex_descriptor *d) { switch(d -> TAG) { case LEAF_TAG: - return(d -> ld.ld_nelements * d -> ld.ld_size); + return(d -> ld.ld_nelements * d -> ld.ld_size); case ARRAY_TAG: return(d -> ad.ad_nelements * GC_descr_obj_size(d -> ad.ad_element_descr)); @@ -459,30 +436,27 @@ register complex_descriptor *d; } } -/* Push descriptors for the object at addr with complex descriptor d */ -/* onto the mark stack. Return 0 if the mark stack overflowed. */ -mse * GC_push_complex_descriptor(addr, d, msp, msl) -word * addr; -register complex_descriptor *d; -register mse * msp; -mse * msl; +/* Push descriptors for the object at addr with complex descriptor d */ +/* onto the mark stack. Return 0 if the mark stack overflowed. */ +STATIC mse * GC_push_complex_descriptor(word *addr, complex_descriptor *d, + mse *msp, mse *msl) { register ptr_t current = (ptr_t) addr; register word nelements; register word sz; register word i; - + switch(d -> TAG) { case LEAF_TAG: { register GC_descr descr = d -> ld.ld_descriptor; - + nelements = d -> ld.ld_nelements; if (msl - msp <= (ptrdiff_t)nelements) return(0); sz = d -> ld.ld_size; for (i = 0; i < nelements; i++) { msp++; - msp -> mse_start = (word *)current; + msp -> mse_start = current; msp -> mse_descr = descr; current += sz; } @@ -491,12 +465,12 @@ mse * msl; case ARRAY_TAG: { register complex_descriptor *descr = d -> ad.ad_element_descr; - + nelements = d -> ad.ad_nelements; sz = GC_descr_obj_size(descr); for (i = 0; i < nelements; i++) { msp = GC_push_complex_descriptor((word *)current, descr, - msp, msl); + msp, msl); if (msp == 0) return(0); current += sz; } @@ -506,11 +480,11 @@ mse * msl; { sz = GC_descr_obj_size(d -> sd.sd_first); msp = GC_push_complex_descriptor((word *)current, d -> sd.sd_first, - msp, msl); + msp, msl); if (msp == 0) return(0); current += sz; msp = GC_push_complex_descriptor((word *)current, d -> sd.sd_second, - msp, msl); + msp, msl); return(msp); } default: @@ -520,66 +494,51 @@ mse * msl; } /*ARGSUSED*/ -# if defined(__STDC__) || defined(__cplusplus) - mse * GC_array_mark_proc(register word * addr, - register mse * mark_stack_ptr, - mse * mark_stack_limit, - word env) -# else - mse * GC_array_mark_proc(addr, mark_stack_ptr, mark_stack_limit, env) - register word * addr; - register mse * mark_stack_ptr; - mse * mark_stack_limit; - word env; -# endif +STATIC mse * GC_array_mark_proc(word * addr, mse * mark_stack_ptr, + mse * mark_stack_limit, word env) { - register hdr * hhdr = HDR(addr); - register word sz = hhdr -> hb_sz; - register complex_descriptor * descr = (complex_descriptor *)(addr[sz-1]); + hdr * hhdr = HDR(addr); + size_t sz = hhdr -> hb_sz; + size_t nwords = BYTES_TO_WORDS(sz); + complex_descriptor * descr = (complex_descriptor *)(addr[nwords-1]); mse * orig_mark_stack_ptr = mark_stack_ptr; mse * new_mark_stack_ptr; - + if (descr == 0) { - /* Found a reference to a free list entry. Ignore it. */ - return(orig_mark_stack_ptr); + /* Found a reference to a free list entry. Ignore it. */ + return(orig_mark_stack_ptr); } - /* In use counts were already updated when array descriptor was */ - /* pushed. Here we only replace it by subobject descriptors, so */ - /* no update is necessary. */ + /* In use counts were already updated when array descriptor was */ + /* pushed. Here we only replace it by subobject descriptors, so */ + /* no update is necessary. */ new_mark_stack_ptr = GC_push_complex_descriptor(addr, descr, - mark_stack_ptr, - mark_stack_limit-1); + mark_stack_ptr, + mark_stack_limit-1); if (new_mark_stack_ptr == 0) { - /* Doesn't fit. Conservatively push the whole array as a unit */ - /* and request a mark stack expansion. */ - /* This cannot cause a mark stack overflow, since it replaces */ - /* the original array entry. */ - GC_mark_stack_too_small = TRUE; - new_mark_stack_ptr = orig_mark_stack_ptr + 1; - new_mark_stack_ptr -> mse_start = addr; - new_mark_stack_ptr -> mse_descr = WORDS_TO_BYTES(sz) | GC_DS_LENGTH; + /* Doesn't fit. Conservatively push the whole array as a unit */ + /* and request a mark stack expansion. */ + /* This cannot cause a mark stack overflow, since it replaces */ + /* the original array entry. */ + GC_mark_stack_too_small = TRUE; + new_mark_stack_ptr = orig_mark_stack_ptr + 1; + new_mark_stack_ptr -> mse_start = (ptr_t)addr; + new_mark_stack_ptr -> mse_descr = sz | GC_DS_LENGTH; } else { /* Push descriptor itself */ new_mark_stack_ptr++; - new_mark_stack_ptr -> mse_start = addr + sz - 1; + new_mark_stack_ptr -> mse_start = (ptr_t)(addr + nwords - 1); new_mark_stack_ptr -> mse_descr = sizeof(word) | GC_DS_LENGTH; } - return(new_mark_stack_ptr); + return new_mark_stack_ptr; } -#if defined(__STDC__) || defined(__cplusplus) - GC_descr GC_make_descriptor(GC_bitmap bm, size_t len) -#else - GC_descr GC_make_descriptor(bm, len) - GC_bitmap bm; - size_t len; -#endif +GC_API GC_descr GC_CALL GC_make_descriptor(GC_bitmap bm, size_t len) { - register signed_word last_set_bit = len - 1; - register word result; - register int i; + signed_word last_set_bit = len - 1; + GC_descr result; + signed_word i; # define HIGH_BIT (((word)1) << (WORDSZ - 1)) - + if (!GC_explicit_typing_initialized) GC_init_explicit_typing(); while (last_set_bit >= 0 && !GC_get_bit(bm, last_set_bit)) last_set_bit --; if (last_set_bit < 0) return(0 /* no pointers */); @@ -587,225 +546,180 @@ mse * msl; { register GC_bool all_bits_set = TRUE; for (i = 0; i < last_set_bit; i++) { - if (!GC_get_bit(bm, i)) { - all_bits_set = FALSE; - break; - } + if (!GC_get_bit(bm, i)) { + all_bits_set = FALSE; + break; + } } if (all_bits_set) { - /* An initial section contains all pointers. Use length descriptor. */ - return(WORDS_TO_BYTES(last_set_bit+1) | GC_DS_LENGTH); + /* An initial section contains all pointers. Use length descriptor. */ + return (WORDS_TO_BYTES(last_set_bit+1) | GC_DS_LENGTH); } } # endif if (last_set_bit < BITMAP_BITS) { - /* Hopefully the common case. */ - /* Build bitmap descriptor (with bits reversed) */ - result = HIGH_BIT; - for (i = last_set_bit - 1; i >= 0; i--) { - result >>= 1; - if (GC_get_bit(bm, i)) result |= HIGH_BIT; - } - result |= GC_DS_BITMAP; - return(result); + /* Hopefully the common case. */ + /* Build bitmap descriptor (with bits reversed) */ + result = HIGH_BIT; + for (i = last_set_bit - 1; i >= 0; i--) { + result >>= 1; + if (GC_get_bit(bm, i)) result |= HIGH_BIT; + } + result |= GC_DS_BITMAP; + return(result); } else { - signed_word index; - - index = GC_add_ext_descriptor(bm, (word)last_set_bit+1); - if (index == -1) return(WORDS_TO_BYTES(last_set_bit+1) | GC_DS_LENGTH); - /* Out of memory: use conservative */ - /* approximation. */ - result = GC_MAKE_PROC(GC_typed_mark_proc_index, (word)index); - return(result); + signed_word index; + + index = GC_add_ext_descriptor(bm, (word)last_set_bit+1); + if (index == -1) return(WORDS_TO_BYTES(last_set_bit+1) | GC_DS_LENGTH); + /* Out of memory: use conservative */ + /* approximation. */ + result = GC_MAKE_PROC(GC_typed_mark_proc_index, (word)index); + return result; } } -ptr_t GC_clear_stack(); - -#define GENERAL_MALLOC(lb,k) \ - (GC_PTR)GC_clear_stack(GC_generic_malloc((word)lb, k)) - -#define GENERAL_MALLOC_IOP(lb,k) \ - (GC_PTR)GC_clear_stack(GC_generic_malloc_ignore_off_page(lb, k)) - -#if defined(__STDC__) || defined(__cplusplus) - void * GC_malloc_explicitly_typed(size_t lb, GC_descr d) -#else - char * GC_malloc_explicitly_typed(lb, d) - size_t lb; - GC_descr d; -#endif +GC_API void * GC_CALL GC_malloc_explicitly_typed(size_t lb, GC_descr d) { -register ptr_t op; -register ptr_t * opp; -register word lw; -DCL_LOCK_STATE; + ptr_t op; + ptr_t * opp; + size_t lg; + DCL_LOCK_STATE; lb += TYPD_EXTRA_BYTES; - if( SMALL_OBJ(lb) ) { -# ifdef MERGE_SIZES - lw = GC_size_map[lb]; -# else - lw = ALIGNED_WORDS(lb); -# endif - opp = &(GC_eobjfreelist[lw]); - FASTLOCK(); - if( !FASTLOCK_SUCCEEDED() || (op = *opp) == 0 ) { - FASTUNLOCK(); + if(SMALL_OBJ(lb)) { + lg = GC_size_map[lb]; + opp = &(GC_eobjfreelist[lg]); + LOCK(); + if( (op = *opp) == 0 ) { + UNLOCK(); op = (ptr_t)GENERAL_MALLOC((word)lb, GC_explicit_kind); - if (0 == op) return 0; -# ifdef MERGE_SIZES - lw = GC_size_map[lb]; /* May have been uninitialized. */ -# endif + if (0 == op) return 0; + lg = GC_size_map[lb]; /* May have been uninitialized. */ } else { *opp = obj_link(op); - obj_link(op) = 0; - GC_words_allocd += lw; - FASTUNLOCK(); + obj_link(op) = 0; + GC_bytes_allocd += GRANULES_TO_BYTES(lg); + UNLOCK(); } + ((word *)op)[GRANULES_TO_WORDS(lg) - 1] = d; } else { op = (ptr_t)GENERAL_MALLOC((word)lb, GC_explicit_kind); - if (op != NULL) - lw = BYTES_TO_WORDS(GC_size(op)); + if (op != NULL) { + lg = BYTES_TO_GRANULES(GC_size(op)); + ((word *)op)[GRANULES_TO_WORDS(lg) - 1] = d; + } } - if (op != NULL) - ((word *)op)[lw - 1] = d; - return((GC_PTR) op); + return((void *) op); } -#if defined(__STDC__) || defined(__cplusplus) - void * GC_malloc_explicitly_typed_ignore_off_page(size_t lb, GC_descr d) -#else - char * GC_malloc_explicitly_typed_ignore_off_page(lb, d) - size_t lb; - GC_descr d; -#endif +GC_API void * GC_CALL GC_malloc_explicitly_typed_ignore_off_page(size_t lb, + GC_descr d) { -register ptr_t op; -register ptr_t * opp; -register word lw; -DCL_LOCK_STATE; + ptr_t op; + ptr_t * opp; + size_t lg; + DCL_LOCK_STATE; lb += TYPD_EXTRA_BYTES; if( SMALL_OBJ(lb) ) { -# ifdef MERGE_SIZES - lw = GC_size_map[lb]; -# else - lw = ALIGNED_WORDS(lb); -# endif - opp = &(GC_eobjfreelist[lw]); - FASTLOCK(); - if( !FASTLOCK_SUCCEEDED() || (op = *opp) == 0 ) { - FASTUNLOCK(); + lg = GC_size_map[lb]; + opp = &(GC_eobjfreelist[lg]); + LOCK(); + if( (op = *opp) == 0 ) { + UNLOCK(); op = (ptr_t)GENERAL_MALLOC_IOP(lb, GC_explicit_kind); -# ifdef MERGE_SIZES - lw = GC_size_map[lb]; /* May have been uninitialized. */ -# endif + if (0 == op) return 0; + lg = GC_size_map[lb]; /* May have been uninitialized. */ } else { *opp = obj_link(op); - obj_link(op) = 0; - GC_words_allocd += lw; - FASTUNLOCK(); + obj_link(op) = 0; + GC_bytes_allocd += GRANULES_TO_BYTES(lg); + UNLOCK(); } + ((word *)op)[GRANULES_TO_WORDS(lg) - 1] = d; } else { op = (ptr_t)GENERAL_MALLOC_IOP(lb, GC_explicit_kind); - if (op != NULL) - lw = BYTES_TO_WORDS(GC_size(op)); + if (op != NULL) { + lg = BYTES_TO_WORDS(GC_size(op)); + ((word *)op)[GRANULES_TO_WORDS(lg) - 1] = d; + } } - if (op != NULL) - ((word *)op)[lw - 1] = d; - return((GC_PTR) op); + return((void *) op); } -#if defined(__STDC__) || defined(__cplusplus) - void * GC_calloc_explicitly_typed(size_t n, - size_t lb, - GC_descr d) -#else - char * GC_calloc_explicitly_typed(n, lb, d) - size_t n; - size_t lb; - GC_descr d; -#endif +GC_API void * GC_CALL GC_calloc_explicitly_typed(size_t n, size_t lb, + GC_descr d) { -register ptr_t op; -register ptr_t * opp; -register word lw; -GC_descr simple_descr; -complex_descriptor *complex_descr; -register int descr_type; -struct LeafDescriptor leaf; -DCL_LOCK_STATE; + ptr_t op; + ptr_t * opp; + size_t lg; + GC_descr simple_descr; + complex_descriptor *complex_descr; + register int descr_type; + struct LeafDescriptor leaf; + DCL_LOCK_STATE; descr_type = GC_make_array_descriptor((word)n, (word)lb, d, - &simple_descr, &complex_descr, &leaf); + &simple_descr, &complex_descr, &leaf); switch(descr_type) { - case NO_MEM: return(0); - case SIMPLE: return(GC_malloc_explicitly_typed(n*lb, simple_descr)); - case LEAF: - lb *= n; - lb += sizeof(struct LeafDescriptor) + TYPD_EXTRA_BYTES; - break; - case COMPLEX: - lb *= n; - lb += TYPD_EXTRA_BYTES; - break; + case NO_MEM: return(0); + case SIMPLE: return(GC_malloc_explicitly_typed(n*lb, simple_descr)); + case LEAF: + lb *= n; + lb += sizeof(struct LeafDescriptor) + TYPD_EXTRA_BYTES; + break; + case COMPLEX: + lb *= n; + lb += TYPD_EXTRA_BYTES; + break; } if( SMALL_OBJ(lb) ) { -# ifdef MERGE_SIZES - lw = GC_size_map[lb]; -# else - lw = ALIGNED_WORDS(lb); -# endif - opp = &(GC_arobjfreelist[lw]); - FASTLOCK(); - if( !FASTLOCK_SUCCEEDED() || (op = *opp) == 0 ) { - FASTUNLOCK(); + lg = GC_size_map[lb]; + opp = &(GC_arobjfreelist[lg]); + LOCK(); + if( (op = *opp) == 0 ) { + UNLOCK(); op = (ptr_t)GENERAL_MALLOC((word)lb, GC_array_kind); - if (0 == op) return(0); -# ifdef MERGE_SIZES - lw = GC_size_map[lb]; /* May have been uninitialized. */ -# endif + if (0 == op) return(0); + lg = GC_size_map[lb]; /* May have been uninitialized. */ } else { *opp = obj_link(op); - obj_link(op) = 0; - GC_words_allocd += lw; - FASTUNLOCK(); + obj_link(op) = 0; + GC_bytes_allocd += GRANULES_TO_BYTES(lg); + UNLOCK(); } } else { op = (ptr_t)GENERAL_MALLOC((word)lb, GC_array_kind); if (0 == op) return(0); - lw = BYTES_TO_WORDS(GC_size(op)); + lg = BYTES_TO_GRANULES(GC_size(op)); } if (descr_type == LEAF) { /* Set up the descriptor inside the object itself. */ - VOLATILE struct LeafDescriptor * lp = + volatile struct LeafDescriptor * lp = (struct LeafDescriptor *) ((word *)op - + lw - (BYTES_TO_WORDS(sizeof(struct LeafDescriptor)) + 1)); - + + GRANULES_TO_WORDS(lg) + - (BYTES_TO_WORDS(sizeof(struct LeafDescriptor)) + 1)); + lp -> ld_tag = LEAF_TAG; lp -> ld_size = leaf.ld_size; lp -> ld_nelements = leaf.ld_nelements; lp -> ld_descriptor = leaf.ld_descriptor; - ((VOLATILE word *)op)[lw - 1] = (word)lp; + ((volatile word *)op)[GRANULES_TO_WORDS(lg) - 1] = (word)lp; } else { - extern unsigned GC_finalization_failures; - unsigned ff = GC_finalization_failures; - + size_t lw = GRANULES_TO_WORDS(lg); + ((word *)op)[lw - 1] = (word)complex_descr; - /* Make sure the descriptor is cleared once there is any danger */ - /* it may have been collected. */ - (void) - GC_general_register_disappearing_link((GC_PTR *) - ((word *)op+lw-1), - (GC_PTR) op); - if (ff != GC_finalization_failures) { - /* Couldn't register it due to lack of memory. Punt. */ - /* This will probably fail too, but gives the recovery code */ - /* a chance. */ - return(GC_malloc(n*lb)); - } + /* Make sure the descriptor is cleared once there is any danger */ + /* it may have been collected. */ + if (GC_general_register_disappearing_link((void * *)((word *)op+lw-1), + op) == GC_NO_MEMORY) { + /* Couldn't register it due to lack of memory. Punt. */ + /* This will probably fail too, but gives the recovery code */ + /* a chance. */ + return(GC_malloc(n*lb)); + } } - return((GC_PTR) op); + return((void *) op); }