summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--zjit/src/backend/lir.rs11
-rw-r--r--zjit/src/codegen.rs76
2 files changed, 24 insertions, 63 deletions
diff --git a/zjit/src/backend/lir.rs b/zjit/src/backend/lir.rs
index 694c95a37f..899a24c1b3 100644
--- a/zjit/src/backend/lir.rs
+++ b/zjit/src/backend/lir.rs
@@ -5,7 +5,7 @@ use crate::codegen::local_size_and_idx_to_ep_offset;
use crate::cruby::{Qundef, RUBY_OFFSET_CFP_PC, RUBY_OFFSET_CFP_SP, SIZEOF_VALUE_I32};
use crate::hir::SideExitReason;
use crate::options::{debug, get_option};
-use crate::{cruby::VALUE};
+use crate::cruby::VALUE;
use crate::backend::current::*;
use crate::virtualmem::CodePtr;
use crate::asm::{CodeBlock, Label};
@@ -2278,6 +2278,15 @@ macro_rules! asm_comment {
}
pub(crate) use asm_comment;
+/// Convenience macro over [`Assembler::ccall`] that also adds a comment with the function name.
+macro_rules! asm_ccall {
+ [$asm: ident, $fn_name:ident, $($args:expr),* ] => {{
+ $crate::backend::lir::asm_comment!($asm, concat!("call ", stringify!($fn_name)));
+ $asm.ccall($fn_name as *const u8, vec![$($args),*])
+ }};
+}
+pub(crate) use asm_ccall;
+
#[cfg(test)]
mod tests {
use super::*;
diff --git a/zjit/src/codegen.rs b/zjit/src/codegen.rs
index 79460ccdfb..6a5b815d11 100644
--- a/zjit/src/codegen.rs
+++ b/zjit/src/codegen.rs
@@ -7,7 +7,7 @@ use crate::invariants::track_bop_assumption;
use crate::gc::get_or_create_iseq_payload;
use crate::state::ZJITState;
use crate::{asm::CodeBlock, cruby::*, options::debug, virtualmem::CodePtr};
-use crate::backend::lir::{self, asm_comment, Assembler, Opnd, Target, CFP, C_ARG_OPNDS, C_RET_OPND, EC, NATIVE_STACK_PTR, SP};
+use crate::backend::lir::{self, asm_comment, asm_ccall, Assembler, Opnd, Target, CFP, C_ARG_OPNDS, C_RET_OPND, EC, NATIVE_STACK_PTR, SP};
use crate::hir::{iseq_to_hir, Block, BlockId, BranchEdge, CallInfo, Invariant, RangeType, SideExitReason, SideExitReason::*, SpecialObjectType, SELF_PARAM_IDX};
use crate::hir::{Const, FrameState, Function, Insn, InsnId};
use crate::hir_type::{types::Fixnum, Type};
@@ -416,11 +416,7 @@ fn gen_get_constant_path(asm: &mut Assembler, ic: *const iseq_inline_constant_ca
// Save PC since the call can allocate an IC
gen_save_pc(asm, state);
- let val = asm.ccall(
- rb_vm_opt_getconstant_path as *const u8,
- vec![EC, CFP, Opnd::const_ptr(ic as *const u8)],
- );
- val
+ asm_ccall!(asm, rb_vm_opt_getconstant_path, EC, CFP, Opnd::const_ptr(ic as *const u8))
}
fn gen_invokebuiltin(asm: &mut Assembler, state: &FrameState, bf: &rb_builtin_function, args: Vec<Opnd>) -> Option<lir::Opnd> {
@@ -472,36 +468,23 @@ fn gen_ccall(asm: &mut Assembler, cfun: *const u8, args: Vec<Opnd>) -> Option<li
/// Emit an uncached instance variable lookup
fn gen_getivar(asm: &mut Assembler, recv: Opnd, id: ID) -> Opnd {
- asm_comment!(asm, "call rb_ivar_get");
- asm.ccall(
- rb_ivar_get as *const u8,
- vec![recv, Opnd::UImm(id.0)],
- )
+ asm_ccall!(asm, rb_ivar_get, recv, id.0.into())
}
/// Emit an uncached instance variable store
fn gen_setivar(asm: &mut Assembler, recv: Opnd, id: ID, val: Opnd) -> Option<()> {
- asm_comment!(asm, "call rb_ivar_set");
- asm.ccall(
- rb_ivar_set as *const u8,
- vec![recv, Opnd::UImm(id.0), val],
- );
+ asm_ccall!(asm, rb_ivar_set, recv, id.0.into(), val);
Some(())
}
/// Look up global variables
fn gen_getglobal(asm: &mut Assembler, id: ID) -> Opnd {
- asm_comment!(asm, "call rb_gvar_get");
- asm.ccall(
- rb_gvar_get as *const u8,
- vec![Opnd::UImm(id.0)],
- )
+ asm_ccall!(asm, rb_gvar_get, id.0.into())
}
/// Set global variables
fn gen_setglobal(asm: &mut Assembler, id: ID, val: Opnd) {
- asm_comment!(asm, "call rb_gvar_set");
- asm.ccall(rb_gvar_set as *const u8, vec![Opnd::UImm(id.0), val]);
+ asm_ccall!(asm, rb_gvar_set, id.0.into(), val);
}
/// Side-exit into the interpreter
@@ -516,11 +499,7 @@ fn gen_putspecialobject(asm: &mut Assembler, value_type: SpecialObjectType) -> O
let ep_opnd = Opnd::mem(64, CFP, RUBY_OFFSET_CFP_EP);
let ep_reg = asm.load(ep_opnd);
- asm_comment!(asm, "call rb_vm_get_special_object");
- asm.ccall(
- rb_vm_get_special_object as *const u8,
- vec![ep_reg, Opnd::UImm(u64::from(value_type))],
- )
+ asm_ccall!(asm, rb_vm_get_special_object, ep_reg, Opnd::UImm(u64::from(value_type)))
}
/// Compile an interpreter entry block to be inserted into an ISEQ
@@ -794,13 +773,9 @@ fn gen_send_without_block_direct(
/// Compile a string resurrection
fn gen_string_copy(asm: &mut Assembler, recv: Opnd, chilled: bool) -> Opnd {
- asm_comment!(asm, "call rb_ec_str_resurrect");
// TODO: split rb_ec_str_resurrect into separate functions
let chilled = if chilled { Opnd::Imm(1) } else { Opnd::Imm(0) };
- asm.ccall(
- rb_ec_str_resurrect as *const u8,
- vec![EC, recv, chilled],
- )
+ asm_ccall!(asm, rb_ec_str_resurrect, EC, recv, chilled)
}
/// Compile an array duplication instruction
@@ -812,11 +787,7 @@ fn gen_array_dup(
// Save PC
gen_save_pc(asm, state);
- asm_comment!(asm, "call rb_ary_resurrect");
- asm.ccall(
- rb_ary_resurrect as *const u8,
- vec![val],
- )
+ asm_ccall!(asm, rb_ary_resurrect, val)
}
/// Compile a new array instruction
@@ -830,19 +801,10 @@ fn gen_new_array(
let length: ::std::os::raw::c_long = elements.len().try_into().expect("Unable to fit length of elements into c_long");
- asm_comment!(asm, "call rb_ary_new");
- let new_array = asm.ccall(
- rb_ary_new_capa as *const u8,
- vec![lir::Opnd::Imm(length)],
- );
+ let new_array = asm_ccall!(asm, rb_ary_new_capa, length.into());
- for i in 0..elements.len() {
- let val = *elements.get(i as usize).expect("Element should exist at index");
- asm_comment!(asm, "call rb_ary_push");
- asm.ccall(
- rb_ary_push as *const u8,
- vec![new_array, val]
- );
+ for val in elements {
+ asm_ccall!(asm, rb_ary_push, new_array, val);
}
new_array
@@ -859,14 +821,8 @@ fn gen_new_range(
// Save PC
gen_save_pc(asm, state);
- asm_comment!(asm, "call rb_range_new");
// Call rb_range_new(low, high, flag)
- let new_range = asm.ccall(
- rb_range_new as *const u8,
- vec![low, high, lir::Opnd::Imm(flag as i64)],
- );
-
- new_range
+ asm_ccall!(asm, rb_range_new, low, high, (flag as i64).into())
}
/// Compile code that exits from JIT code with a return value
@@ -984,11 +940,7 @@ fn gen_anytostring(asm: &mut Assembler, val: lir::Opnd, str: lir::Opnd, state: &
// Save PC
gen_save_pc(asm, state);
- asm_comment!(asm, "call rb_obj_as_string_result");
- Some(asm.ccall(
- rb_obj_as_string_result as *const u8,
- vec![str, val],
- ))
+ Some(asm_ccall!(asm, rb_obj_as_string_result, str, val))
}
/// Evaluate if a value is truthy
generated by cgit v1.2.3 (git 2.25.1) at 2026-02-14 06:14:39 +0000