diff options
| -rw-r--r-- | alloc.c | 4 | ||||
| -rw-r--r-- | checksums.c | 9 | ||||
| -rw-r--r-- | mark.c | 5 | ||||
| -rw-r--r-- | tests/test.c | 2 |
4 files changed, 9 insertions, 11 deletions
@@ -1209,9 +1209,9 @@ GC_INNER void GC_add_to_heap(struct hblk *p, size_t bytes) for (h = (struct hblk *)start; (word)h < (word)(start + len); h++) { if (GC_is_black_listed(h, HBLKSIZE)) nbl++; } - GC_printf("Section %d from %p to %p %lu/%lu blacklisted\n", + GC_printf("Section %d from %p to %p %u/%lu blacklisted\n", i, (void *)start, (void *)&start[len], - (unsigned long)nbl, (unsigned long)divHBLKSZ(len)); + nbl, (unsigned long)divHBLKSZ(len)); } } #endif diff --git a/checksums.c b/checksums.c index 49120c39..4847661a 100644 --- a/checksums.c +++ b/checksums.c @@ -93,8 +93,8 @@ STATIC word GC_checksum(struct hblk *h) int GC_n_dirty_errors = 0; int GC_n_faulted_dirty_errors = 0; int GC_n_changed_errors = 0; -int GC_n_clean = 0; -int GC_n_dirty = 0; +unsigned long GC_n_clean = 0; +unsigned long GC_n_dirty = 0; STATIC void GC_update_check_page(struct hblk *h, int index) { @@ -199,14 +199,13 @@ void GC_check_dirty(void) } out: GC_COND_LOG_PRINTF("Checked %lu clean and %lu dirty pages\n", - (unsigned long)GC_n_clean, (unsigned long)GC_n_dirty); + GC_n_clean, GC_n_dirty); if (GC_n_dirty_errors > 0) { GC_err_printf("Found %d dirty bit errors (%d were faulted)\n", GC_n_dirty_errors, GC_n_faulted_dirty_errors); } if (GC_n_changed_errors > 0) { - GC_err_printf("Found %lu changed bit errors\n", - (unsigned long)GC_n_changed_errors); + GC_err_printf("Found %d changed bit errors\n", GC_n_changed_errors); GC_err_printf( "These may be benign (provoked by nonpointer changes)\n"); # ifdef THREADS @@ -1114,7 +1114,7 @@ STATIC void GC_mark_local(mse *local_mark_stack, int id) GC_ASSERT((word)GC_mark_stack <= (word)my_first_nonempty); GC_ASSERT((word)my_first_nonempty <= (word)AO_load((volatile AO_t *)&GC_mark_stack_top) + sizeof(mse)); - GC_VERBOSE_LOG_PRINTF("Starting mark helper %lu\n", (unsigned long)id); + GC_VERBOSE_LOG_PRINTF("Starting mark helper %d\n", id); GC_release_mark_lock(); for (;;) { size_t n_on_stack; @@ -1172,8 +1172,7 @@ STATIC void GC_mark_local(mse *local_mark_stack, int id) /* both conditions actually held simultaneously. */ GC_helper_count--; if (0 == GC_helper_count) need_to_notify = TRUE; - GC_VERBOSE_LOG_PRINTF("Finished mark helper %lu\n", - (unsigned long)id); + GC_VERBOSE_LOG_PRINTF("Finished mark helper %d\n", id); GC_release_mark_lock(); if (need_to_notify) GC_notify_all_marker(); return; diff --git a/tests/test.c b/tests/test.c index 353d82bc..d002e3f2 100644 --- a/tests/test.c +++ b/tests/test.c @@ -1182,7 +1182,7 @@ void typed_test(void) } for (i = 0; i < 20000; i++) { if (new[0] != 17) { - GC_printf("typed alloc failed at %lu\n", (unsigned long)i); + GC_printf("Typed alloc failed at %d\n", i); FAIL; } new[0] = 0; |