aboutsummaryrefslogtreecommitdiffstats
path: root/gc.c
diff options
context:
space:
mode:
authorko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-02-05 12:21:01 +0000
committerko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-02-05 12:21:01 +0000
commit025cfde57d14b12504595130cb1b222372881143 (patch)
tree1b4233c4f6e2f26bce12f1815378457fbc2537ee /gc.c
parent72f2d2a00d8ae3861a15ca92bf9322951a22b6cf (diff)
downloadruby-025cfde57d14b12504595130cb1b222372881143.tar.gz
* eval_thread.c, common.mk: remove eval_thread.c.
* yarvcore.c: rename cYarvThread to rb_cThread. * gc.c: remove YARV_* prefix. * gc.h: add an include guard and prototype of rb_gc_set_stack_end(). * inits.c: fix to ANSI prototype style and reorder Init_*(). * io.c (pipe_finalize): TODO: comment out last_status. * process.c, yarvcore.h: fix to use yarv_vm_t#last_status instead of rb_last_status and make last_status_get() to access $?. * yarvcore.c (vm_mark): mark yarv_vm_t#last_status. * ruby.h: add declarations of rb_cISeq and rb_cVM. * thread.c: move eval_thread.c codes to thread.c and remove yarv_* function prefix. * thread.c (thread_start_func_2): use yarv_thread_t#first_func if it is not null. * vm.c: fix copyright year. * yarvcore.c (Init_vm): rename to Init_VM(). git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@11631 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'gc.c')
-rw-r--r--gc.c12
1 files changed, 5 insertions, 7 deletions
diff --git a/gc.c b/gc.c
index bf8e29def2..8b6aab0fcb 100644
--- a/gc.c
+++ b/gc.c
@@ -539,9 +539,7 @@ rb_data_object_alloc(VALUE klass, void *datap, RUBY_DATA_FUNC dmark, RUBY_DATA_F
return (VALUE)data;
}
-NOINLINE(void yarv_set_stack_end(VALUE **stack_end_p));
-
-#define YARV_SET_STACK_END yarv_set_stack_end(&th->machine_stack_end)
+#define SET_STACK_END rb_gc_set_stack_end(&th->machine_stack_end)
#define STACK_START (th->machine_stack_start)
#define STACK_END (th->machine_stack_end)
@@ -565,7 +563,7 @@ static int
stack_grow_direction(VALUE *addr)
{
yarv_thread_t *th = GET_THREAD();
- YARV_SET_STACK_END;
+ SET_STACK_END;
if (STACK_END > addr) return grow_direction = 1;
return grow_direction = -1;
@@ -577,7 +575,7 @@ stack_grow_direction(VALUE *addr)
#define GC_WATER_MARK 512
#define CHECK_STACK(ret) do {\
- YARV_SET_STACK_END;\
+ SET_STACK_END;\
(ret) = (STACK_LENGTH > STACK_LEVEL_MAX + GC_WATER_MARK);\
} while (0)
@@ -585,7 +583,7 @@ int
ruby_stack_length(VALUE **p)
{
yarv_thread_t *th = GET_THREAD();
- YARV_SET_STACK_END;
+ SET_STACK_END;
if (p) *p = STACK_UPPER(STACK_END, STACK_START, STACK_END);
return STACK_LENGTH;
}
@@ -1355,7 +1353,7 @@ garbage_collect(void)
}
during_gc++;
- YARV_SET_STACK_END;
+ SET_STACK_END;
init_mark_stack();