From: ivmai Date: Sun, 8 May 2011 21:21:44 +0000 (+0000) Subject: 2011-05-08 Ivan Maidanski X-Git-Tag: gc7_2alpha6~39 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=65310cf3ce928f76de8de7aaa3aef77a6b05401d;p=gc 2011-05-08 Ivan Maidanski * include/gc_inline.h (GC_MALLOC_WORDS, GC_CONS): Add missing parentheses. * include/gc_typed.h (GC_get_bit, GC_set_bit, GC_CALLOC_EXPLICITLY_TYPED): Ditto. --- diff --git a/ChangeLog b/ChangeLog index 796c6d1f..b044d661 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2011-05-08 Ivan Maidanski + + * include/gc_inline.h (GC_MALLOC_WORDS, GC_CONS): Add missing + parentheses. + * include/gc_typed.h (GC_get_bit, GC_set_bit, + GC_CALLOC_EXPLICITLY_TYPED): Ditto. + 2011-05-07 Ivan Maidanski * include/private/gcconfig.h (NO_GETCONTEXT): Add missing ')'. diff --git a/include/gc_inline.h b/include/gc_inline.h index 312ed61b..e2bb881e 100644 --- a/include/gc_inline.h +++ b/include/gc_inline.h @@ -122,7 +122,7 @@ GC_API void GC_CALL GC_generic_malloc_many(size_t /* lb */, int /* k */, size_t grans = GC_WORDS_TO_WHOLE_GRANULES(n); \ GC_FAST_MALLOC_GRANS(result, grans, tiny_fl, 0, \ NORMAL, GC_malloc(grans*GC_GRANULE_BYTES), \ - *(void **)result = 0); \ + *(void **)(result) = 0); \ } # define GC_MALLOC_ATOMIC_WORDS(result,n,tiny_fl) \ @@ -139,7 +139,7 @@ GC_API void GC_CALL GC_generic_malloc_many(size_t /* lb */, int /* k */, size_t grans = GC_WORDS_TO_WHOLE_GRANULES(2); \ GC_FAST_MALLOC_GRANS(result, grans, tiny_fl, 0, \ NORMAL, GC_malloc(grans*GC_GRANULE_BYTES), \ - *(void **)result = (void *)(first)); \ + *(void **)(result) = (void *)(first)); \ ((void **)(result))[1] = (void *)(second); \ } diff --git a/include/gc_typed.h b/include/gc_typed.h index 10111cdb..a794fbbe 100644 --- a/include/gc_typed.h +++ b/include/gc_typed.h @@ -39,9 +39,9 @@ typedef GC_word * GC_bitmap; #define GC_WORDSZ (8 * sizeof(GC_word)) #define GC_get_bit(bm, index) \ - (((bm)[index / GC_WORDSZ] >> (index % GC_WORDSZ)) & 1) + (((bm)[(index) / GC_WORDSZ] >> ((index) % GC_WORDSZ)) & 1) #define GC_set_bit(bm, index) \ - (bm)[index / GC_WORDSZ] |= ((GC_word)1 << (index % GC_WORDSZ)) + ((bm)[(index) / GC_WORDSZ] |= (GC_word)1 << ((index) % GC_WORDSZ)) #define GC_WORD_OFFSET(t, f) (offsetof(t,f) / sizeof(GC_word)) #define GC_WORD_LEN(t) (sizeof(t) / sizeof(GC_word)) #define GC_BITMAP_SIZE(t) ((GC_WORD_LEN(t) + GC_WORDSZ - 1) / GC_WORDSZ) @@ -99,7 +99,7 @@ GC_API void * GC_CALL GC_calloc_explicitly_typed(size_t /* nelements */, #ifdef GC_DEBUG # define GC_MALLOC_EXPLICITLY_TYPED(bytes, d) GC_MALLOC(bytes) -# define GC_CALLOC_EXPLICITLY_TYPED(n, bytes, d) GC_MALLOC(n * bytes) +# define GC_CALLOC_EXPLICITLY_TYPED(n, bytes, d) GC_MALLOC((n) * (bytes)) #else # define GC_MALLOC_EXPLICITLY_TYPED(bytes, d) \ GC_malloc_explicitly_typed(bytes, d)