ruby-changes:73161
From: Maxime <ko1@a...>
Date: Tue, 30 Aug 2022 00:57:32 +0900 (JST)
Subject: [ruby-changes:73161] 4254174ca7 (master): Port over setn
https://git.ruby-lang.org/ruby.git/commit/?id=4254174ca7 From 4254174ca76d8e64db29fbcbcfc99a81e2d50211 Mon Sep 17 00:00:00 2001 From: Maxime Chevalier-Boisvert <maxime.chevalierboisvert@s...> Date: Mon, 20 Jun 2022 16:06:39 -0400 Subject: Port over setn --- yjit/src/codegen.rs | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/yjit/src/codegen.rs b/yjit/src/codegen.rs index b97bb01b1b..291851c02e 100644 --- a/yjit/src/codegen.rs +++ b/yjit/src/codegen.rs @@ -1046,28 +1046,27 @@ fn gen_putspecialobject( https://github.com/ruby/ruby/blob/trunk/yjit/src/codegen.rs#L1046 } } -/* // set Nth stack entry to stack top fn gen_setn( jit: &mut JITState, ctx: &mut Context, - cb: &mut CodeBlock, + asm: &mut Assembler, _ocb: &mut OutlinedCb, ) -> CodegenStatus { - let nval: VALUE = jit_get_arg(jit, 0); - let VALUE(n) = nval; + let n: VALUE = jit_get_arg(jit, 0); - let top_val: X86Opnd = ctx.stack_pop(0); - let dst_opnd: X86Opnd = ctx.stack_opnd(n.try_into().unwrap()); - mov(cb, REG0, top_val); - mov(cb, dst_opnd, REG0); + let top_val = ctx.stack_pop(0); + let dst_opnd = ctx.stack_opnd(n.into()); + asm.mov( + dst_opnd, + top_val + ); let mapping = ctx.get_opnd_mapping(StackOpnd(0)); - ctx.set_opnd_mapping(StackOpnd(n.try_into().unwrap()), mapping); + ctx.set_opnd_mapping(StackOpnd(n.into()), mapping); KeepCompiling } -*/ // get nth stack value, then push it fn gen_topn( @@ -5967,7 +5966,7 @@ fn get_gen_fn(opcode: VALUE) -> Option<InsnGenFn> { https://github.com/ruby/ruby/blob/trunk/yjit/src/codegen.rs#L5966 YARVINSN_putobject_INT2FIX_1_ => Some(gen_putobject_int2fix), YARVINSN_putself => Some(gen_putself), YARVINSN_putspecialobject => Some(gen_putspecialobject), - //YARVINSN_setn => Some(gen_setn), + YARVINSN_setn => Some(gen_setn), YARVINSN_topn => Some(gen_topn), YARVINSN_adjuststack => Some(gen_adjuststack), -- cgit v1.2.1 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/