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

Rename ir.rs to hir.rs to avoid namespace ambiguity with backend

Browse Source
This commit is contained in:
Maxime Chevalier-Boisvert 2025-02-14 14:16:15 -05:00 committed by Takashi Kokubun
parent 22eec65928
commit ce9c9e0a6a
Notes: git 2025-04-18 13:48:38 +00:00 
Merged: https://github.com/ruby/ruby/pull/13131
5 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
zjit/Cargo.lock generated
View File

@ -45,7 +45,7 @@ checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
[[package]] [[package]]
name = "zjit" name = "zjit"
version = "0.0.0" version = "0.0.1"
dependencies = [ dependencies = [
"capstone", "capstone",
] ]

2
zjit/Cargo.toml
View File

@ -1,6 +1,6 @@
[package] [package]
name = "zjit" name = "zjit"
version = "0.0.0" version = "0.0.1"
edition = "2021" # Rust 2021 edition to compile with edition = "2021" # Rust 2021 edition to compile with
rust-version = "1.77.0" # Minimally supported rust version rust-version = "1.77.0" # Minimally supported rust version
publish = false # Don't publish to crates.io publish = false # Don't publish to crates.io

13
zjit/src/codegen.rs
View File

@ -1,4 +1,11 @@
use crate::{asm::CodeBlock, backend::*, cruby::*, debug, ir::{self, Function, Insn::*}, virtualmem::CodePtr}; use crate::{
asm::CodeBlock,
backend::*,
cruby::*,
debug,
hir::{self, Function, Insn::*},
virtualmem::CodePtr
};
#[cfg(feature = "disasm")] #[cfg(feature = "disasm")]
use crate::get_option; use crate::get_option;
@ -55,7 +62,7 @@ fn gen_entry_prologue(asm: &mut Assembler) {
} }
/// Compile code that exits from JIT code with a return value /// Compile code that exits from JIT code with a return value
fn gen_return(asm: &mut Assembler, val: ir::Opnd) -> Option<()> { fn gen_return(asm: &mut Assembler, val: hir::Opnd) -> Option<()> {
// Pop frame: CFP = CFP + RUBY_SIZEOF_CONTROL_FRAME // Pop frame: CFP = CFP + RUBY_SIZEOF_CONTROL_FRAME
let incr_cfp = asm.add(CFP, RUBY_SIZEOF_CONTROL_FRAME.into()); let incr_cfp = asm.add(CFP, RUBY_SIZEOF_CONTROL_FRAME.into());
asm.mov(CFP, incr_cfp); asm.mov(CFP, incr_cfp);
@ -71,7 +78,7 @@ fn gen_return(asm: &mut Assembler, val: ir::Opnd) -> Option<()> {
// Return a value // Return a value
let val = match val { let val = match val {
ir::Opnd::Const(val) => val, hir::Opnd::Const(val) => val,
_ => return None, // TODO: Support Opnd::Insn _ => return None, // TODO: Support Opnd::Insn
}; };
asm.cret(val.into()); asm.cret(val.into());

0
zjit/src/ir.rs → zjit/src/hir.rs
View File

6
zjit/src/lib.rs
View File

@ -3,7 +3,7 @@
mod state; mod state;
mod cruby; mod cruby;
mod ir; mod hir;
mod codegen; mod codegen;
mod stats; mod stats;
mod cast; mod cast;
@ -83,7 +83,7 @@ pub extern "C" fn rb_zjit_iseq_gen_entry_point(iseq: IseqPtr, _ec: EcPtr) -> *co
// TODO: acquire the VM barrier // TODO: acquire the VM barrier
// Compile ISEQ into SSA IR // Compile ISEQ into SSA IR
let ssa = match ir::iseq_to_ssa(iseq) { let ssa = match hir::iseq_to_ssa(iseq) {
Ok(ssa) => ssa, Ok(ssa) => ssa,
Err(err) => { Err(err) => {
debug!("ZJIT: to_ssa: {:?}", err); debug!("ZJIT: to_ssa: {:?}", err);
@ -91,7 +91,7 @@ pub extern "C" fn rb_zjit_iseq_gen_entry_point(iseq: IseqPtr, _ec: EcPtr) -> *co
} }
}; };
// Compile SSA IR into machine code (TODO) // Compile SSA IR into machine code
let cb = ZJITState::get_code_block(); let cb = ZJITState::get_code_block();
match gen_function(cb, &ssa) { match gen_function(cb, &ssa) {
Some(start_ptr) => start_ptr.raw_ptr(cb), Some(start_ptr) => start_ptr.raw_ptr(cb),