nobu	2008-06-13 14:19:01 +0900 (Fri, 13 Jun 2008)

  New Revision: 17142

  Modified files:
    trunk/ChangeLog
    trunk/gc.c

  Log:
    * gc.c (ruby_stack_check): STACK_LENGTH should be less than
      STACK_LEVEL_MAX.


  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/ChangeLog?r1=17142&r2=17141&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/gc.c?r1=17142&r2=17141&diff_format=u

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 17141)
+++ ChangeLog	(revision 17142)
@@ -1,3 +1,8 @@
+Fri Jun 13 14:18:54 2008  Nobuyoshi Nakada  <nobu@r...>
+
+	* gc.c (ruby_stack_check): STACK_LENGTH should be less than
+	  STACK_LEVEL_MAX.
+
 Fri Jun 13 12:55:37 2008  Yukihiro Matsumoto  <matz@r...>
 
 	* enum.c (sort_by_i): use NODE_DOT2 instead of NODE_MEMO to avoid
Index: gc.c
===================================================================
--- gc.c	(revision 17141)
+++ gc.c	(revision 17142)
@@ -236,7 +236,6 @@
 /*#define HEAP_SIZE 0x800 */
 
 #define HEAP_OBJ_LIMIT (HEAP_SIZE / sizeof(struct RVALUE))
-#define FREE_MIN  4096
 
 extern st_table *rb_class_tbl;
 VALUE *rb_gc_stack_start = 0;
@@ -818,11 +817,11 @@
     int ret;
     rb_thread_t *th = GET_THREAD();
     SET_STACK_END;
-    ret = STACK_LENGTH > STACK_LEVEL_MAX + GC_WATER_MARK;
+    ret = STACK_LENGTH > STACK_LEVEL_MAX - GC_WATER_MARK;
 #ifdef __ia64
     if (!ret) {
         ret = (VALUE*)rb_ia64_bsp() - th->machine_register_stack_start >
-              th->machine_register_stack_maxsize/sizeof(VALUE) + GC_WATER_MARK;
+              th->machine_register_stack_maxsize/sizeof(VALUE) - GC_WATER_MARK;
     }
 #endif
     return ret;

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