From b191757f46ea30f632549b944c252fcccdc46ba5 Mon Sep 17 00:00:00 2001 From: tromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4> Date: Wed, 2 Aug 2000 19:46:07 +0000 Subject: [PATCH] * gc_priv.h (GC_generic_malloc_inner): Prototype. (GC_generic_malloc): Likewise. (GC_add_to_black_list_normal): Likewise. (GC_find_header): Likewise. (GC_ADD_TO_BLACK_LIST_NORMAL): Cast bits argument to word. * gc_mark.h (GC_find_start): Prototype. (GC_signal_mark_stack_overflow): Likewise. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@35431 138bc75d-0d04-0410-961f-82ee72b054a4 --- boehm-gc/ChangeLog | 10 ++++++++++ boehm-gc/gc_mark.h | 10 +++++++--- boehm-gc/gc_priv.h | 16 ++++++++-------- 3 files changed, 25 insertions(+), 11 deletions(-) diff --git a/boehm-gc/ChangeLog b/boehm-gc/ChangeLog index 47a7e7bdeddb..b3ef6d36eec9 100644 --- a/boehm-gc/ChangeLog +++ b/boehm-gc/ChangeLog @@ -1,3 +1,13 @@ +2000-08-02 Tom Tromey <tromey@cygnus.com> + + * gc_priv.h (GC_generic_malloc_inner): Prototype. + (GC_generic_malloc): Likewise. + (GC_add_to_black_list_normal): Likewise. + (GC_find_header): Likewise. + (GC_ADD_TO_BLACK_LIST_NORMAL): Cast bits argument to word. + * gc_mark.h (GC_find_start): Prototype. + (GC_signal_mark_stack_overflow): Likewise. + 2000-07-24 Alexandre Oliva <aoliva@redhat.com> * configure.in (THREADS): Don't --enable-threads on IRIX <= 5.*. diff --git a/boehm-gc/gc_mark.h b/boehm-gc/gc_mark.h index 3a4908fb908f..295423a62a19 100644 --- a/boehm-gc/gc_mark.h +++ b/boehm-gc/gc_mark.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 1991-1994 by Xerox Corporation. All rights reserved. + * Copyright (c) 1991-1994, 2000 by Xerox Corporation. All rights reserved. * * THIS MATERIAL IS PROVIDED AS IS, WITH ABSOLUTELY NO WARRANTY EXPRESSED * OR IMPLIED. ANY USE IS AT YOUR OWN RISK. @@ -117,9 +117,13 @@ extern mse * GC_mark_stack_top; extern mse * GC_mark_stack; -ptr_t GC_find_start(); +#ifdef PRINT_BLACK_LIST +ptr_t GC_find_start(ptr_t, hdr*, word); +#else +ptr_t GC_find_start(ptr_t, hdr*); +#endif -mse * GC_signal_mark_stack_overflow(); +mse * GC_signal_mark_stack_overflow(mse *); # ifdef GATHERSTATS # define ADD_TO_ATOMIC(sz) GC_atomic_in_use += (sz) diff --git a/boehm-gc/gc_priv.h b/boehm-gc/gc_priv.h index 22e9728c8a66..841b752f9f37 100644 --- a/boehm-gc/gc_priv.h +++ b/boehm-gc/gc_priv.h @@ -1597,23 +1597,23 @@ void GC_register_data_segments(); /* Black listing: */ void GC_bl_init(); # ifndef ALL_INTERIOR_POINTERS - void GC_add_to_black_list_normal(/* bits, maybe source */); + void GC_add_to_black_list_normal(word /* bits, maybe source */); /* Register bits as a possible future false */ /* reference from the heap or static data */ # ifdef PRINT_BLACK_LIST # define GC_ADD_TO_BLACK_LIST_NORMAL(bits, source) \ - GC_add_to_black_list_normal(bits, source) + GC_add_to_black_list_normal((word) bits, source) # else # define GC_ADD_TO_BLACK_LIST_NORMAL(bits, source) \ - GC_add_to_black_list_normal(bits) + GC_add_to_black_list_normal((word) bits) # endif # else # ifdef PRINT_BLACK_LIST # define GC_ADD_TO_BLACK_LIST_NORMAL(bits, source) \ - GC_add_to_black_list_stack(bits, source) + GC_add_to_black_list_stack((word) bits, source) # else # define GC_ADD_TO_BLACK_LIST_NORMAL(bits, source) \ - GC_add_to_black_list_stack(bits) + GC_add_to_black_list_stack((word) bits) # endif # endif @@ -1713,7 +1713,7 @@ void GC_collect_a_little_inner(/* int n */); /* collection work, if appropriate. */ /* A unit is an amount appropriate for */ /* HBLKSIZE bytes of allocation. */ -ptr_t GC_generic_malloc(/* bytes, kind */); +ptr_t GC_generic_malloc(word bytes, int kind); /* Allocate an object of the given */ /* kind. By default, there are only */ /* a few kinds: composite(pointerfree), */ @@ -1727,7 +1727,7 @@ ptr_t GC_generic_malloc_ignore_off_page(/* bytes, kind */); /* As above, but pointers past the */ /* first page of the resulting object */ /* are ignored. */ -ptr_t GC_generic_malloc_inner(/* bytes, kind */); +ptr_t GC_generic_malloc_inner(word bytes, int kind); /* Ditto, but I already hold lock, etc. */ ptr_t GC_generic_malloc_words_small GC_PROTO((size_t words, int kind)); /* As above, but size in units of words */ @@ -1757,7 +1757,7 @@ void GC_remove_header(/*h*/); /* Remove the header for block h. */ void GC_remove_counts(/*h, sz*/); /* Remove forwarding counts for h. */ -hdr * GC_find_header(/*p*/); /* Debugging only. */ +hdr * GC_find_header(ptr_t /*p*/); /* Debugging only. */ void GC_finalize(); /* Perform all indicated finalization actions */ /* on unmarked objects. */ -- GitLab