diff options
author | Jay Krell <jaykrell@microsoft.com> | 2018-02-22 23:23:48 +0300 |
---|---|---|
committer | Ivan Maidanski <ivmai@mail.ru> | 2018-02-22 23:23:48 +0300 |
commit | f32ccf22fea51331c9645da025af2dab6153f8af (patch) | |
tree | d2bd4cb6efe2bd32bb28685781fb978d3df77e2d /headers.c | |
parent | 4b76d1539641df88da5c1dedc8f741e69b32f21c (diff) | |
download | bdwgc-f32ccf22fea51331c9645da025af2dab6153f8af.tar.gz |
Eliminate C++ warnings about deprecated register keyword (GC source)
Issue #206 (bdwgc).
* blacklst.c (GC_number_stack_black_listed, total_stack_black_listed):
Remove register keyword for local variables.
* dyn_load.c [IRIX5 || USE_PROC_FOR_LIBRARIES && !LINUX]
(GC_register_dynamic_libraries): Likewise.
* extra/pcr_interface.c [PCR] (GC_enumerate_block): Likewise.
* finalize.c (GC_grow_table): Likewise.
* headers.c (alloc_hdr, GC_init_headers, GC_remove_counts,
GC_prev_block): Likewise.
* include/private/gc_pmark.h (PUSH_OBJ): Likewise.
* mach_dep.c [!HAVE_PUSH_REGS && !HAVE_BUILTIN_UNWIND_INIT]
(GC_with_callee_saves_pushed): Likewise.
* mark.c (clear_marks_for_block): Likewise.
* mark_rts.c [MSWIN32 || MSWINCE || CYGWIN32] (GC_add_roots_inner):
Likewise.
* mark_rts.c [!NO_DEBUGGING] (GC_is_tmp_root): Likewise.
* os_dep.c [GWW_VDB || MPROTECT_VDB || PROC_VDB || MANUAL_VDB]
(GC_page_was_dirty): Likewise.
* os_dep.c [CHECKSUMS && GWW_VDB || PROC_VDB] (GC_or_pages,
GC_page_was_ever_dirty): Likewise.
* os_dep.c (GC_write_fault_handler): Likewise.
* os_dep.c [PROC_VDB] (GC_read_dirty): Likewise.
* os_dep.c [MPROTECT_VDB && DARWIN] (catch_exception_raise): Likewise.
* os_dep.c [SAVE_CALL_CHAIN && NARGS>0] (GC_save_callers): Likewise.
* pthread_stop_world.c [!NACL] (GC_start_world): Likewise.
* pthread_support.c (GC_delete_thread, GC_delete_gc_thread): Likewise.
* typd_mlc.c (GC_push_complex_descriptor): Likewise.
* win32_threads.c (GC_delete_gc_thread_no_free, GC_delete_thread):
Likewise.
Diffstat (limited to 'headers.c')
-rw-r--r-- | headers.c | 15 |
1 files changed, 8 insertions, 7 deletions
@@ -167,9 +167,9 @@ static hdr * hdr_free_list = 0; /* Return an uninitialized header */ static hdr * alloc_hdr(void) { - register hdr * result; + hdr * result; - if (hdr_free_list == 0) { + if (NULL == hdr_free_list) { result = (hdr *)GC_scratch_alloc(sizeof(hdr)); } else { result = hdr_free_list; @@ -192,7 +192,7 @@ GC_INLINE void free_hdr(hdr * hhdr) GC_INNER void GC_init_headers(void) { - register unsigned i; + unsigned i; GC_all_nils = (bottom_index *)GC_scratch_alloc(sizeof(bottom_index)); if (GC_all_nils == NULL) { @@ -302,7 +302,8 @@ GC_INNER void GC_remove_header(struct hblk *h) /* Remove forwarding counts for h */ GC_INNER void GC_remove_counts(struct hblk *h, size_t sz/* bytes */) { - register struct hblk * hbp; + struct hblk * hbp; + for (hbp = h+1; (word)hbp < (word)h + sz; hbp += 1) { SET_HDR(hbp, 0); } @@ -376,12 +377,12 @@ GC_INNER struct hblk * GC_next_used_block(struct hblk *h) /* Unlike the above, this may return a free block. */ GC_INNER struct hblk * GC_prev_block(struct hblk *h) { - register bottom_index * bi; - register signed_word j = ((word)h >> LOG_HBLKSIZE) & (BOTTOM_SZ-1); + bottom_index * bi; + signed_word j = ((word)h >> LOG_HBLKSIZE) & (BOTTOM_SZ-1); GET_BI(h, bi); if (bi == GC_all_nils) { - register word hi = (word)h >> (LOG_BOTTOM_SZ + LOG_HBLKSIZE); + word hi = (word)h >> (LOG_BOTTOM_SZ + LOG_HBLKSIZE); bi = GC_all_bottom_indices_end; while (bi != 0 && bi -> key > hi) bi = bi -> desc_link; j = BOTTOM_SZ - 1; |