From bb557ed4037d34093f0a949c57249acccf7c828a Mon Sep 17 00:00:00 2001 From: hboehm Date: Thu, 25 Sep 2008 00:24:21 +0000 Subject: [PATCH] 2008-09-24 Hans Boehm (Really Ivan Maidanski) * finalize.c (GC_general_register_disappearing_link): Remove redundant code. * gcj_mlc.c (GC_init_gcj_malloc): Add cast to signed. * os_dep.c: (GC_write_fault_handler): Remove remaining references to deleted variable "code". Remove redundant FREEBSD definitions. * include/private/gcconfig.h (GWW_VDB): Define for X86_64 when defined for X86. (STATIC): Define as "static" with NO_DEBUGGING. --- ChangeLog | 10 ++++++++++ finalize.c | 1 - gcj_mlc.c | 3 ++- include/private/gcconfig.h | 8 +++++--- os_dep.c | 9 +++------ 5 files changed, 20 insertions(+), 11 deletions(-) diff --git a/ChangeLog b/ChangeLog index 04e26c31..c25c9eac 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2008-09-24 Hans Boehm (Really Ivan Maidanski) + * finalize.c (GC_general_register_disappearing_link): Remove + redundant code. + * gcj_mlc.c (GC_init_gcj_malloc): Add cast to signed. + * os_dep.c: (GC_write_fault_handler): Remove remaining + references to deleted variable "code". Remove redundant + FREEBSD definitions. + * include/private/gcconfig.h (GWW_VDB): Define for X86_64 when + defined for X86. (STATIC): Define as "static" with NO_DEBUGGING. + 2008-09-24 Hans Boehm * include/private/gc_priv.h: Update MAX_HEAP_SECTS. diff --git a/finalize.c b/finalize.c index eb0252c7..539abbd2 100644 --- a/finalize.c +++ b/finalize.c @@ -169,7 +169,6 @@ GC_API int GC_general_register_disappearing_link(void * * link, void * obj) } } index = HASH2(link, log_dl_table_size); - curr_dl = dl_head[index]; for (curr_dl = dl_head[index]; curr_dl != 0; curr_dl = dl_next(curr_dl)) { if (curr_dl -> dl_hidden_link == HIDE_POINTER(link)) { curr_dl -> dl_hidden_obj = HIDE_POINTER(obj); diff --git a/gcj_mlc.c b/gcj_mlc.c index 5647db62..5d95ad6c 100644 --- a/gcj_mlc.c +++ b/gcj_mlc.c @@ -81,7 +81,8 @@ GC_API void GC_init_gcj_malloc(int mp_index, void * /* really GC_mark_proc */mp) } else { GC_gcj_kind = GC_new_kind_inner( (void **)GC_gcjobjfreelist, - (((word)(-MARK_DESCR_OFFSET - GC_INDIR_PER_OBJ_BIAS)) + (((word)(-(signed_word)MARK_DESCR_OFFSET + - GC_INDIR_PER_OBJ_BIAS)) | GC_DS_PER_OBJECT), FALSE, TRUE); } diff --git a/include/private/gcconfig.h b/include/private/gcconfig.h index 548c098e..a70cab24 100644 --- a/include/private/gcconfig.h +++ b/include/private/gcconfig.h @@ -1968,8 +1968,6 @@ # define MPROTECT_VDB /* We also avoided doing this in the past with GC_WIN32_THREADS */ /* Hopefully that's fixed. */ -# endif -# if _MSC_VER >= 1300 /* .NET, i.e. > VisualStudio 6 */ # define GWW_VDB # endif # define DATAEND /* not needed */ @@ -2132,7 +2130,11 @@ # endif # ifndef STATIC -# define STATIC /* ignore to aid profiling and possibly debugging */ +# ifndef NO_DEBUGGING +# define STATIC /* ignore to aid profiling and possibly debugging */ +# else +# define STATIC static +# endif # endif # if defined(LINUX) || defined(HURD) || defined(__GLIBC__) diff --git a/os_dep.c b/os_dep.c index fd8fb7bb..bd33129b 100644 --- a/os_dep.c +++ b/os_dep.c @@ -2622,13 +2622,13 @@ STATIC GC_bool GC_old_segv_handler_used_si; # include # if defined(FREEBSD) # define SIG_OK TRUE -# define CODE_OK (code == BUS_PAGE_FAULT) +# define CODE_OK (si -> si_code == BUS_PAGE_FAULT) # elif defined(OSF1) # define SIG_OK (sig == SIGSEGV) -# define CODE_OK (code == 2 /* experimentally determined */) +# define CODE_OK (si -> si_code == 2 /* experimentally determined */) # elif defined(IRIX5) # define SIG_OK (sig == SIGSEGV) -# define CODE_OK (code == EACCES) +# define CODE_OK (si -> si_code == EACCES) # elif defined(HURD) # define SIG_OK (sig == SIGBUS || sig == SIGSEGV) # define CODE_OK TRUE @@ -2645,9 +2645,6 @@ STATIC GC_bool GC_old_segv_handler_used_si; || (si -> si_code == BUS_UNKNOWN) \ || (si -> si_code == SEGV_UNKNOWN) \ || (si -> si_code == BUS_OBJERR) -# elif defined(FREEBSD) -# define SIG_OK (sig == SIGBUS) -# define CODE_OK (si -> si_code == BUS_PAGE_FAULT) # elif defined(SUNOS5SIGS) # define SIG_OK (sig == SIGSEGV) # define CODE_OK (si -> si_code == SEGV_ACCERR) -- 2.49.0