kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

Implement gen_getlocal

Browse source 
This extracts the generation code from getlocal_wc1, since this is the
same just with more loops inside vm_get_ep.
This commit is contained in:
John Hawthorn 2021-06-08 07:52:57 -07:00 • committed by Alan Wu
parent 5432f46f6a
commit 67c2cdc59a
2 changed files with 38 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

14
bootstraptest/test_yjit.rb
View file

@ -1021,3 +1021,17 @@ assert_equal 'foo123', %q{
make_str("foo", 123) make_str("foo", 123)
make_str("foo", 123) make_str("foo", 123)
} }
# getlocal with 2 levels
assert_equal '7', %q{
def foo(foo, bar)
while foo > 0
while bar > 0
return foo + bar
end
end
end
foo(5,2)
foo(5,2)
}

33
yjit_codegen.c
View file

@ -787,22 +787,21 @@ gen_getlocal_wc0(jitstate_t* jit, ctx_t* ctx)
} }
static codegen_status_t static codegen_status_t
gen_getlocal_wc1(jitstate_t* jit, ctx_t* ctx) gen_getlocal_generic(ctx_t* ctx, uint32_t local_idx, uint32_t level)
{ {
//fprintf(stderr, "gen_getlocal_wc1\n");
// Load environment pointer EP from CFP // Load environment pointer EP from CFP
mov(cb, REG0, member_opnd(REG_CFP, rb_control_frame_t, ep)); mov(cb, REG0, member_opnd(REG_CFP, rb_control_frame_t, ep));
// Get the previous EP from the current EP while (level--) {
// See GET_PREV_EP(ep) macro // Get the previous EP from the current EP
// VALUE* prev_ep = ((VALUE *)((ep)[VM_ENV_DATA_INDEX_SPECVAL] & ~0x03)) // See GET_PREV_EP(ep) macro
mov(cb, REG0, mem_opnd(64, REG0, SIZEOF_VALUE * VM_ENV_DATA_INDEX_SPECVAL)); // VALUE* prev_ep = ((VALUE *)((ep)[VM_ENV_DATA_INDEX_SPECVAL] & ~0x03))
and(cb, REG0, imm_opnd(~0x03)); mov(cb, REG0, mem_opnd(64, REG0, SIZEOF_VALUE * VM_ENV_DATA_INDEX_SPECVAL));
and(cb, REG0, imm_opnd(~0x03));
}
// Load the local from the block // Load the local from the block
// val = *(vm_get_ep(GET_EP(), level) - idx); // val = *(vm_get_ep(GET_EP(), level) - idx);
int32_t local_idx = (int32_t)jit_get_arg(jit, 0);
const int32_t offs = -(SIZEOF_VALUE * local_idx); const int32_t offs = -(SIZEOF_VALUE * local_idx);
mov(cb, REG0, mem_opnd(64, REG0, offs)); mov(cb, REG0, mem_opnd(64, REG0, offs));
@ -813,6 +812,21 @@ gen_getlocal_wc1(jitstate_t* jit, ctx_t* ctx)
return YJIT_KEEP_COMPILING; return YJIT_KEEP_COMPILING;
} }
static codegen_status_t
gen_getlocal(jitstate_t* jit, ctx_t* ctx)
{
int32_t idx = (int32_t)jit_get_arg(jit, 0);
int32_t level = (int32_t)jit_get_arg(jit, 1);
return gen_getlocal_generic(ctx, idx, level);
}
static codegen_status_t
gen_getlocal_wc1(jitstate_t* jit, ctx_t* ctx)
{
int32_t idx = (int32_t)jit_get_arg(jit, 0);
return gen_getlocal_generic(ctx, idx, 1);
}
static codegen_status_t static codegen_status_t
gen_setlocal_wc0(jitstate_t* jit, ctx_t* ctx) gen_setlocal_wc0(jitstate_t* jit, ctx_t* ctx)
{ {
@ -3067,6 +3081,7 @@ yjit_init_codegen(void)
yjit_reg_op(BIN(putobject_INT2FIX_0_), gen_putobject_int2fix); yjit_reg_op(BIN(putobject_INT2FIX_0_), gen_putobject_int2fix);
yjit_reg_op(BIN(putobject_INT2FIX_1_), gen_putobject_int2fix); yjit_reg_op(BIN(putobject_INT2FIX_1_), gen_putobject_int2fix);
yjit_reg_op(BIN(putself), gen_putself); yjit_reg_op(BIN(putself), gen_putself);
yjit_reg_op(BIN(getlocal), gen_getlocal);
yjit_reg_op(BIN(getlocal_WC_0), gen_getlocal_wc0); yjit_reg_op(BIN(getlocal_WC_0), gen_getlocal_wc0);
yjit_reg_op(BIN(getlocal_WC_1), gen_getlocal_wc1); yjit_reg_op(BIN(getlocal_WC_1), gen_getlocal_wc1);
yjit_reg_op(BIN(setlocal_WC_0), gen_setlocal_wc0); yjit_reg_op(BIN(setlocal_WC_0), gen_setlocal_wc0);