1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* vm.c, yarvcore.h, yarvcore.c, insns.def: fix to mark VM stack

Browse Source 
in correct range.



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@12243 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
ko1 2007-05-02 09:59:38 +00:00
parent 8269ab2e1f
commit fba2420be4
5 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
Wed May 2 18:52:58 2007 Koichi Sasada <ko1@atdot.net>
* vm.c, yarvcore.h, yarvcore.c, insns.def: fix to mark VM stack
in correct range.
Wed May 2 17:13:26 2007 Nobuyoshi Nakada <nobu@ruby-lang.org> Wed May 2 17:13:26 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
* bignum.c (rb_big_quo): now calculate in integer. [ruby-dev:30753] * bignum.c (rb_big_quo): now calculate in integer. [ruby-dev:30753]

2
insns.def
View File

@ -1345,7 +1345,7 @@ invokeblock
} }
INC_SP(-argc); INC_SP(-argc);
argc = th_yield_setup_args(iseq, argc, GET_SP(), 0); argc = th_yield_setup_args(th, iseq, argc, GET_SP(), 0);
INC_SP(argc); INC_SP(argc);
push_frame(th, iseq, push_frame(th, iseq,

17
vm.c
View File

@ -674,9 +674,11 @@ th_yield_with_cfunc(rb_thread_t *th, rb_block_t *block,
} }
static inline int static inline int
th_yield_setup_args(rb_iseq_t *iseq, int argc, VALUE *argv, int lambda) th_yield_setup_args(rb_thread_t *th, rb_iseq_t *iseq,
int argc, VALUE *argv, int lambda)
{ {
int i, arg_n = iseq->argc + (iseq->arg_rest == -1 ? 0 : 1); int i, arg_n = iseq->argc + (iseq->arg_rest == -1 ? 0 : 1);
th->mark_stack_len = argc;
if (0) { /* for debug */ if (0) { /* for debug */
int i; int i;
@ -695,7 +697,7 @@ th_yield_setup_args(rb_iseq_t *iseq, int argc, VALUE *argv, int lambda)
if (lambda == 0 && argc == 1 && TYPE(argv[0]) == T_ARRAY && arg_n != 1) { if (lambda == 0 && argc == 1 && TYPE(argv[0]) == T_ARRAY && arg_n != 1) {
VALUE ary = argv[0]; VALUE ary = argv[0];
argc = RARRAY_LEN(ary); th->mark_stack_len = argc = RARRAY_LEN(ary);
/* TODO: check overflow */ /* TODO: check overflow */
@ -713,7 +715,7 @@ th_yield_setup_args(rb_iseq_t *iseq, int argc, VALUE *argv, int lambda)
* rb_warn("multiple values for a block parameter (%d for %d)", argc, iseq->argc); * rb_warn("multiple values for a block parameter (%d for %d)", argc, iseq->argc);
*/ */
argv[0] = rb_ary_new4(argc, argv); argv[0] = rb_ary_new4(argc, argv);
argc = 1; th->mark_stack_len = argc = 1;
} }
} }
@ -724,7 +726,7 @@ th_yield_setup_args(rb_iseq_t *iseq, int argc, VALUE *argv, int lambda)
} }
else { else {
/* simple truncate */ /* simple truncate */
argc = iseq->argc; th->mark_stack_len = argc = iseq->argc;
} }
} }
} }
@ -747,7 +749,7 @@ th_yield_setup_args(rb_iseq_t *iseq, int argc, VALUE *argv, int lambda)
else { else {
argv[r] = rb_ary_new4(argc-r, &argv[r]); argv[r] = rb_ary_new4(argc-r, &argv[r]);
} }
argc = iseq->arg_rest + 1; th->mark_stack_len = argc = iseq->arg_rest + 1;
} }
if (iseq->arg_block != -1) { if (iseq->arg_block != -1) {
@ -758,9 +760,10 @@ th_yield_setup_args(rb_iseq_t *iseq, int argc, VALUE *argv, int lambda)
} }
argv[iseq->arg_block] = proc; argv[iseq->arg_block] = proc;
argc = iseq->arg_block + 1; th->mark_stack_len = argc = iseq->arg_block + 1;
} }
th->mark_stack_len = 0;
return argc; return argc;
} }
@ -777,7 +780,7 @@ invoke_block(rb_thread_t *th, rb_block_t *block, VALUE self, int argc, VALUE *ar
for (i=0; i<argc; i++) { for (i=0; i<argc; i++) {
th->cfp->sp[i] = argv[i]; th->cfp->sp[i] = argv[i];
} }
argc = th_yield_setup_args(iseq, argc, th->cfp->sp, magic == FRAME_MAGIC_LAMBDA); argc = th_yield_setup_args(th, iseq, argc, th->cfp->sp, magic == FRAME_MAGIC_LAMBDA);
th->cfp->sp += argc; th->cfp->sp += argc;
push_frame(th, iseq, magic, push_frame(th, iseq, magic,

2
yarvcore.c
View File

@ -266,7 +266,7 @@ thread_mark(void *ptr)
th = ptr; th = ptr;
if (th->stack) { if (th->stack) {
VALUE *p = th->stack; VALUE *p = th->stack;
VALUE *sp = th->cfp->sp; VALUE *sp = th->cfp->sp + th->mark_stack_len;
rb_control_frame_t *cfp = th->cfp; rb_control_frame_t *cfp = th->cfp;
rb_control_frame_t *limit_cfp = rb_control_frame_t *limit_cfp =
(void *)(th->stack + th->stack_size); (void *)(th->stack + th->stack_size);

1
yarvcore.h
View File

@ -478,6 +478,7 @@ struct rb_thread_struct
VALUE *machine_stack_start; VALUE *machine_stack_start;
VALUE *machine_stack_end; VALUE *machine_stack_end;
jmp_buf machine_regs; jmp_buf machine_regs;
int mark_stack_len;
/* statistics data for profiler */ /* statistics data for profiler */
VALUE stat_insn_usage; VALUE stat_insn_usage;