diff options
| author | Ivan Maidanski <ivmai@mail.ru> | 2014-03-30 11:24:12 +0400 |
|---|---|---|
| committer | Ivan Maidanski <ivmai@mail.ru> | 2014-03-30 11:24:12 +0400 |
| commit | 5a4bcb2aa28f7af312922b1ecbb2f729c94caab1 (patch) | |
| tree | 9a8ca423774aef14a795fdd8c68c00db86cc9b0d /checksums.c | |
| parent | ff6c3d9fb8e7065ffe74cb780b2c1f54868152e2 (diff) | |
| download | bdwgc-5a4bcb2aa28f7af312922b1ecbb2f729c94caab1.tar.gz | |
Define ROUNDUP_PAGESIZE, ROUNDUP_GRANULE_SIZE macros (code refactoring)
* alloc.c (GC_expand_hp_inner): Use ROUNDUP_PAGESIZE().
* checksums.c (GC_record_fault, GC_was_faulted): Likewise.
* os_dep.c (GC_unix_mmap_get_mem, GC_wince_get_mem, GC_unmap_start,
GC_remove_protection): Likewise.
* headers.c (GC_scratch_alloc): Use ROUNDUP_GRANULE_SIZE().
* malloc.c (GC_alloc_large): Likewise.
* mallocx.c (GC_malloc_many): Likewise.
* headers.c (GC_scratch_alloc): Use ROUNDUP_PAGESIZE() (only if
USE_MMAP).
* include/private/gc_priv.h (ROUNDUP_GRANULE_SIZE, ROUNDUP_PAGESIZE):
Define macro to round up a value to a multiple of a granule or a page,
respectively.
Diffstat (limited to 'checksums.c')
| -rw-r--r-- | checksums.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/checksums.c b/checksums.c index f5ad843a..f0f902a3 100644 --- a/checksums.c +++ b/checksums.c @@ -41,10 +41,8 @@ STATIC size_t GC_n_faulted = 0; void GC_record_fault(struct hblk * h) { - word page = (word)h; + word page = ROUNDUP_PAGESIZE((word)h); - page += GC_page_size - 1; - page &= ~(GC_page_size - 1); if (GC_n_faulted >= NSUMS) ABORT("write fault log overflowed"); GC_faulted[GC_n_faulted++] = page; } @@ -52,10 +50,8 @@ void GC_record_fault(struct hblk * h) STATIC GC_bool GC_was_faulted(struct hblk *h) { size_t i; - word page = (word)h; + word page = ROUNDUP_PAGESIZE((word)h); - page += GC_page_size - 1; - page &= ~(GC_page_size - 1); for (i = 0; i < GC_n_faulted; ++i) { if (GC_faulted[i] == page) return TRUE; } |