naruse	2014-10-21 11:50:23 +0900 (Tue, 21 Oct 2014)

  New Revision: 48065

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=48065

  Log:
    * gc.c (mark_current_machine_context) [__mc68000__]: Update stack
      marking.
      (rb_gc_mark_machine_stack) [__mc68000__]: Also handle it here.

  Modified files:
    trunk/ChangeLog
    trunk/gc.c
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 48064)
+++ ChangeLog	(revision 48065)
@@ -1,3 +1,9 @@ https://github.com/ruby/ruby/blob/trunk/ChangeLog#L1
+Tue Oct 21 11:49:16 2014  Andreas Schwab  <schwab@s...>
+
+	* gc.c (mark_current_machine_context) [__mc68000__]: Update stack
+	  marking.
+	  (rb_gc_mark_machine_stack) [__mc68000__]: Also handle it here.
+
 Mon Oct 20 23:59:38 2014  NAKAMURA Usaku  <usa@r...>
 
 	* enc/prelude.rb: we sometimes run ruby without library path (especially
Index: gc.c
===================================================================
--- gc.c	(revision 48064)
+++ gc.c	(revision 48065)
@@ -3838,8 +3838,8 @@ mark_current_machine_context(rb_objspace https://github.com/ruby/ruby/blob/trunk/gc.c#L3838
     rb_gc_mark_locations(th->machine.register_stack_start, th->machine.register_stack_end);
 #endif
 #if defined(__mc68000__)
-    mark_locations_array(objspace, (VALUE*)((char*)STACK_END + 2),
-			 (STACK_START - STACK_END));
+    rb_gc_mark_locations((VALUE*)((char*)stack_start + 2),
+			 (VALUE*)((char*)stack_end - 2));
 #endif
 }
 
@@ -3854,6 +3854,10 @@ rb_gc_mark_machine_stack(rb_thread_t *th https://github.com/ruby/ruby/blob/trunk/gc.c#L3854
 #ifdef __ia64
     rb_gc_mark_locations(th->machine.register_stack_start, th->machine.register_stack_end);
 #endif
+#if defined(__mc68000__)
+    rb_gc_mark_locations((VALUE*)((char*)stack_start + 2),
+			 (VALUE*)((char*)stack_end - 2));
+#endif
 }
 
 void

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/