diff options
-rw-r--r-- | allchblk.c | 11 | ||||
-rw-r--r-- | mark.c | 2 | ||||
-rw-r--r-- | ptr_chck.c | 2 |
3 files changed, 7 insertions, 8 deletions
@@ -537,9 +537,9 @@ GC_INNER void GC_merge_unmapped(void) next = (struct hblk *)((word)h + size); GET_HDR(next, nexthdr); /* Coalesce with successor, if possible */ - if (0 != nexthdr && HBLK_IS_FREE(nexthdr) - && (signed_word) (size + (nextsize = nexthdr->hb_sz)) > 0 - /* no pot. overflow */) { + if (nexthdr != NULL && HBLK_IS_FREE(nexthdr) + && !((size + (nextsize = nexthdr -> hb_sz)) & SIGNB) + /* no overflow */) { /* Note that we usually try to avoid adjacent free blocks */ /* that are either both mapped or both unmapped. But that */ /* isn't guaranteed to hold since we remap blocks when we */ @@ -990,8 +990,7 @@ GC_INNER void GC_freehblk(struct hblk *hbp) prev = GC_free_block_ending_at(hbp); /* Coalesce with successor, if possible */ if (nexthdr != NULL && HBLK_IS_FREE(nexthdr) && IS_MAPPED(nexthdr) - && (signed_word)(hhdr -> hb_sz + nexthdr -> hb_sz) > 0 - /* no overflow */) { + && !((hhdr -> hb_sz + nexthdr -> hb_sz) & SIGNB) /* no overflow */) { GC_remove_from_fl(nexthdr); hhdr -> hb_sz += nexthdr -> hb_sz; GC_remove_header(next); @@ -1000,7 +999,7 @@ GC_INNER void GC_freehblk(struct hblk *hbp) if (prev /* != NULL */) { /* CPPCHECK */ prevhdr = HDR(prev); if (IS_MAPPED(prevhdr) - && (signed_word)(hhdr -> hb_sz + prevhdr -> hb_sz) > 0) { + && !((hhdr -> hb_sz + prevhdr -> hb_sz) & SIGNB)) { GC_remove_from_fl(prevhdr); prevhdr -> hb_sz += hhdr -> hb_sz; # ifdef USE_MUNMAP @@ -678,7 +678,7 @@ GC_INNER mse * GC_mark_from(mse *mark_stack_top, mse *mark_stack, mark_stack_limit, ENV(descr)); continue; case GC_DS_PER_OBJECT: - if ((signed_word)descr >= 0) { + if (!(descr & SIGNB)) { /* Descriptor is in the object. */ descr = *(word *)(current_p + descr - GC_DS_PER_OBJECT); } else { @@ -240,7 +240,7 @@ GC_API void * GC_CALL GC_is_visible(void *p) /* For now we just punt. */ break; case GC_DS_PER_OBJECT: - if ((signed_word)descr >= 0) { + if (!(descr & SIGNB)) { descr = *(word *)((ptr_t)base + (descr & ~GC_DS_TAGS)); } else { ptr_t type_descr = *(ptr_t *)base; |