* vm_dump.c: rename some debug functions.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19129 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
ko1 2008-09-04 12:04:09 +00:00
Родитель 80843ea156
Коммит 4780af9566
2 изменённых файлов: 20 добавлений и 17 удалений

Просмотреть файл

@ -1,3 +1,7 @@
Thu Sep 4 21:03:28 2008 Koichi Sasada <ko1@atdot.net>
* vm_dump.c: rename some debug functions.
Thu Sep 4 20:57:54 2008 Koichi Sasada <ko1@atdot.net> Thu Sep 4 20:57:54 2008 Koichi Sasada <ko1@atdot.net>
* thread.c (rb_thread_check_trap_pending): added for compatibility. * thread.c (rb_thread_check_trap_pending): added for compatibility.

Просмотреть файл

@ -184,7 +184,7 @@ vm_stack_dump_raw_current(void)
} }
void void
env_dump_raw(rb_env_t *env, VALUE *lfp, VALUE *dfp) vm_env_dump_raw(rb_env_t *env, VALUE *lfp, VALUE *dfp)
{ {
int i; int i;
fprintf(stderr, "-- env --------------------\n"); fprintf(stderr, "-- env --------------------\n");
@ -212,7 +212,7 @@ env_dump_raw(rb_env_t *env, VALUE *lfp, VALUE *dfp)
} }
void void
proc_dump_raw(rb_proc_t *proc) vm_proc_dump_raw(rb_proc_t *proc)
{ {
rb_env_t *env; rb_env_t *env;
char *selfstr; char *selfstr;
@ -222,11 +222,11 @@ proc_dump_raw(rb_proc_t *proc)
fprintf(stderr, "-- proc -------------------\n"); fprintf(stderr, "-- proc -------------------\n");
fprintf(stderr, "self: %s\n", selfstr); fprintf(stderr, "self: %s\n", selfstr);
GetEnvPtr(proc->envval, env); GetEnvPtr(proc->envval, env);
env_dump_raw(env, proc->block.lfp, proc->block.dfp); vm_env_dump_raw(env, proc->block.lfp, proc->block.dfp);
} }
void void
stack_dump_th(VALUE thval) vm_stack_dump_th(VALUE thval)
{ {
rb_thread_t *th; rb_thread_t *th;
GetThreadPtr(thval, th); GetThreadPtr(thval, th);
@ -234,7 +234,7 @@ stack_dump_th(VALUE thval)
} }
void void
stack_dump_each(rb_thread_t *th, rb_control_frame_t *cfp) vm_stack_dump_each(rb_thread_t *th, rb_control_frame_t *cfp)
{ {
int i; int i;
@ -283,7 +283,7 @@ stack_dump_each(rb_thread_t *th, rb_control_frame_t *cfp)
VALUE *ptr = dfp - local_size; VALUE *ptr = dfp - local_size;
stack_dump_each(th, cfp + 1); vm_stack_dump_each(th, cfp + 1);
control_frame_dump(th, cfp); control_frame_dump(th, cfp);
if (lfp != dfp) { if (lfp != dfp) {
@ -314,7 +314,7 @@ stack_dump_each(rb_thread_t *th, rb_control_frame_t *cfp)
} }
else if (VM_FRAME_TYPE(cfp) == VM_FRAME_MAGIC_FINISH) { else if (VM_FRAME_TYPE(cfp) == VM_FRAME_MAGIC_FINISH) {
if ((th)->stack + (th)->stack_size > (VALUE *)(cfp + 2)) { if ((th)->stack + (th)->stack_size > (VALUE *)(cfp + 2)) {
stack_dump_each(th, cfp + 1); vm_stack_dump_each(th, cfp + 1);
} }
else { else {
/* SDR(); */ /* SDR(); */
@ -327,7 +327,7 @@ stack_dump_each(rb_thread_t *th, rb_control_frame_t *cfp)
void void
debug_print_register(rb_thread_t *th) vm_debug_print_register(rb_thread_t *th)
{ {
rb_control_frame_t *cfp = th->cfp; rb_control_frame_t *cfp = th->cfp;
int pc = -1; int pc = -1;
@ -350,15 +350,15 @@ debug_print_register(rb_thread_t *th)
} }
void void
thread_dump_regs(VALUE thval) vm_thread_dump_regs(VALUE thval)
{ {
rb_thread_t *th; rb_thread_t *th;
GetThreadPtr(thval, th); GetThreadPtr(thval, th);
debug_print_register(th); vm_debug_print_register(th);
} }
void void
debug_print_pre(rb_thread_t *th, rb_control_frame_t *cfp) vm_debug_print_pre(rb_thread_t *th, rb_control_frame_t *cfp)
{ {
rb_iseq_t *iseq = cfp->iseq; rb_iseq_t *iseq = cfp->iseq;
@ -372,12 +372,12 @@ debug_print_pre(rb_thread_t *th, rb_control_frame_t *cfp)
#if VMDEBUG > 3 #if VMDEBUG > 3
fprintf(stderr, " (1)"); fprintf(stderr, " (1)");
debug_print_register(th); vm_debug_print_register(th);
#endif #endif
} }
void void
debug_print_post(rb_thread_t *th, rb_control_frame_t *cfp vm_debug_print_post(rb_thread_t *th, rb_control_frame_t *cfp
#if OPT_STACK_CACHING #if OPT_STACK_CACHING
, VALUE reg_a, VALUE reg_b , VALUE reg_a, VALUE reg_b
#endif #endif
@ -389,13 +389,13 @@ debug_print_post(rb_thread_t *th, rb_control_frame_t *cfp
#if VMDEBUG > 3 #if VMDEBUG > 3
fprintf(stderr, " (2)"); fprintf(stderr, " (2)");
debug_print_register(th); vm_debug_print_register(th);
#endif #endif
/* stack_dump_raw(th, cfp); */ /* stack_dump_raw(th, cfp); */
#if VMDEBUG > 2 #if VMDEBUG > 2
/* stack_dump_thobj(th); */ /* stack_dump_thobj(th); */
stack_dump_each(th, th->cfp); vm_stack_dump_each(th, th->cfp);
#if OPT_STACK_CACHING #if OPT_STACK_CACHING
{ {
VALUE rstr; VALUE rstr;
@ -550,9 +550,8 @@ vm_analysis_register(int reg, int isset)
#endif #endif
VALUE VALUE
thread_dump_state(VALUE self) vm_thread_dump_state(VALUE self)
{ {
rb_thread_t *th; rb_thread_t *th;
rb_control_frame_t *cfp; rb_control_frame_t *cfp;