summaryrefslogtreecommitdiff
path: root/vm_core.h
diff options
context:
space:
mode:
authorTakashi Kokubun <takashikkbn@gmail.com>2023-08-11 17:50:53 -0700
committerTakashi Kokubun <takashikkbn@gmail.com>2023-08-11 17:57:04 -0700
commit7740526b1ccf62a027984e35375bb30ccbc0a000 (patch)
tree94dd8346f9fc830546edafc63fa70254f475fac0 /vm_core.h
parent0e162457d686946c69caba6558fb400ace5d8b78 (diff)
Reorder bp_check and jit_return in cfp
It's the actual cfp[6] in the default build, so it's confusing to say otherwise in the comment.
Diffstat (limited to 'vm_core.h')
-rw-r--r--vm_core.h18
1 files changed, 8 insertions, 10 deletions
diff --git a/vm_core.h b/vm_core.h
index d9d926d2ad..a2c7edf206 100644
--- a/vm_core.h
+++ b/vm_core.h
@@ -813,18 +813,16 @@ struct rb_block {
};
typedef struct rb_control_frame_struct {
- const VALUE *pc; /* cfp[0] */
- VALUE *sp; /* cfp[1] */
- const rb_iseq_t *iseq; /* cfp[2] */
- VALUE self; /* cfp[3] / block[0] */
- const VALUE *ep; /* cfp[4] / block[1] */
- const void *block_code; /* cfp[5] / block[2] */ /* iseq or ifunc or forwarded block handler */
-
+ const VALUE *pc; // cfp[0]
+ VALUE *sp; // cfp[1]
+ const rb_iseq_t *iseq; // cfp[2]
+ VALUE self; // cfp[3] / block[0]
+ const VALUE *ep; // cfp[4] / block[1]
+ const void *block_code; // cfp[5] / block[2] -- iseq, ifunc, or forwarded block handler
+ void *jit_return; // cfp[6] -- return address for JIT code
#if VM_DEBUG_BP_CHECK
- VALUE *bp_check; /* cfp[6] */
+ VALUE *bp_check; // cfp[7]
#endif
- // Return address for YJIT code
- void *jit_return;
} rb_control_frame_t;
extern const rb_data_type_t ruby_threadptr_data_type;