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

Make cfp constant and use it more in vm_exec_handle_exception()

Browse Source 
For writing THROW_DATA_VAL, being able to see that it's writing to the
same frame after modifying PC and SP is nice.
This commit is contained in:
Alan Wu 2023-08-24 14:40:52 -04:00
parent 5937a0da80
commit 05e827427f
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
vm.c
View File

@ -2449,7 +2449,6 @@ vm_exec_handle_exception(rb_execution_context_t *ec, enum ruby_tag_type state, V
const struct iseq_catch_table *ct; const struct iseq_catch_table *ct;
unsigned long epc, cont_pc, cont_sp; unsigned long epc, cont_pc, cont_sp;
const rb_iseq_t *catch_iseq; const rb_iseq_t *catch_iseq;
rb_control_frame_t *cfp;
VALUE type; VALUE type;
const rb_control_frame_t *escape_cfp; const rb_control_frame_t *escape_cfp;
@ -2469,7 +2468,7 @@ vm_exec_handle_exception(rb_execution_context_t *ec, enum ruby_tag_type state, V
rb_vm_pop_frame(ec); rb_vm_pop_frame(ec);
} }
cfp = ec->cfp; rb_control_frame_t *const cfp = ec->cfp;
epc = cfp->pc - ISEQ_BODY(cfp->iseq)->iseq_encoded; epc = cfp->pc - ISEQ_BODY(cfp->iseq)->iseq_encoded;
escape_cfp = NULL; escape_cfp = NULL;
@ -2508,7 +2507,7 @@ vm_exec_handle_exception(rb_execution_context_t *ec, enum ruby_tag_type state, V
} }
else { else {
/* TAG_BREAK */ /* TAG_BREAK */
*ec->cfp->sp++ = THROW_DATA_VAL(err); *cfp->sp++ = THROW_DATA_VAL(err);
ec->errinfo = Qnil; ec->errinfo = Qnil;
return Qundef; return Qundef;
} }
@ -2581,7 +2580,7 @@ vm_exec_handle_exception(rb_execution_context_t *ec, enum ruby_tag_type state, V
cfp->sp = vm_base_ptr(cfp) + entry->sp; cfp->sp = vm_base_ptr(cfp) + entry->sp;
if (state != TAG_REDO) { if (state != TAG_REDO) {
*ec->cfp->sp++ = THROW_DATA_VAL(err); *cfp->sp++ = THROW_DATA_VAL(err);
} }
ec->errinfo = Qnil; ec->errinfo = Qnil;
VM_ASSERT(ec->tag->state == TAG_NONE); VM_ASSERT(ec->tag->state == TAG_NONE);