Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

MBARI 7 -- PPC & x86_64-bit fixes + gc stack scanning optimization

  • Loading branch information...
commit 27074f542e02bbbb8f032b211f34c21a1446434b 1 parent c00ced6
@brentr authored
Showing with 15 additions and 9 deletions.
  1. +6 −0 ChangeLog
  2. +5 −5 gc.c
  3. +4 −4 version.h
View
6 ChangeLog
@@ -1,3 +1,9 @@
+Tue Feb 10 00:01:19 2009 Brent Roman <brent@mbari.org>
+
+ * gc.c: don't redundantly mark stack before base of current thread
+
+ * version.h: bumped date
+
Mon Feb 09 00:01:19 2009 Brent Roman <brent@mbari.org>
* rubysig.h: default values for STACK_WIPE_SITES if x86_64
View
10 gc.c
@@ -1420,14 +1420,14 @@ garbage_collect_0(VALUE *top_frame)
rb_setjmp(save_regs_gc_mark);
mark_locations_array((VALUE*)save_regs_gc_mark, sizeof(save_regs_gc_mark) / sizeof(VALUE *));
#if STACK_GROW_DIRECTION < 0
- rb_gc_mark_locations(top_frame, rb_gc_stack_start);
+ rb_gc_mark_locations(top_frame, rb_curr_thread->stk_start);
#elif STACK_GROW_DIRECTION > 0
- rb_gc_mark_locations(rb_gc_stack_start, top_frame + 1);
+ rb_gc_mark_locations(rb_curr_thread->stk_start, top_frame + 1);
#else
if (rb_gc_stack_grow_direction < 0)
- rb_gc_mark_locations(top_frame, rb_gc_stack_start);
+ rb_gc_mark_locations(top_frame, rb_curr_thread->stk_start);
else
- rb_gc_mark_locations(rb_gc_stack_start, top_frame + 1);
+ rb_gc_mark_locations(rb_curr_thread->stk_start, top_frame + 1);
#endif
#ifdef __ia64
/* mark backing store (flushed register window on the stack) */
@@ -1436,7 +1436,7 @@ garbage_collect_0(VALUE *top_frame)
#endif
#if defined(__human68k__) || defined(__mc68000__)
rb_gc_mark_locations((VALUE*)((char*)STACK_END + 2),
- (VALUE*)((char*)rb_gc_stack_start + 2));
+ (VALUE*)((char*)rb_curr_thread->stk_start + 2));
#endif
rb_gc_mark_threads();
View
8 version.h
@@ -1,7 +1,7 @@
#define RUBY_VERSION "1.8.7"
-#define RUBY_RELEASE_DATE "2009-2-9"
+#define RUBY_RELEASE_DATE "2009-2-10"
#define RUBY_VERSION_CODE 187
-#define RUBY_RELEASE_CODE 20090209
+#define RUBY_RELEASE_CODE 20090210
#define RUBY_PATCHLEVEL 72
#define RUBY_VERSION_MAJOR 1
@@ -9,7 +9,7 @@
#define RUBY_VERSION_TEENY 7
#define RUBY_RELEASE_YEAR 2009
#define RUBY_RELEASE_MONTH 2
-#define RUBY_RELEASE_DAY 9
+#define RUBY_RELEASE_DAY 10
#ifdef RUBY_EXTERN
RUBY_EXTERN const char ruby_version[];
@@ -28,7 +28,7 @@ RUBY_EXTERN const char *ruby_copyright;
#include "rubysig.h"
#define string_arg(s) #s
-#define MBARI_RELEASE(wipe_sites) "MBARI 7-/" string_arg(wipe_sites)
+#define MBARI_RELEASE(wipe_sites) "MBARI 7/" string_arg(wipe_sites)
#define RUBY_RELEASE_STR MBARI_RELEASE(STACK_WIPE_SITES) " on patchlevel"
#define RUBY_RELEASE_NUM RUBY_PATCHLEVEL
Please sign in to comment.
Something went wrong with that request. Please try again.