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

Improve codegen and type tracking in putobject

Browse Source
This commit is contained in:
Maxime Chevalier-Boisvert 2021-04-15 15:00:07 -04:00 committed by Alan Wu
parent 6250506de2
commit f2530f884e
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
yjit_codegen.c
View File

@ -454,7 +454,6 @@ gen_putobject(jitstate_t* jit, ctx_t* ctx)
{ {
// Keep track of the fixnum type tag // Keep track of the fixnum type tag
x86opnd_t stack_top = ctx_stack_push(ctx, TYPE_FIXNUM); x86opnd_t stack_top = ctx_stack_push(ctx, TYPE_FIXNUM);
x86opnd_t imm = imm_opnd((int64_t)arg); x86opnd_t imm = imm_opnd((int64_t)arg);
// 64-bit immediates can't be directly written to memory // 64-bit immediates can't be directly written to memory
@ -475,17 +474,17 @@ gen_putobject(jitstate_t* jit, ctx_t* ctx)
} }
else else
{ {
// Load the argument from the bytecode sequence. // Load the value to push into REG0
// We need to do this as the argument can change due to GC compaction. // Note that this value may get moved by the GC
x86opnd_t pc_plus_one = const_ptr_opnd((void*)(jit->pc + 1)); VALUE put_val = jit_get_arg(jit, 0);
mov(cb, RAX, pc_plus_one); jit_mov_gc_ptr(jit, cb, REG0, put_val);
mov(cb, RAX, mem_opnd(64, RAX, 0));
// TODO: check if argument is a heap object // TODO: check for more specific types like array, string, symbol, etc.
val_type_t val_type = SPECIAL_CONST_P(put_val)? TYPE_IMM:TYPE_HEAP;
// Write argument at SP // Write argument at SP
x86opnd_t stack_top = ctx_stack_push(ctx, TYPE_UNKNOWN); x86opnd_t stack_top = ctx_stack_push(ctx, val_type);
mov(cb, stack_top, RAX); mov(cb, stack_top, REG0);
} }
return YJIT_KEEP_COMPILING; return YJIT_KEEP_COMPILING;