chore: cargo fmt
This commit is contained in:
153
src/jit/mod.rs
153
src/jit/mod.rs
@@ -1,11 +1,11 @@
|
||||
use std::rc::Rc;
|
||||
|
||||
use inkwell::OptimizationLevel;
|
||||
use inkwell::builder::Builder;
|
||||
use inkwell::context::Context;
|
||||
use inkwell::execution_engine::{ExecutionEngine, JitFunction};
|
||||
use inkwell::module::Module;
|
||||
use inkwell::values::{BasicValueEnum, PointerValue};
|
||||
use inkwell::OptimizationLevel;
|
||||
|
||||
use crate::bytecode::{Func, OpCode, UnOp};
|
||||
use crate::error::*;
|
||||
@@ -49,7 +49,7 @@ pub union JITValueData {
|
||||
int: i64,
|
||||
float: f64,
|
||||
boolean: bool,
|
||||
ptr: *const ()
|
||||
ptr: *const (),
|
||||
}
|
||||
|
||||
impl<'jit: 'vm, 'vm> Into<Value<'jit, 'vm>> for JITValue {
|
||||
@@ -58,7 +58,7 @@ impl<'jit: 'vm, 'vm> Into<Value<'jit, 'vm>> for JITValue {
|
||||
match self.tag {
|
||||
Int => Value::Const(Const::Int(unsafe { self.data.int })),
|
||||
Null => Value::Const(Const::Null),
|
||||
_ => todo!("not implemented for {:?}", self.tag)
|
||||
_ => todo!("not implemented for {:?}", self.tag),
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -66,13 +66,17 @@ impl<'jit: 'vm, 'vm> Into<Value<'jit, 'vm>> for JITValue {
|
||||
impl From<Value<'_, '_>> for JITValue {
|
||||
fn from(value: Value<'_, '_>) -> Self {
|
||||
match value {
|
||||
Value::Const(Const::Int(int)) => JITValue { tag: ValueTag::Int, data: JITValueData { int } },
|
||||
_ => todo!()
|
||||
Value::Const(Const::Int(int)) => JITValue {
|
||||
tag: ValueTag::Int,
|
||||
data: JITValueData { int },
|
||||
},
|
||||
_ => todo!(),
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
pub type JITFunc<'jit, 'vm> = unsafe extern "C" fn(*const VM<'jit>, *const Env<'jit, 'vm>) -> JITValue;
|
||||
pub type JITFunc<'jit, 'vm> =
|
||||
unsafe extern "C" fn(*const VM<'jit>, *const Env<'jit, 'vm>) -> JITValue;
|
||||
|
||||
pub struct JITContext<'ctx> {
|
||||
context: &'ctx Context,
|
||||
@@ -80,7 +84,7 @@ pub struct JITContext<'ctx> {
|
||||
builder: Builder<'ctx>,
|
||||
execution_engine: ExecutionEngine<'ctx>,
|
||||
|
||||
helpers: Helpers<'ctx>
|
||||
helpers: Helpers<'ctx>,
|
||||
}
|
||||
|
||||
impl<'vm, 'ctx: 'vm> JITContext<'ctx> {
|
||||
@@ -97,18 +101,30 @@ impl<'vm, 'ctx: 'vm> JITContext<'ctx> {
|
||||
context,
|
||||
module,
|
||||
|
||||
helpers
|
||||
helpers,
|
||||
}
|
||||
}
|
||||
|
||||
pub fn new_ptr<T>(&self, ptr: *const T) -> PointerValue<'ctx> {
|
||||
self.builder.build_int_to_ptr(self.helpers.int_type.const_int(ptr as _, false), self.helpers.ptr_type, "ptrconv").unwrap()
|
||||
self.builder
|
||||
.build_int_to_ptr(
|
||||
self.helpers.int_type.const_int(ptr as _, false),
|
||||
self.helpers.ptr_type,
|
||||
"ptrconv",
|
||||
)
|
||||
.unwrap()
|
||||
}
|
||||
|
||||
pub fn compile_function(&self, func: &Func, vm: &'vm VM<'_>) -> Result<JitFunction<'ctx, JITFunc<'ctx, 'vm>>> {
|
||||
pub fn compile_function(
|
||||
&self,
|
||||
func: &Func,
|
||||
vm: &'vm VM<'_>,
|
||||
) -> Result<JitFunction<'ctx, JITFunc<'ctx, 'vm>>> {
|
||||
let mut stack = Stack::<_, STACK_SIZE>::new();
|
||||
let mut iter = func.opcodes.iter().copied();
|
||||
let func_ = self.module.add_function("nixjit_function", self.helpers.func_type, None);
|
||||
let func_ = self
|
||||
.module
|
||||
.add_function("nixjit_function", self.helpers.func_type, None);
|
||||
let entry = self.context.append_basic_block(func_, "entry");
|
||||
self.builder.position_at_end(entry);
|
||||
let env = func_.get_nth_param(1).unwrap().into_pointer_value();
|
||||
@@ -148,26 +164,48 @@ impl<'vm, 'ctx: 'vm> JITContext<'ctx> {
|
||||
Null => stack.push(self.helpers.new_null())?,
|
||||
}
|
||||
}
|
||||
OpCode::LoadThunk { idx } => stack.push(self.helpers.new_thunk(Rc::into_raw(Rc::new(Thunk::new(vm.get_thunk(idx))))))?,
|
||||
OpCode::LoadThunk { idx } => stack.push(
|
||||
self.helpers
|
||||
.new_thunk(Rc::into_raw(Rc::new(Thunk::new(vm.get_thunk(idx))))),
|
||||
)?,
|
||||
OpCode::CaptureEnv => {
|
||||
let thunk = *stack.tos()?;
|
||||
self.builder.build_direct_call(self.helpers.capture_env, &[thunk.into(), env.into()], "call_capture_env")?;
|
||||
self.builder.build_direct_call(
|
||||
self.helpers.capture_env,
|
||||
&[thunk.into(), env.into()],
|
||||
"call_capture_env",
|
||||
)?;
|
||||
}
|
||||
OpCode::UnOp { op } => {
|
||||
use UnOp::*;
|
||||
let rhs = stack.pop();
|
||||
stack.push(match op {
|
||||
Neg => self.builder.build_direct_call(self.helpers.neg, &[rhs.into(), env.into()], "call_neg")?.try_as_basic_value().left().unwrap(),
|
||||
_ => todo!()
|
||||
Neg => self
|
||||
.builder
|
||||
.build_direct_call(self.helpers.neg, &[rhs.into(), env.into()], "call_neg")?
|
||||
.try_as_basic_value()
|
||||
.left()
|
||||
.unwrap(),
|
||||
_ => todo!(),
|
||||
})?
|
||||
}
|
||||
OpCode::Func { idx } => {
|
||||
let func = vm.get_func(idx);
|
||||
let jit_func_ptr = self.compile_function(func, vm)?;
|
||||
let jit_value = self.helpers.value_type.const_named_struct(&[
|
||||
self.helpers.int_type.const_int(ValueTag::Function as _, false).into(),
|
||||
self.helpers.ptr_int_type.const_int(unsafe { jit_func_ptr.as_raw() } as _, false).into(),
|
||||
]).into();
|
||||
let jit_value = self
|
||||
.helpers
|
||||
.value_type
|
||||
.const_named_struct(&[
|
||||
self.helpers
|
||||
.int_type
|
||||
.const_int(ValueTag::Function as _, false)
|
||||
.into(),
|
||||
self.helpers
|
||||
.ptr_int_type
|
||||
.const_int(unsafe { jit_func_ptr.as_raw() } as _, false)
|
||||
.into(),
|
||||
])
|
||||
.into();
|
||||
stack.push(jit_value)?;
|
||||
}
|
||||
OpCode::Call { arity } => {
|
||||
@@ -175,8 +213,25 @@ impl<'vm, 'ctx: 'vm> JITContext<'ctx> {
|
||||
assert_eq!(arity, 1);
|
||||
let arg = stack.pop();
|
||||
let func_value = stack.pop();
|
||||
let func_ptr = self.builder.build_extract_value(func_value.into_struct_value(), 1, "func_ptr")?.into_pointer_value();
|
||||
let result = self.builder.build_direct_call(self.helpers.call, &[self.new_ptr(vm).into(), env.into(), func_ptr.into(), arg.into()], "call_func")?.try_as_basic_value().left().unwrap();
|
||||
let func_ptr = self
|
||||
.builder
|
||||
.build_extract_value(func_value.into_struct_value(), 1, "func_ptr")?
|
||||
.into_pointer_value();
|
||||
let result = self
|
||||
.builder
|
||||
.build_direct_call(
|
||||
self.helpers.call,
|
||||
&[
|
||||
self.new_ptr(vm).into(),
|
||||
env.into(),
|
||||
func_ptr.into(),
|
||||
arg.into(),
|
||||
],
|
||||
"call_func",
|
||||
)?
|
||||
.try_as_basic_value()
|
||||
.left()
|
||||
.unwrap();
|
||||
stack.push(result)?;
|
||||
}
|
||||
OpCode::BinOp { op } => {
|
||||
@@ -185,24 +240,66 @@ impl<'vm, 'ctx: 'vm> JITContext<'ctx> {
|
||||
let lhs = stack.pop();
|
||||
match op {
|
||||
BinOp::Add => {
|
||||
let result = self.builder.build_direct_call(self.helpers.add, &[lhs.into(), rhs.into()], "call_add")?.try_as_basic_value().left().unwrap();
|
||||
let result = self
|
||||
.builder
|
||||
.build_direct_call(
|
||||
self.helpers.add,
|
||||
&[lhs.into(), rhs.into()],
|
||||
"call_add",
|
||||
)?
|
||||
.try_as_basic_value()
|
||||
.left()
|
||||
.unwrap();
|
||||
stack.push(result)?;
|
||||
}
|
||||
BinOp::Sub => {
|
||||
let result = self.builder.build_direct_call(self.helpers.sub, &[lhs.into(), rhs.into()], "call_add")?.try_as_basic_value().left().unwrap();
|
||||
let result = self
|
||||
.builder
|
||||
.build_direct_call(
|
||||
self.helpers.sub,
|
||||
&[lhs.into(), rhs.into()],
|
||||
"call_add",
|
||||
)?
|
||||
.try_as_basic_value()
|
||||
.left()
|
||||
.unwrap();
|
||||
stack.push(result)?;
|
||||
}
|
||||
BinOp::Eq => {
|
||||
let result = self.builder.build_direct_call(self.helpers.add, &[lhs.into(), rhs.into()], "call_add")?.try_as_basic_value().left().unwrap();
|
||||
let result = self
|
||||
.builder
|
||||
.build_direct_call(
|
||||
self.helpers.add,
|
||||
&[lhs.into(), rhs.into()],
|
||||
"call_add",
|
||||
)?
|
||||
.try_as_basic_value()
|
||||
.left()
|
||||
.unwrap();
|
||||
stack.push(result)?;
|
||||
}
|
||||
_ => todo!("BinOp::{:?} not implemented in JIT", op),
|
||||
}
|
||||
}
|
||||
OpCode::LookUp { sym } => {
|
||||
stack.push(self.builder.build_direct_call(self.helpers.lookup, &[self.helpers.ptr_int_type.const_int(sym as u64, false).into(), env.into()], "call_lookup").unwrap().try_as_basic_value().left().unwrap())?
|
||||
}
|
||||
_ => todo!("{opcode:?} not implemented")
|
||||
OpCode::LookUp { sym } => stack.push(
|
||||
self.builder
|
||||
.build_direct_call(
|
||||
self.helpers.lookup,
|
||||
&[
|
||||
self.helpers
|
||||
.ptr_int_type
|
||||
.const_int(sym as u64, false)
|
||||
.into(),
|
||||
env.into(),
|
||||
],
|
||||
"call_lookup",
|
||||
)
|
||||
.unwrap()
|
||||
.try_as_basic_value()
|
||||
.left()
|
||||
.unwrap(),
|
||||
)?,
|
||||
_ => todo!("{opcode:?} not implemented"),
|
||||
}
|
||||
Ok(())
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user