diff options
-rw-r--r-- | gcj_mlc.c | 4 | ||||
-rw-r--r-- | malloc.c | 8 | ||||
-rw-r--r-- | misc.c | 4 | ||||
-rw-r--r-- | typd_mlc.c | 2 |
4 files changed, 9 insertions, 9 deletions
@@ -177,7 +177,7 @@ static void maybe_finalize(void) } } else { GC_gcjobjfreelist[lg] = obj_link(op); - GC_bytes_allocd += GRANULES_TO_BYTES(lg); + GC_bytes_allocd += GRANULES_TO_BYTES((word)lg); } *(void **)op = ptr_to_struct_containing_descr; GC_ASSERT(((void **)op)[1] == 0); @@ -250,7 +250,7 @@ GC_API GC_ATTR_MALLOC void * GC_CALL GC_gcj_malloc_ignore_off_page(size_t lb, } } else { GC_gcjobjfreelist[lg] = obj_link(op); - GC_bytes_allocd += GRANULES_TO_BYTES(lg); + GC_bytes_allocd += GRANULES_TO_BYTES((word)lg); } } else { LOCK(); @@ -147,7 +147,7 @@ GC_INNER void * GC_generic_malloc_inner(size_t lb, int k) } *opp = obj_link(op); obj_link(op) = 0; - GC_bytes_allocd += GRANULES_TO_BYTES(lg); + GC_bytes_allocd += GRANULES_TO_BYTES((word)lg); } else { op = (ptr_t)GC_alloc_large_and_clear(ADD_SLOP(lb), k, 0); if (op != NULL) @@ -266,7 +266,7 @@ GC_API GC_ATTR_MALLOC void * GC_CALL GC_malloc_kind_global(size_t lb, int k) *opp = obj_link(op); obj_link(op) = 0; } - GC_bytes_allocd += GRANULES_TO_BYTES(lg); + GC_bytes_allocd += GRANULES_TO_BYTES((word)lg); UNLOCK(); return op; } @@ -316,11 +316,11 @@ GC_API GC_ATTR_MALLOC void * GC_CALL GC_generic_malloc_uncollectable( if (EXPECT(op != NULL, TRUE)) { *opp = obj_link(op); obj_link(op) = 0; - GC_bytes_allocd += GRANULES_TO_BYTES(lg); + GC_bytes_allocd += GRANULES_TO_BYTES((word)lg); /* Mark bit was already set on free list. It will be */ /* cleared only temporarily during a collection, as a */ /* result of the normal free list mark bit clearing. */ - GC_non_gc_bytes += GRANULES_TO_BYTES(lg); + GC_non_gc_bytes += GRANULES_TO_BYTES((word)lg); UNLOCK(); } else { UNLOCK(); @@ -2069,8 +2069,8 @@ GC_API void * GC_CALL GC_do_blocking(GC_fn_type fn, void * client_data) static void block_add_size(struct hblk *h, word pbytes) { hdr *hhdr = HDR(h); - *(word *)pbytes += (WORDS_TO_BYTES(hhdr->hb_sz) + (HBLKSIZE - 1)) - & ~(HBLKSIZE - 1); + *(word *)pbytes += (WORDS_TO_BYTES((word)hhdr->hb_sz) + (HBLKSIZE - 1)) + & ~(word)(HBLKSIZE - 1); } GC_API size_t GC_CALL GC_get_memory_use(void) @@ -618,7 +618,7 @@ GC_API GC_ATTR_MALLOC void * GC_CALL } else { GC_eobjfreelist[lg] = obj_link(op); obj_link(op) = 0; - GC_bytes_allocd += GRANULES_TO_BYTES(lg); + GC_bytes_allocd += GRANULES_TO_BYTES((word)lg); UNLOCK(); } ((word *)op)[GRANULES_TO_WORDS(lg) - 1] = d; |