diff options
author | ko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-06-10 21:46:43 +0000 |
---|---|---|
committer | ko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-06-10 21:46:43 +0000 |
commit | 9e324fdd3ef0b858f6c5dfea1d0055d77979a3a2 (patch) | |
tree | 7c83dc40c7b9a926cf9efc8f0abef1cd7267b3d4 /vm_dump.c | |
parent | e6697a6405f1330ef071220396b8afef1cd1079a (diff) | |
download | ruby-9e324fdd3ef0b858f6c5dfea1d0055d77979a3a2.tar.gz |
* vm.c, eval_intern.h (PASS_PASSED_BLOCK):
set a VM_FRAME_FLAG_PASSED flag to skip this frame when
searching ruby-level-cfp.
* eval.c, eval_intern.h, proc.c: fix to check cfp. if there is
no valid ruby-level-cfp, cause RuntimeError exception.
[ruby-dev:34128]
* vm_core.h, vm_evalbody.c, vm.c, vm_dump.c, vm_insnhelper.c,
insns.def: rename FRAME_MAGIC_* to VM_FRAME_MAGIC_*.
* KNOWNBUGS.rb, bootstraptest/test*.rb: move solved bugs.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@17084 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'vm_dump.c')
-rw-r--r-- | vm_dump.c | 42 |
1 files changed, 21 insertions, 21 deletions
@@ -46,34 +46,34 @@ control_frame_dump(rb_thread_t *th, rb_control_frame_t *cfp) } switch (VM_FRAME_TYPE(cfp)) { - case FRAME_MAGIC_TOP: + case VM_FRAME_MAGIC_TOP: magic = "TOP"; break; - case FRAME_MAGIC_METHOD: + case VM_FRAME_MAGIC_METHOD: magic = "METHOD"; break; - case FRAME_MAGIC_CLASS: + case VM_FRAME_MAGIC_CLASS: magic = "CLASS"; break; - case FRAME_MAGIC_BLOCK: + case VM_FRAME_MAGIC_BLOCK: magic = "BLOCK"; break; - case FRAME_MAGIC_FINISH: + case VM_FRAME_MAGIC_FINISH: magic = "FINISH"; break; - case FRAME_MAGIC_CFUNC: + case VM_FRAME_MAGIC_CFUNC: magic = "CFUNC"; break; - case FRAME_MAGIC_PROC: + case VM_FRAME_MAGIC_PROC: magic = "PROC"; break; - case FRAME_MAGIC_LAMBDA: + case VM_FRAME_MAGIC_LAMBDA: magic = "LAMBDA"; break; - case FRAME_MAGIC_IFUNC: + case VM_FRAME_MAGIC_IFUNC: magic = "IFUNC"; break; - case FRAME_MAGIC_EVAL: + case VM_FRAME_MAGIC_EVAL: magic = "EVAL"; break; case 0: @@ -271,15 +271,15 @@ stack_dump_each(rb_thread_t *th, rb_control_frame_t *cfp) /* stack trace header */ - if (VM_FRAME_TYPE(cfp) == FRAME_MAGIC_METHOD || - VM_FRAME_TYPE(cfp) == FRAME_MAGIC_TOP || - VM_FRAME_TYPE(cfp) == FRAME_MAGIC_BLOCK || - VM_FRAME_TYPE(cfp) == FRAME_MAGIC_CLASS || - VM_FRAME_TYPE(cfp) == FRAME_MAGIC_PROC || - VM_FRAME_TYPE(cfp) == FRAME_MAGIC_LAMBDA || - VM_FRAME_TYPE(cfp) == FRAME_MAGIC_CFUNC || - VM_FRAME_TYPE(cfp) == FRAME_MAGIC_IFUNC || - VM_FRAME_TYPE(cfp) == FRAME_MAGIC_EVAL) { + if (VM_FRAME_TYPE(cfp) == VM_FRAME_MAGIC_METHOD || + VM_FRAME_TYPE(cfp) == VM_FRAME_MAGIC_TOP || + VM_FRAME_TYPE(cfp) == VM_FRAME_MAGIC_BLOCK || + VM_FRAME_TYPE(cfp) == VM_FRAME_MAGIC_CLASS || + VM_FRAME_TYPE(cfp) == VM_FRAME_MAGIC_PROC || + VM_FRAME_TYPE(cfp) == VM_FRAME_MAGIC_LAMBDA || + VM_FRAME_TYPE(cfp) == VM_FRAME_MAGIC_CFUNC || + VM_FRAME_TYPE(cfp) == VM_FRAME_MAGIC_IFUNC || + VM_FRAME_TYPE(cfp) == VM_FRAME_MAGIC_EVAL) { VALUE *ptr = dfp - local_size; @@ -312,7 +312,7 @@ stack_dump_each(rb_thread_t *th, rb_control_frame_t *cfp) ptr - th->stack); } } - else if (VM_FRAME_TYPE(cfp) == FRAME_MAGIC_FINISH) { + else if (VM_FRAME_TYPE(cfp) == VM_FRAME_MAGIC_FINISH) { if ((th)->stack + (th)->stack_size > (VALUE *)(cfp + 2)) { stack_dump_each(th, cfp + 1); } @@ -362,7 +362,7 @@ debug_print_pre(rb_thread_t *th, rb_control_frame_t *cfp) { rb_iseq_t *iseq = cfp->iseq; - if (iseq != 0 && VM_FRAME_TYPE(cfp) != FRAME_MAGIC_FINISH) { + if (iseq != 0 && VM_FRAME_TYPE(cfp) != VM_FRAME_MAGIC_FINISH) { VALUE *seq = iseq->iseq; int pc = cfp->pc - iseq->iseq_encoded; |