1 files changed, 73 insertions, 23 deletions
@@ -46,7 +46,7 @@ type InsnGenFn = fn(
 /// Represents a [core::Block] while we build it.
 pub struct JITState {
 /// Instruction sequence for the compiling block
- iseq: IseqPtr,
 /// The iseq index of the first instruction in the block
 starting_insn_idx: IseqIdx,
@@ -101,6 +101,9 @@ pub struct JITState {
 /// A list of classes that are not supposed to have a singleton class.
 pub no_singleton_class_assumptions: Vec<VALUE>,
 /// When true, the block is valid only when there is a total of one ractor running
 pub block_assumes_single_ractor: bool,
@@ -130,6 +133,7 @@ impl JITState {
 bop_assumptions: vec![],
 stable_constant_names_assumption: None,
 no_singleton_class_assumptions: vec![],
 block_assumes_single_ractor: false,
 perf_map: Rc::default(),
 perf_stack: vec![],
@@ -171,6 +175,23 @@ impl JITState {
 unsafe { *(self.pc.offset(arg_idx + 1)) }
 }
 // Get the index of the next instruction
 fn next_insn_idx(&self) -> u16 {
 self.insn_idx + insn_len(self.get_opcode()) as u16
@@ -250,6 +271,19 @@ impl JITState {
 true
 }
 fn get_cfp(&self) -> *mut rb_control_frame_struct {
 unsafe { get_ec_cfp(self.ec) }
 }
@@ -2203,16 +2237,22 @@ fn gen_get_lep(jit: &JITState, asm: &mut Assembler) -> Opnd {
 fn gen_getlocal_generic(
 jit: &mut JITState,
 asm: &mut Assembler,
 ep_offset: u32,
 level: u32,
 ) -> Option<CodegenStatus> {
- // Load environment pointer EP (level 0) from CFP
- let ep_opnd = gen_get_ep(asm, level);
- // Load the local from the block
- // val = *(vm_get_ep(GET_EP(), level) - idx);
- let offs = -(SIZEOF_VALUE_I32 * ep_offset as i32);
- let local_opnd = Opnd::mem(64, ep_opnd, offs);
 // Write the local at SP
 let stack_top = if level == 0 {
@@ -2230,29 +2270,29 @@ fn gen_getlocal_generic(
 fn gen_getlocal(
 jit: &mut JITState,
 asm: &mut Assembler,
- _ocb: &mut OutlinedCb,
 ) -> Option<CodegenStatus> {
 let idx = jit.get_arg(0).as_u32();
 let level = jit.get_arg(1).as_u32();
- gen_getlocal_generic(jit, asm, idx, level)
 }
 fn gen_getlocal_wc0(
 jit: &mut JITState,
 asm: &mut Assembler,
- _ocb: &mut OutlinedCb,
 ) -> Option<CodegenStatus> {
 let idx = jit.get_arg(0).as_u32();
- gen_getlocal_generic(jit, asm, idx, 0)
 }
 fn gen_getlocal_wc1(
 jit: &mut JITState,
 asm: &mut Assembler,
- _ocb: &mut OutlinedCb,
 ) -> Option<CodegenStatus> {
 let idx = jit.get_arg(0).as_u32();
- gen_getlocal_generic(jit, asm, idx, 1)
 }
 fn gen_setlocal_generic(
@@ -2264,11 +2304,11 @@ fn gen_setlocal_generic(
 ) -> Option<CodegenStatus> {
 let value_type = asm.ctx.get_opnd_type(StackOpnd(0));
- // Load environment pointer EP at level
- let ep_opnd = gen_get_ep(asm, level);
-
 // Fallback because of write barrier
 if asm.ctx.get_chain_depth() > 0 {
 // This function should not yield to the GC.
 // void rb_vm_env_write(const VALUE *ep, int index, VALUE v)
 let index = -(ep_offset as i64);
@@ -2286,16 +2326,27 @@ fn gen_setlocal_generic(
 return Some(KeepCompiling);
 }
- // Write barriers may be required when VM_ENV_FLAG_WB_REQUIRED is set, however write barriers
- // only affect heap objects being written. If we know an immediate value is being written we
- // can skip this check.
- if !value_type.is_imm() {
- // flags & VM_ENV_FLAG_WB_REQUIRED
 let flags_opnd = Opnd::mem(
 64,
 ep_opnd,
 SIZEOF_VALUE_I32 * VM_ENV_DATA_INDEX_FLAGS as i32,
 );
 asm.test(flags_opnd, VM_ENV_FLAG_WB_REQUIRED.into());
 // if (flags & VM_ENV_FLAG_WB_REQUIRED) != 0
@@ -2319,8 +2370,7 @@ fn gen_setlocal_generic(
 let stack_top = asm.stack_pop(1);
 // Write the value at the environment pointer
- let offs = -(SIZEOF_VALUE_I32 * ep_offset as i32);
- asm.mov(Opnd::mem(64, ep_opnd, offs), stack_top);
 Some(KeepCompiling)
 }