ZJIT: Add asm.sub_into helper

Author: st0012

zjit/src/backend/lir.rs

@@ -2233,6 +2233,11 @@ impl Assembler {
         out
     }
 
+    pub fn sub_into(&mut self, left: Opnd, right: Opnd) -> Opnd {
+        self.push_insn(Insn::Sub { left, right, out: left });
+        left
+    }
+
     #[must_use]
     pub fn mul(&mut self, left: Opnd, right: Opnd) -> Opnd {
         let out = self.new_vreg(Opnd::match_num_bits(&[left, right]));

zjit/src/codegen.rs

@@ -851,8 +851,7 @@ fn gen_send_without_block_direct(
     asm.mov(SP, new_sp);
 
     asm_comment!(asm, "switch to new CFP");
-    let new_cfp = asm.sub(CFP, RUBY_SIZEOF_CONTROL_FRAME.into());
-    asm.mov(CFP, new_cfp);
+    asm.sub_into(CFP, RUBY_SIZEOF_CONTROL_FRAME.into());
     asm.store(Opnd::mem(64, EC, RUBY_OFFSET_EC_CFP), CFP);
 
     // Set up arguments
@@ -876,8 +875,7 @@ fn gen_send_without_block_direct(
     asm.je(Target::SideExit { context: None, reason: CalleeSideExit, label: None });
 
     asm_comment!(asm, "restore SP register for the caller");
-    let new_sp = asm.sub(SP, sp_offset.into());
-    asm.mov(SP, new_sp);
+    asm.sub_into(SP, sp_offset.into());
 
     Some(ret)
 }
@@ -1474,8 +1472,7 @@ fn gen_string_concat(jit: &mut JITState, asm: &mut Assembler, strings: Vec<Opnd>
     let allocation_size = aligned_stack_bytes(n);
 
     asm_comment!(asm, "allocate {} bytes on C stack for {} strings", allocation_size, n);
-    let new_sp = asm.sub(NATIVE_STACK_PTR, allocation_size.into());
-    asm.mov(NATIVE_STACK_PTR, new_sp);
+    asm.sub_into(NATIVE_STACK_PTR, allocation_size.into());
 
     // Calculate the total offset from NATIVE_BASE_PTR to our buffer
     let total_offset_from_base = (frame_size + allocation_size) as i32;