summaryrefslogtreecommitdiff
path: root/headers.c
diff options
context:
space:
mode:
authorhboehm <hboehm>2007-06-07 04:53:32 +0200
committerIvan Maidanski <ivmai@mail.ru>2011-07-26 19:06:40 +0200
commit16509ab0ddba3346db6ad5ca44a0c9e2cbda31a3 (patch)
tree47210e56e470e96e6de9ea57da8899a1cb21ab3f /headers.c
parente8a9ac333a5cb33944ec8a4c9c2884c4980c8cd7 (diff)
2007-06-06 Hans Boehm <Hans.Boehm@hp.com>
* Makefile.am, Makefile.direct: Add NT_X64_STATIC_THREADS_MAKEFILE. * Makefile.in: Regenerate. * NT_X64_STATIC_THREADS_MAKEFILE: Fix warning flags. * allochblk.c, alloc.c, blacklst.c, dbg_malc.c, dyn_load.c, finalize.c, headers.c, mach_dep.c, malloc.c, mark.c, misc.c, obj_map.c, os_dep.c, ptr_chck.c, reclaim.c, typd_mlc.c, win32_threads.c, cord/de_win.c, include/gc_mark.h, include/private/gc_hdrs.h, include/private/gc_pmark.h, include/private/gc_priv.h, tests/test_cpp.cc: Replace old style function declarations. Clean up integral types. Remove register declarations. The change in malloc.c and the "int descr" declaration in mark.c are the most likely to have been real bugs outside of win64. * msvc_dbg.c: Disable on win64. * win32_threads.c: Add AMD64 support. * include/gc.h: no backtrace on AMD64 for now.
Diffstat (limited to 'headers.c')
-rw-r--r--headers.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/headers.c b/headers.c
index 1a0ce88..6b4eb84 100644
--- a/headers.c
+++ b/headers.c
@@ -204,7 +204,7 @@ static GC_bool get_index(word addr)
bottom_index *pi;
# ifdef HASH_TL
- unsigned i = TL_HASH(hi);
+ word i = TL_HASH(hi);
bottom_index * old;
old = p = GC_top_index[i];
@@ -262,8 +262,8 @@ struct hblkhdr * GC_install_header(struct hblk *h)
/* Set up forwarding counts for block h of size sz */
GC_bool GC_install_counts(struct hblk *h, size_t sz/* bytes */)
{
- register struct hblk * hbp;
- register int i;
+ struct hblk * hbp;
+ word i;
for (hbp = h; (char *)hbp < (char *)h + sz; hbp += BOTTOM_SZ) {
if (!get_index((word) hbp)) return(FALSE);
@@ -301,7 +301,7 @@ void GC_remove_counts(struct hblk *h, size_t sz/* bytes */)
void GC_apply_to_all_blocks(void (*fn)(struct hblk *h, word client_data),
word client_data)
{
- int j;
+ signed_word j;
bottom_index * index_p;
for (index_p = GC_all_bottom_indices; index_p != 0;
@@ -318,7 +318,7 @@ void GC_apply_to_all_blocks(void (*fn)(struct hblk *h, word client_data),
} else if (index_p->index[j] == 0) {
j--;
} else {
- j -= (word)(index_p->index[j]);
+ j -= (signed_word)(index_p->index[j]);
}
}
}