lune-org/lune
1
1
Fork 0
mirror of https://github.com/lune-org/lune.git synced 2025-04-04 10:30:54 +01:00
Code Issues Projects Releases Packages Wiki Activity

Move c ABI related object and functions into ffi.c (#243)

Browse source
This commit is contained in:
qwreey 2024-10-21 10:52:58 +00:00
parent a67661a753
commit b31f81459f
No known key found for this signature in database
GPG key ID: D28DB79297A214BD
37 changed files with 345 additions and 232 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
crates/lune-std-ffi/src/c/arr_info.rs
View file

@ -140,9 +140,9 @@ impl FfiConvert for CArrInfo {
dst: &Ref<dyn FfiData>, dst: &Ref<dyn FfiData>,
src: &Ref<dyn FfiData>, src: &Ref<dyn FfiData>,
) -> LuaResult<()> { ) -> LuaResult<()> {
dst.get_pointer() dst.get_inner_pointer()
.byte_offset(dst_offset) .byte_offset(dst_offset)
.copy_from(src.get_pointer().byte_offset(src_offset), self.get_size()); .copy_from(src.get_inner_pointer().byte_offset(src_offset), self.get_size());
Ok(()) Ok(())
} }
} }
@ -161,7 +161,7 @@ impl LuaUserData for CArrInfo {
fn add_methods<'lua, M: LuaUserDataMethods<'lua, Self>>(methods: &mut M) { fn add_methods<'lua, M: LuaUserDataMethods<'lua, Self>>(methods: &mut M) {
// Subtype // Subtype
method_provider::provide_ptr_info(methods); method_provider::provide_ptr(methods);
// ToString // ToString
method_provider::provide_to_string(methods); method_provider::provide_to_string(methods);

18
crates/lune-std-ffi/src/c/fn_info.rs
View file

@ -12,7 +12,10 @@ use super::{
}; };
use crate::{ use crate::{
data::{CallableData, ClosureData, RefData, RefFlag}, data::{CallableData, ClosureData, RefData, RefFlag},
ffi::{association, bit_mask::*, FfiArg, FfiData, FfiResult, FfiSignedness, FfiSize}, ffi::{
association, bit_mask::*, libffi_helper::SIZE_OF_POINTER, FfiArg, FfiData, FfiResult,
FfiSignedness, FfiSize,
},
}; };
// cfn is a type declaration for a function. // cfn is a type declaration for a function.
@ -42,9 +45,10 @@ impl FfiSignedness for CFnInfo {
false false
} }
} }
impl FfiSize for CFnInfo { impl FfiSize for CFnInfo {
fn get_size(&self) -> usize { fn get_size(&self) -> usize {
size_of::<*mut ()>() SIZE_OF_POINTER
} }
} }
@ -186,7 +190,7 @@ impl CFnInfo {
self.cif.as_raw_ptr(), self.cif.as_raw_ptr(),
self.arg_info_list.clone(), self.arg_info_list.clone(),
self.result_info.clone(), self.result_info.clone(),
ffi_ref.get_pointer(), ffi_ref.get_inner_pointer(),
) )
})?; })?;
@ -195,13 +199,17 @@ impl CFnInfo {
Ok(callable) Ok(callable)
} }
pub fn get_middle_type() -> Type {
Type::void()
}
} }
impl LuaUserData for CFnInfo { impl LuaUserData for CFnInfo {
fn add_methods<'lua, M: LuaUserDataMethods<'lua, Self>>(methods: &mut M) { fn add_methods<'lua, M: LuaUserDataMethods<'lua, Self>>(methods: &mut M) {
// Subtype // Subtype
method_provider::provide_ptr_info(methods); method_provider::provide_ptr(methods);
method_provider::provide_arr_info(methods); method_provider::provide_arr(methods);
// ToString // ToString
method_provider::provide_to_string(methods); method_provider::provide_to_string(methods);

25
crates/lune-std-ffi/src/c/helper.rs
View file

@ -10,6 +10,7 @@ use crate::{
pub mod method_provider { pub mod method_provider {
use super::*; use super::*;
pub fn provide_to_string<'lua, Target, M>(methods: &mut M) pub fn provide_to_string<'lua, Target, M>(methods: &mut M)
where where
M: LuaUserDataMethods<'lua, Target>, M: LuaUserDataMethods<'lua, Target>,
@ -19,20 +20,20 @@ pub mod method_provider {
}); });
} }
pub fn provide_ptr_info<'lua, Target, M>(methods: &mut M) pub fn provide_ptr<'lua, Target, M>(methods: &mut M)
where where
M: LuaUserDataMethods<'lua, Target>, M: LuaUserDataMethods<'lua, Target>,
{ {
methods.add_function("ptrInfo", |lua, this: LuaAnyUserData| { methods.add_function("ptr", |lua, this: LuaAnyUserData| {
CPtrInfo::from_userdata(lua, &this) CPtrInfo::from_userdata(lua, &this)
}); });
} }
pub fn provide_arr_info<'lua, Target, M>(methods: &mut M) pub fn provide_arr<'lua, Target, M>(methods: &mut M)
where where
M: LuaUserDataMethods<'lua, Target>, M: LuaUserDataMethods<'lua, Target>,
{ {
methods.add_function("ArrInfo", |lua, (this, length): (LuaAnyUserData, usize)| { methods.add_function("arr", |lua, (this, length): (LuaAnyUserData, usize)| {
CArrInfo::from_userdata(lua, &this, length) CArrInfo::from_userdata(lua, &this, length)
}); });
} }
@ -48,7 +49,7 @@ pub mod method_provider {
let offset = offset.unwrap_or(0); let offset = offset.unwrap_or(0);
let data_handle = &target.get_ffi_data()?; let data_handle = &target.get_ffi_data()?;
if !data_handle.check_boundary(offset, this.get_size()) { if !data_handle.check_inner_boundary(offset, this.get_size()) {
return Err(LuaError::external("Out of bounds")); return Err(LuaError::external("Out of bounds"));
} }
if !data_handle.is_readable() { if !data_handle.is_readable() {
@ -72,7 +73,7 @@ pub mod method_provider {
let data_handle = &target.get_ffi_data()?; let data_handle = &target.get_ffi_data()?;
// use or functions // use or functions
if !data_handle.check_boundary(offset, this.get_size()) { if !data_handle.check_inner_boundary(offset, this.get_size()) {
return Err(LuaError::external("Out of bounds")); return Err(LuaError::external("Out of bounds"));
} }
if !data_handle.is_writable() { if !data_handle.is_writable() {
@ -104,7 +105,7 @@ pub mod method_provider {
let dst = &dst.get_ffi_data()?; let dst = &dst.get_ffi_data()?;
// use or functions // use or functions
if !dst.check_boundary(dst_offset, this.get_size()) { if !dst.check_inner_boundary(dst_offset, this.get_size()) {
return Err(LuaError::external("Out of bounds")); return Err(LuaError::external("Out of bounds"));
} }
if !dst.is_writable() { if !dst.is_writable() {
@ -112,7 +113,7 @@ pub mod method_provider {
} }
let src = &src.get_ffi_data()?; let src = &src.get_ffi_data()?;
if !src.check_boundary(dst_offset, this.get_size()) { if !src.check_inner_boundary(dst_offset, this.get_size()) {
return Err(LuaError::external("Out of bounds")); return Err(LuaError::external("Out of bounds"));
} }
if !src.is_readable() { if !src.is_readable() {
@ -189,7 +190,7 @@ pub fn get_userdata(value: LuaValue) -> LuaResult<LuaAnyUserData> {
Ok(field_type) Ok(field_type)
} else { } else {
Err(LuaError::external(format!( Err(LuaError::external(format!(
"Unexpected field. CStruct, CType or CArr is required for element but got {}", "CStruct, CType, CFn, CVoid or CArr is required but got {}",
pretty_format_value(&value, &ValueFormatConfig::new()) pretty_format_value(&value, &ValueFormatConfig::new())
))) )))
} }
@ -242,6 +243,8 @@ pub fn get_size(userdata: &LuaAnyUserData) -> LuaResult<usize> {
Ok(userdata.borrow::<CPtrInfo>()?.get_size()) Ok(userdata.borrow::<CPtrInfo>()?.get_size())
} else if userdata.is::<CVoidInfo>() { } else if userdata.is::<CVoidInfo>() {
Ok(userdata.borrow::<CVoidInfo>()?.get_size()) Ok(userdata.borrow::<CVoidInfo>()?.get_size())
} else if userdata.is::<CFnInfo>() {
Ok(userdata.borrow::<CFnInfo>()?.get_size())
} else { } else {
ctype_helper::get_size(userdata) ctype_helper::get_size(userdata)
} }
@ -259,9 +262,11 @@ pub fn get_middle_type(userdata: &LuaAnyUserData) -> LuaResult<Type> {
Ok(CPtrInfo::get_middle_type()) Ok(CPtrInfo::get_middle_type())
} else if userdata.is::<CVoidInfo>() { } else if userdata.is::<CVoidInfo>() {
Ok(CVoidInfo::get_middle_type()) Ok(CVoidInfo::get_middle_type())
} else if userdata.is::<CFnInfo>() {
Ok(CFnInfo::get_middle_type())
} else { } else {
Err(LuaError::external(format!( Err(LuaError::external(format!(
"Unexpected field. CStruct, CType, CString or CArr is required for element but got {}", "CStruct, CType, CFn, CVoid or CArr is required but got {}",
pretty_format_value( pretty_format_value(
// Since the data is in the Lua location, // Since the data is in the Lua location,
// there is no problem with the clone. // there is no problem with the clone.

16
crates/lune-std-ffi/src/c/mod.rs
View file

@ -1,3 +1,6 @@
use lune_utils::TableBuilder;
use mlua::prelude::*;
mod arr_info; mod arr_info;
mod fn_info; mod fn_info;
pub mod helper; pub mod helper;
@ -30,3 +33,16 @@ mod association_names {
pub const CLOSURE_FUNC: &str = "__closure_func"; pub const CLOSURE_FUNC: &str = "__closure_func";
pub const CLOSURE_CFN: &str = "__closure_cfn"; pub const CLOSURE_CFN: &str = "__closure_cfn";
} }
pub fn export(lua: &Lua) -> LuaResult<LuaTable> {
TableBuilder::new(lua)?
.with_value("void", CVoidInfo::new())?
.with_values(export_ctypes(lua)?)?
.with_function("struct", |lua, types: LuaTable| {
CStructInfo::from_table(lua, types)
})?
.with_function("fn", |lua, (args, ret): (LuaTable, LuaAnyUserData)| {
CFnInfo::from_table(lua, args, ret)
})?
.build_readonly()
}

15
crates/lune-std-ffi/src/c/ptr_info.rs
View file

@ -46,9 +46,9 @@ impl FfiConvert for CPtrInfo {
.as_userdata() .as_userdata()
.ok_or_else(|| LuaError::external("CPtrInfo:writeRef only allows data"))?; .ok_or_else(|| LuaError::external("CPtrInfo:writeRef only allows data"))?;
*data_handle *data_handle
.get_pointer() .get_inner_pointer()
.byte_offset(offset) .byte_offset(offset)
.cast::<*mut ()>() = value_userdata.get_ffi_data()?.get_pointer(); .cast::<*mut ()>() = value_userdata.get_ffi_data()?.get_inner_pointer();
Ok(()) Ok(())
} }
@ -60,7 +60,7 @@ impl FfiConvert for CPtrInfo {
data_handle: &Ref<dyn FfiData>, data_handle: &Ref<dyn FfiData>,
) -> LuaResult<LuaValue<'lua>> { ) -> LuaResult<LuaValue<'lua>> {
Ok(LuaValue::UserData(lua.create_userdata(RefData::new( Ok(LuaValue::UserData(lua.create_userdata(RefData::new(
unsafe { data_handle.get_pointer().byte_offset(offset) }, unsafe { data_handle.get_inner_pointer().byte_offset(offset) },
if self.inner_is_cptr { if self.inner_is_cptr {
READ_CPTR_REF_FLAGS READ_CPTR_REF_FLAGS
} else { } else {
@ -78,8 +78,9 @@ impl FfiConvert for CPtrInfo {
dst: &Ref<dyn FfiData>, dst: &Ref<dyn FfiData>,
src: &Ref<dyn FfiData>, src: &Ref<dyn FfiData>,
) -> LuaResult<()> { ) -> LuaResult<()> {
*dst.get_pointer().byte_offset(dst_offset).cast::<*mut ()>() = *dst.get_inner_pointer()
src.get_pointer().byte_offset(src_offset); .byte_offset(dst_offset)
.cast::<*mut ()>() = src.get_inner_pointer().byte_offset(src_offset);
Ok(()) Ok(())
} }
} }
@ -133,8 +134,8 @@ impl LuaUserData for CPtrInfo {
fn add_methods<'lua, M: LuaUserDataMethods<'lua, Self>>(methods: &mut M) { fn add_methods<'lua, M: LuaUserDataMethods<'lua, Self>>(methods: &mut M) {
// Subtype // Subtype
method_provider::provide_ptr_info(methods); method_provider::provide_ptr(methods);
method_provider::provide_arr_info(methods); method_provider::provide_arr(methods);
// ToString // ToString
method_provider::provide_to_string(methods); method_provider::provide_to_string(methods);

0
crates/lune-std-ffi/src/c/string_info.rs Normal file
View file

11
crates/lune-std-ffi/src/c/struct_info.rs
View file

@ -172,9 +172,10 @@ impl FfiConvert for CStructInfo {
dst: &Ref<dyn FfiData>, dst: &Ref<dyn FfiData>,
src: &Ref<dyn FfiData>, src: &Ref<dyn FfiData>,
) -> LuaResult<()> { ) -> LuaResult<()> {
dst.get_pointer() dst.get_inner_pointer().byte_offset(dst_offset).copy_from(
.byte_offset(dst_offset) src.get_inner_pointer().byte_offset(src_offset),
.copy_from(src.get_pointer().byte_offset(src_offset), self.get_size()); self.get_size(),
);
Ok(()) Ok(())
} }
} }
@ -185,8 +186,8 @@ impl LuaUserData for CStructInfo {
} }
fn add_methods<'lua, M: LuaUserDataMethods<'lua, Self>>(methods: &mut M) { fn add_methods<'lua, M: LuaUserDataMethods<'lua, Self>>(methods: &mut M) {
// Subtype // Subtype
method_provider::provide_ptr_info(methods); method_provider::provide_ptr(methods);
method_provider::provide_arr_info(methods); method_provider::provide_arr(methods);
// ToString // ToString
method_provider::provide_to_string(methods); method_provider::provide_to_string(methods);

4
crates/lune-std-ffi/src/c/type_info.rs
View file

@ -98,8 +98,8 @@ where
fn add_methods<'lua, M: LuaUserDataMethods<'lua, Self>>(methods: &mut M) { fn add_methods<'lua, M: LuaUserDataMethods<'lua, Self>>(methods: &mut M) {
// Subtype // Subtype
method_provider::provide_ptr_info(methods); method_provider::provide_ptr(methods);
method_provider::provide_arr_info(methods); method_provider::provide_arr(methods);
// ToString // ToString
method_provider::provide_to_string(methods); method_provider::provide_to_string(methods);

10
crates/lune-std-ffi/src/c/types/f32.rs
View file

@ -37,7 +37,7 @@ impl FfiConvert for CTypeInfo<f32> {
} }
}; };
unsafe { unsafe {
*(data_handle.get_pointer().byte_offset(offset).cast::<f32>()) = value; *(data_handle.get_inner_pointer().byte_offset(offset).cast::<f32>()) = value;
} }
Ok(()) Ok(())
} }
@ -49,7 +49,7 @@ impl FfiConvert for CTypeInfo<f32> {
data_handle: &Ref<dyn FfiData>, data_handle: &Ref<dyn FfiData>,
) -> LuaResult<LuaValue<'lua>> { ) -> LuaResult<LuaValue<'lua>> {
let value = unsafe { let value = unsafe {
(*data_handle.get_pointer().byte_offset(offset).cast::<f32>()).into_lua(lua)? (*data_handle.get_inner_pointer().byte_offset(offset).cast::<f32>()).into_lua(lua)?
}; };
Ok(value) Ok(value)
} }
@ -61,8 +61,8 @@ impl FfiConvert for CTypeInfo<f32> {
dst: &Ref<dyn FfiData>, dst: &Ref<dyn FfiData>,
src: &Ref<dyn FfiData>, src: &Ref<dyn FfiData>,
) -> LuaResult<()> { ) -> LuaResult<()> {
*dst.get_pointer().byte_offset(dst_offset).cast::<f32>() = *dst.get_inner_pointer().byte_offset(dst_offset).cast::<f32>() =
*src.get_pointer().byte_offset(src_offset).cast::<f32>(); *src.get_inner_pointer().byte_offset(src_offset).cast::<f32>();
Ok(()) Ok(())
} }
unsafe fn stringify_data( unsafe fn stringify_data(
@ -71,6 +71,6 @@ impl FfiConvert for CTypeInfo<f32> {
offset: isize, offset: isize,
data_handle: &Ref<dyn FfiData>, data_handle: &Ref<dyn FfiData>,
) -> LuaResult<String> { ) -> LuaResult<String> {
Ok((*data_handle.get_pointer().byte_offset(offset).cast::<f32>()).to_string()) Ok((*data_handle.get_inner_pointer().byte_offset(offset).cast::<f32>()).to_string())
} }
} }

10
crates/lune-std-ffi/src/c/types/f64.rs
View file

@ -37,7 +37,7 @@ impl FfiConvert for CTypeInfo<f64> {
} }
}; };
unsafe { unsafe {
*(data_handle.get_pointer().byte_offset(offset).cast::<f64>()) = value; *(data_handle.get_inner_pointer().byte_offset(offset).cast::<f64>()) = value;
} }
Ok(()) Ok(())
} }
@ -49,7 +49,7 @@ impl FfiConvert for CTypeInfo<f64> {
data_handle: &Ref<dyn FfiData>, data_handle: &Ref<dyn FfiData>,
) -> LuaResult<LuaValue<'lua>> { ) -> LuaResult<LuaValue<'lua>> {
let value = unsafe { let value = unsafe {
(*data_handle.get_pointer().byte_offset(offset).cast::<f64>()).into_lua(lua)? (*data_handle.get_inner_pointer().byte_offset(offset).cast::<f64>()).into_lua(lua)?
}; };
Ok(value) Ok(value)
} }
@ -61,8 +61,8 @@ impl FfiConvert for CTypeInfo<f64> {
dst: &Ref<dyn FfiData>, dst: &Ref<dyn FfiData>,
src: &Ref<dyn FfiData>, src: &Ref<dyn FfiData>,
) -> LuaResult<()> { ) -> LuaResult<()> {
*dst.get_pointer().byte_offset(dst_offset).cast::<f64>() = *dst.get_inner_pointer().byte_offset(dst_offset).cast::<f64>() =
*src.get_pointer().byte_offset(src_offset).cast::<f64>(); *src.get_inner_pointer().byte_offset(src_offset).cast::<f64>();
Ok(()) Ok(())
} }
unsafe fn stringify_data( unsafe fn stringify_data(
@ -71,6 +71,6 @@ impl FfiConvert for CTypeInfo<f64> {
offset: isize, offset: isize,
data_handle: &Ref<dyn FfiData>, data_handle: &Ref<dyn FfiData>,
) -> LuaResult<String> { ) -> LuaResult<String> {
Ok((*data_handle.get_pointer().byte_offset(offset).cast::<f64>()).to_string()) Ok((*data_handle.get_inner_pointer().byte_offset(offset).cast::<f64>()).to_string())
} }
} }

10
crates/lune-std-ffi/src/c/types/i128.rs
View file

@ -37,7 +37,7 @@ impl FfiConvert for CTypeInfo<i128> {
} }
}; };
unsafe { unsafe {
*(data_handle.get_pointer().byte_offset(offset).cast::<i128>()) = value; *(data_handle.get_inner_pointer().byte_offset(offset).cast::<i128>()) = value;
} }
Ok(()) Ok(())
} }
@ -49,7 +49,7 @@ impl FfiConvert for CTypeInfo<i128> {
data_handle: &Ref<dyn FfiData>, data_handle: &Ref<dyn FfiData>,
) -> LuaResult<LuaValue<'lua>> { ) -> LuaResult<LuaValue<'lua>> {
let value = unsafe { let value = unsafe {
(*data_handle.get_pointer().byte_offset(offset).cast::<i128>()).into_lua(lua)? (*data_handle.get_inner_pointer().byte_offset(offset).cast::<i128>()).into_lua(lua)?
}; };
Ok(value) Ok(value)
} }
@ -61,8 +61,8 @@ impl FfiConvert for CTypeInfo<i128> {
dst: &Ref<dyn FfiData>, dst: &Ref<dyn FfiData>,
src: &Ref<dyn FfiData>, src: &Ref<dyn FfiData>,
) -> LuaResult<()> { ) -> LuaResult<()> {
*dst.get_pointer().byte_offset(dst_offset).cast::<i128>() = *dst.get_inner_pointer().byte_offset(dst_offset).cast::<i128>() =
*src.get_pointer().byte_offset(src_offset).cast::<i128>(); *src.get_inner_pointer().byte_offset(src_offset).cast::<i128>();
Ok(()) Ok(())
} }
unsafe fn stringify_data( unsafe fn stringify_data(
@ -71,6 +71,6 @@ impl FfiConvert for CTypeInfo<i128> {
offset: isize, offset: isize,
data_handle: &Ref<dyn FfiData>, data_handle: &Ref<dyn FfiData>,
) -> LuaResult<String> { ) -> LuaResult<String> {
Ok((*data_handle.get_pointer().byte_offset(offset).cast::<i128>()).to_string()) Ok((*data_handle.get_inner_pointer().byte_offset(offset).cast::<i128>()).to_string())
} }
} }

10
crates/lune-std-ffi/src/c/types/i16.rs
View file

@ -37,7 +37,7 @@ impl FfiConvert for CTypeInfo<i16> {
} }
}; };
unsafe { unsafe {
*(data_handle.get_pointer().byte_offset(offset).cast::<i16>()) = value; *(data_handle.get_inner_pointer().byte_offset(offset).cast::<i16>()) = value;
} }
Ok(()) Ok(())
} }
@ -49,7 +49,7 @@ impl FfiConvert for CTypeInfo<i16> {
data_handle: &Ref<dyn FfiData>, data_handle: &Ref<dyn FfiData>,
) -> LuaResult<LuaValue<'lua>> { ) -> LuaResult<LuaValue<'lua>> {
let value = unsafe { let value = unsafe {
(*data_handle.get_pointer().byte_offset(offset).cast::<i16>()).into_lua(lua)? (*data_handle.get_inner_pointer().byte_offset(offset).cast::<i16>()).into_lua(lua)?
}; };
Ok(value) Ok(value)
} }
@ -61,8 +61,8 @@ impl FfiConvert for CTypeInfo<i16> {
dst: &Ref<dyn FfiData>, dst: &Ref<dyn FfiData>,
src: &Ref<dyn FfiData>, src: &Ref<dyn FfiData>,
) -> LuaResult<()> { ) -> LuaResult<()> {
*dst.get_pointer().byte_offset(dst_offset).cast::<i16>() = *dst.get_inner_pointer().byte_offset(dst_offset).cast::<i16>() =
*src.get_pointer().byte_offset(src_offset).cast::<i16>(); *src.get_inner_pointer().byte_offset(src_offset).cast::<i16>();
Ok(()) Ok(())
} }
unsafe fn stringify_data( unsafe fn stringify_data(
@ -71,6 +71,6 @@ impl FfiConvert for CTypeInfo<i16> {
offset: isize, offset: isize,
data_handle: &Ref<dyn FfiData>, data_handle: &Ref<dyn FfiData>,
) -> LuaResult<String> { ) -> LuaResult<String> {
Ok((*data_handle.get_pointer().byte_offset(offset).cast::<i16>()).to_string()) Ok((*data_handle.get_inner_pointer().byte_offset(offset).cast::<i16>()).to_string())
} }
} }

10
crates/lune-std-ffi/src/c/types/i32.rs
View file

@ -37,7 +37,7 @@ impl FfiConvert for CTypeInfo<i32> {
} }
}; };
unsafe { unsafe {
*(data_handle.get_pointer().byte_offset(offset).cast::<i32>()) = value; *(data_handle.get_inner_pointer().byte_offset(offset).cast::<i32>()) = value;
} }
Ok(()) Ok(())
} }
@ -49,7 +49,7 @@ impl FfiConvert for CTypeInfo<i32> {
data_handle: &Ref<dyn FfiData>, data_handle: &Ref<dyn FfiData>,
) -> LuaResult<LuaValue<'lua>> { ) -> LuaResult<LuaValue<'lua>> {
let value = unsafe { let value = unsafe {
(*data_handle.get_pointer().byte_offset(offset).cast::<i32>()).into_lua(lua)? (*data_handle.get_inner_pointer().byte_offset(offset).cast::<i32>()).into_lua(lua)?
}; };
Ok(value) Ok(value)
} }
@ -61,8 +61,8 @@ impl FfiConvert for CTypeInfo<i32> {
dst: &Ref<dyn FfiData>, dst: &Ref<dyn FfiData>,
src: &Ref<dyn FfiData>, src: &Ref<dyn FfiData>,
) -> LuaResult<()> { ) -> LuaResult<()> {
*dst.get_pointer().byte_offset(dst_offset).cast::<i32>() = *dst.get_inner_pointer().byte_offset(dst_offset).cast::<i32>() =
*src.get_pointer().byte_offset(src_offset).cast::<i32>(); *src.get_inner_pointer().byte_offset(src_offset).cast::<i32>();
Ok(()) Ok(())
} }
unsafe fn stringify_data( unsafe fn stringify_data(
@ -71,6 +71,6 @@ impl FfiConvert for CTypeInfo<i32> {
offset: isize, offset: isize,
data_handle: &Ref<dyn FfiData>, data_handle: &Ref<dyn FfiData>,
) -> LuaResult<String> { ) -> LuaResult<String> {
Ok((*data_handle.get_pointer().byte_offset(offset).cast::<i32>()).to_string()) Ok((*data_handle.get_inner_pointer().byte_offset(offset).cast::<i32>()).to_string())
} }
} }

10
crates/lune-std-ffi/src/c/types/i64.rs
View file

@ -37,7 +37,7 @@ impl FfiConvert for CTypeInfo<i64> {
} }
}; };
unsafe { unsafe {
*(data_handle.get_pointer().byte_offset(offset).cast::<i64>()) = value; *(data_handle.get_inner_pointer().byte_offset(offset).cast::<i64>()) = value;
} }
Ok(()) Ok(())
} }
@ -49,7 +49,7 @@ impl FfiConvert for CTypeInfo<i64> {
data_handle: &Ref<dyn FfiData>, data_handle: &Ref<dyn FfiData>,
) -> LuaResult<LuaValue<'lua>> { ) -> LuaResult<LuaValue<'lua>> {
let value = unsafe { let value = unsafe {
(*data_handle.get_pointer().byte_offset(offset).cast::<i64>()).into_lua(lua)? (*data_handle.get_inner_pointer().byte_offset(offset).cast::<i64>()).into_lua(lua)?
}; };
Ok(value) Ok(value)
} }
@ -61,8 +61,8 @@ impl FfiConvert for CTypeInfo<i64> {
dst: &Ref<dyn FfiData>, dst: &Ref<dyn FfiData>,
src: &Ref<dyn FfiData>, src: &Ref<dyn FfiData>,
) -> LuaResult<()> { ) -> LuaResult<()> {
*dst.get_pointer().byte_offset(dst_offset).cast::<i64>() = *dst.get_inner_pointer().byte_offset(dst_offset).cast::<i64>() =
*src.get_pointer().byte_offset(src_offset).cast::<i64>(); *src.get_inner_pointer().byte_offset(src_offset).cast::<i64>();
Ok(()) Ok(())
} }
unsafe fn stringify_data( unsafe fn stringify_data(
@ -71,6 +71,6 @@ impl FfiConvert for CTypeInfo<i64> {
offset: isize, offset: isize,
data_handle: &Ref<dyn FfiData>, data_handle: &Ref<dyn FfiData>,
) -> LuaResult<String> { ) -> LuaResult<String> {
Ok((*data_handle.get_pointer().byte_offset(offset).cast::<i64>()).to_string()) Ok((*data_handle.get_inner_pointer().byte_offset(offset).cast::<i64>()).to_string())
} }
} }

24
crates/lune-std-ffi/src/c/types/i8.rs
View file

@ -33,7 +33,10 @@ impl FfiConvert for CTypeInfo<i8> {
} }
}; };
unsafe { unsafe {
*(data_handle.get_pointer().byte_offset(offset).cast::<i8>()) = value; *(data_handle
.get_inner_pointer()
.byte_offset(offset)
.cast::<i8>()) = value;
} }
Ok(()) Ok(())
} }
@ -44,8 +47,13 @@ impl FfiConvert for CTypeInfo<i8> {
offset: isize, offset: isize,
data_handle: &Ref<dyn FfiData>, data_handle: &Ref<dyn FfiData>,
) -> LuaResult<LuaValue<'lua>> { ) -> LuaResult<LuaValue<'lua>> {
let value = let value = unsafe {
unsafe { (*data_handle.get_pointer().byte_offset(offset).cast::<i8>()).into_lua(lua)? }; (*data_handle
.get_inner_pointer()
.byte_offset(offset)
.cast::<i8>())
.into_lua(lua)?
};
Ok(value) Ok(value)
} }
unsafe fn copy_data( unsafe fn copy_data(
@ -56,8 +64,8 @@ impl FfiConvert for CTypeInfo<i8> {
dst: &Ref<dyn FfiData>, dst: &Ref<dyn FfiData>,
src: &Ref<dyn FfiData>, src: &Ref<dyn FfiData>,
) -> LuaResult<()> { ) -> LuaResult<()> {
*dst.get_pointer().byte_offset(dst_offset).cast::<i8>() = *dst.get_inner_pointer().byte_offset(dst_offset).cast::<i8>() =
*src.get_pointer().byte_offset(src_offset).cast::<i8>(); *src.get_inner_pointer().byte_offset(src_offset).cast::<i8>();
Ok(()) Ok(())
} }
unsafe fn stringify_data( unsafe fn stringify_data(
@ -66,6 +74,10 @@ impl FfiConvert for CTypeInfo<i8> {
offset: isize, offset: isize,
data_handle: &Ref<dyn FfiData>, data_handle: &Ref<dyn FfiData>,
) -> LuaResult<String> { ) -> LuaResult<String> {
Ok((*data_handle.get_pointer().byte_offset(offset).cast::<i8>()).to_string()) Ok((*data_handle
.get_inner_pointer()
.byte_offset(offset)
.cast::<i8>())
.to_string())
} }
} }

10
crates/lune-std-ffi/src/c/types/isize.rs
View file

@ -38,7 +38,7 @@ impl FfiConvert for CTypeInfo<isize> {
}; };
unsafe { unsafe {
*(data_handle *(data_handle
.get_pointer() .get_inner_pointer()
.byte_offset(offset) .byte_offset(offset)
.cast::<isize>()) = value; .cast::<isize>()) = value;
} }
@ -53,7 +53,7 @@ impl FfiConvert for CTypeInfo<isize> {
) -> LuaResult<LuaValue<'lua>> { ) -> LuaResult<LuaValue<'lua>> {
let value = unsafe { let value = unsafe {
(*data_handle (*data_handle
.get_pointer() .get_inner_pointer()
.byte_offset(offset) .byte_offset(offset)
.cast::<isize>()) .cast::<isize>())
.into_lua(lua)? .into_lua(lua)?
@ -68,8 +68,8 @@ impl FfiConvert for CTypeInfo<isize> {
dst: &Ref<dyn FfiData>, dst: &Ref<dyn FfiData>,
src: &Ref<dyn FfiData>, src: &Ref<dyn FfiData>,
) -> LuaResult<()> { ) -> LuaResult<()> {
*dst.get_pointer().byte_offset(dst_offset).cast::<isize>() = *dst.get_inner_pointer().byte_offset(dst_offset).cast::<isize>() =
*src.get_pointer().byte_offset(src_offset).cast::<isize>(); *src.get_inner_pointer().byte_offset(src_offset).cast::<isize>();
Ok(()) Ok(())
} }
unsafe fn stringify_data( unsafe fn stringify_data(
@ -79,7 +79,7 @@ impl FfiConvert for CTypeInfo<isize> {
data_handle: &Ref<dyn FfiData>, data_handle: &Ref<dyn FfiData>,
) -> LuaResult<String> { ) -> LuaResult<String> {
Ok((*data_handle Ok((*data_handle
.get_pointer() .get_inner_pointer()
.byte_offset(offset) .byte_offset(offset)
.cast::<isize>()) .cast::<isize>())
.to_string()) .to_string())

10
crates/lune-std-ffi/src/c/types/u128.rs
View file

@ -37,7 +37,7 @@ impl FfiConvert for CTypeInfo<u128> {
} }
}; };
unsafe { unsafe {
*(data_handle.get_pointer().byte_offset(offset).cast::<u128>()) = value; *(data_handle.get_inner_pointer().byte_offset(offset).cast::<u128>()) = value;
} }
Ok(()) Ok(())
} }
@ -49,7 +49,7 @@ impl FfiConvert for CTypeInfo<u128> {
data_handle: &Ref<dyn FfiData>, data_handle: &Ref<dyn FfiData>,
) -> LuaResult<LuaValue<'lua>> { ) -> LuaResult<LuaValue<'lua>> {
let value = unsafe { let value = unsafe {
(*data_handle.get_pointer().byte_offset(offset).cast::<u128>()).into_lua(lua)? (*data_handle.get_inner_pointer().byte_offset(offset).cast::<u128>()).into_lua(lua)?
}; };
Ok(value) Ok(value)
} }
@ -61,8 +61,8 @@ impl FfiConvert for CTypeInfo<u128> {
dst: &Ref<dyn FfiData>, dst: &Ref<dyn FfiData>,
src: &Ref<dyn FfiData>, src: &Ref<dyn FfiData>,
) -> LuaResult<()> { ) -> LuaResult<()> {
*dst.get_pointer().byte_offset(dst_offset).cast::<u128>() = *dst.get_inner_pointer().byte_offset(dst_offset).cast::<u128>() =
*src.get_pointer().byte_offset(src_offset).cast::<u128>(); *src.get_inner_pointer().byte_offset(src_offset).cast::<u128>();
Ok(()) Ok(())
} }
unsafe fn stringify_data( unsafe fn stringify_data(
@ -71,6 +71,6 @@ impl FfiConvert for CTypeInfo<u128> {
offset: isize, offset: isize,
data_handle: &Ref<dyn FfiData>, data_handle: &Ref<dyn FfiData>,
) -> LuaResult<String> { ) -> LuaResult<String> {
Ok((*data_handle.get_pointer().byte_offset(offset).cast::<u128>()).to_string()) Ok((*data_handle.get_inner_pointer().byte_offset(offset).cast::<u128>()).to_string())
} }
} }

10
crates/lune-std-ffi/src/c/types/u16.rs
View file

@ -38,7 +38,7 @@ impl FfiConvert for CTypeInfo<u16> {
} }
}; };
unsafe { unsafe {
*(data_handle.get_pointer().byte_offset(offset).cast::<u16>()) = value; *(data_handle.get_inner_pointer().byte_offset(offset).cast::<u16>()) = value;
} }
Ok(()) Ok(())
} }
@ -50,7 +50,7 @@ impl FfiConvert for CTypeInfo<u16> {
data_handle: &Ref<dyn FfiData>, data_handle: &Ref<dyn FfiData>,
) -> LuaResult<LuaValue<'lua>> { ) -> LuaResult<LuaValue<'lua>> {
let value = unsafe { let value = unsafe {
(*data_handle.get_pointer().byte_offset(offset).cast::<u16>()).into_lua(lua)? (*data_handle.get_inner_pointer().byte_offset(offset).cast::<u16>()).into_lua(lua)?
}; };
Ok(value) Ok(value)
} }
@ -62,8 +62,8 @@ impl FfiConvert for CTypeInfo<u16> {
dst: &Ref<dyn FfiData>, dst: &Ref<dyn FfiData>,
src: &Ref<dyn FfiData>, src: &Ref<dyn FfiData>,
) -> LuaResult<()> { ) -> LuaResult<()> {
*dst.get_pointer().byte_offset(dst_offset).cast::<u16>() = *dst.get_inner_pointer().byte_offset(dst_offset).cast::<u16>() =
*src.get_pointer().byte_offset(src_offset).cast::<u16>(); *src.get_inner_pointer().byte_offset(src_offset).cast::<u16>();
Ok(()) Ok(())
} }
unsafe fn stringify_data( unsafe fn stringify_data(
@ -72,6 +72,6 @@ impl FfiConvert for CTypeInfo<u16> {
offset: isize, offset: isize,
data_handle: &Ref<dyn FfiData>, data_handle: &Ref<dyn FfiData>,
) -> LuaResult<String> { ) -> LuaResult<String> {
Ok((*data_handle.get_pointer().byte_offset(offset).cast::<u16>()).to_string()) Ok((*data_handle.get_inner_pointer().byte_offset(offset).cast::<u16>()).to_string())
} }
} }

10
crates/lune-std-ffi/src/c/types/u32.rs
View file

@ -37,7 +37,7 @@ impl FfiConvert for CTypeInfo<u32> {
} }
}; };
unsafe { unsafe {
*(data_handle.get_pointer().byte_offset(offset).cast::<u32>()) = value; *(data_handle.get_inner_pointer().byte_offset(offset).cast::<u32>()) = value;
} }
Ok(()) Ok(())
} }
@ -49,7 +49,7 @@ impl FfiConvert for CTypeInfo<u32> {
data_handle: &Ref<dyn FfiData>, data_handle: &Ref<dyn FfiData>,
) -> LuaResult<LuaValue<'lua>> { ) -> LuaResult<LuaValue<'lua>> {
let value = unsafe { let value = unsafe {
(*data_handle.get_pointer().byte_offset(offset).cast::<u32>()).into_lua(lua)? (*data_handle.get_inner_pointer().byte_offset(offset).cast::<u32>()).into_lua(lua)?
}; };
Ok(value) Ok(value)
} }
@ -61,8 +61,8 @@ impl FfiConvert for CTypeInfo<u32> {
dst: &Ref<dyn FfiData>, dst: &Ref<dyn FfiData>,
src: &Ref<dyn FfiData>, src: &Ref<dyn FfiData>,
) -> LuaResult<()> { ) -> LuaResult<()> {
*dst.get_pointer().byte_offset(dst_offset).cast::<u32>() = *dst.get_inner_pointer().byte_offset(dst_offset).cast::<u32>() =
*src.get_pointer().byte_offset(src_offset).cast::<u32>(); *src.get_inner_pointer().byte_offset(src_offset).cast::<u32>();
Ok(()) Ok(())
} }
unsafe fn stringify_data( unsafe fn stringify_data(
@ -71,6 +71,6 @@ impl FfiConvert for CTypeInfo<u32> {
offset: isize, offset: isize,
data_handle: &Ref<dyn FfiData>, data_handle: &Ref<dyn FfiData>,
) -> LuaResult<String> { ) -> LuaResult<String> {
Ok((*data_handle.get_pointer().byte_offset(offset).cast::<f32>()).to_string()) Ok((*data_handle.get_inner_pointer().byte_offset(offset).cast::<f32>()).to_string())
} }
} }

10
crates/lune-std-ffi/src/c/types/u64.rs
View file

@ -37,7 +37,7 @@ impl FfiConvert for CTypeInfo<u64> {
} }
}; };
unsafe { unsafe {
*(data_handle.get_pointer().byte_offset(offset).cast::<u64>()) = value; *(data_handle.get_inner_pointer().byte_offset(offset).cast::<u64>()) = value;
} }
Ok(()) Ok(())
} }
@ -49,7 +49,7 @@ impl FfiConvert for CTypeInfo<u64> {
data_handle: &Ref<dyn FfiData>, data_handle: &Ref<dyn FfiData>,
) -> LuaResult<LuaValue<'lua>> { ) -> LuaResult<LuaValue<'lua>> {
let value = unsafe { let value = unsafe {
(*data_handle.get_pointer().byte_offset(offset).cast::<u64>()).into_lua(lua)? (*data_handle.get_inner_pointer().byte_offset(offset).cast::<u64>()).into_lua(lua)?
}; };
Ok(value) Ok(value)
} }
@ -61,8 +61,8 @@ impl FfiConvert for CTypeInfo<u64> {
dst: &Ref<dyn FfiData>, dst: &Ref<dyn FfiData>,
src: &Ref<dyn FfiData>, src: &Ref<dyn FfiData>,
) -> LuaResult<()> { ) -> LuaResult<()> {
*dst.get_pointer().byte_offset(dst_offset).cast::<u64>() = *dst.get_inner_pointer().byte_offset(dst_offset).cast::<u64>() =
*src.get_pointer().byte_offset(src_offset).cast::<u64>(); *src.get_inner_pointer().byte_offset(src_offset).cast::<u64>();
Ok(()) Ok(())
} }
unsafe fn stringify_data( unsafe fn stringify_data(
@ -71,6 +71,6 @@ impl FfiConvert for CTypeInfo<u64> {
offset: isize, offset: isize,
data_handle: &Ref<dyn FfiData>, data_handle: &Ref<dyn FfiData>,
) -> LuaResult<String> { ) -> LuaResult<String> {
Ok((*data_handle.get_pointer().byte_offset(offset).cast::<u64>()).to_string()) Ok((*data_handle.get_inner_pointer().byte_offset(offset).cast::<u64>()).to_string())
} }
} }

10
crates/lune-std-ffi/src/c/types/u8.rs
View file

@ -34,7 +34,7 @@ impl FfiConvert for CTypeInfo<u8> {
} }
}; };
unsafe { unsafe {
*(data_handle.get_pointer().byte_offset(offset).cast::<u8>()) = value; *(data_handle.get_inner_pointer().byte_offset(offset).cast::<u8>()) = value;
} }
Ok(()) Ok(())
} }
@ -48,7 +48,7 @@ impl FfiConvert for CTypeInfo<u8> {
data_handle: &Ref<dyn FfiData>, data_handle: &Ref<dyn FfiData>,
) -> LuaResult<LuaValue<'lua>> { ) -> LuaResult<LuaValue<'lua>> {
let value = let value =
unsafe { (*data_handle.get_pointer().byte_offset(offset).cast::<u8>()).into_lua(lua)? }; unsafe { (*data_handle.get_inner_pointer().byte_offset(offset).cast::<u8>()).into_lua(lua)? };
Ok(value) Ok(value)
} }
unsafe fn copy_data( unsafe fn copy_data(
@ -59,8 +59,8 @@ impl FfiConvert for CTypeInfo<u8> {
dst: &Ref<dyn FfiData>, dst: &Ref<dyn FfiData>,
src: &Ref<dyn FfiData>, src: &Ref<dyn FfiData>,
) -> LuaResult<()> { ) -> LuaResult<()> {
*dst.get_pointer().byte_offset(dst_offset).cast::<u8>() = *dst.get_inner_pointer().byte_offset(dst_offset).cast::<u8>() =
*src.get_pointer().byte_offset(src_offset).cast::<u8>(); *src.get_inner_pointer().byte_offset(src_offset).cast::<u8>();
Ok(()) Ok(())
} }
unsafe fn stringify_data( unsafe fn stringify_data(
@ -69,6 +69,6 @@ impl FfiConvert for CTypeInfo<u8> {
offset: isize, offset: isize,
data_handle: &Ref<dyn FfiData>, data_handle: &Ref<dyn FfiData>,
) -> LuaResult<String> { ) -> LuaResult<String> {
Ok((*data_handle.get_pointer().byte_offset(offset).cast::<u8>()).to_string()) Ok((*data_handle.get_inner_pointer().byte_offset(offset).cast::<u8>()).to_string())
} }
} }

14
crates/lune-std-ffi/src/c/types/usize.rs
View file

@ -38,7 +38,7 @@ impl FfiConvert for CTypeInfo<usize> {
}; };
unsafe { unsafe {
*(data_handle *(data_handle
.get_pointer() .get_inner_pointer()
.byte_offset(offset) .byte_offset(offset)
.cast::<usize>()) = value; .cast::<usize>()) = value;
} }
@ -53,7 +53,7 @@ impl FfiConvert for CTypeInfo<usize> {
) -> LuaResult<LuaValue<'lua>> { ) -> LuaResult<LuaValue<'lua>> {
let value = unsafe { let value = unsafe {
(*data_handle (*data_handle
.get_pointer() .get_inner_pointer()
.byte_offset(offset) .byte_offset(offset)
.cast::<usize>()) .cast::<usize>())
.into_lua(lua)? .into_lua(lua)?
@ -68,8 +68,12 @@ impl FfiConvert for CTypeInfo<usize> {
dst: &Ref<dyn FfiData>, dst: &Ref<dyn FfiData>,
src: &Ref<dyn FfiData>, src: &Ref<dyn FfiData>,
) -> LuaResult<()> { ) -> LuaResult<()> {
*dst.get_pointer().byte_offset(dst_offset).cast::<usize>() = *dst.get_inner_pointer()
*src.get_pointer().byte_offset(src_offset).cast::<usize>(); .byte_offset(dst_offset)
.cast::<usize>() = *src
.get_inner_pointer()
.byte_offset(src_offset)
.cast::<usize>();
Ok(()) Ok(())
} }
unsafe fn stringify_data( unsafe fn stringify_data(
@ -79,7 +83,7 @@ impl FfiConvert for CTypeInfo<usize> {
data_handle: &Ref<dyn FfiData>, data_handle: &Ref<dyn FfiData>,
) -> LuaResult<String> { ) -> LuaResult<String> {
Ok((*data_handle Ok((*data_handle
.get_pointer() .get_inner_pointer()
.byte_offset(offset) .byte_offset(offset)
.cast::<usize>()) .cast::<usize>())
.to_string()) .to_string())

2
crates/lune-std-ffi/src/c/void_info.rs
View file

@ -3,6 +3,8 @@ use mlua::prelude::*;
use crate::ffi::{FfiSignedness, FfiSize}; use crate::ffi::{FfiSignedness, FfiSize};
use super::method_provider;
pub struct CVoidInfo(); pub struct CVoidInfo();
impl FfiSignedness for CVoidInfo { impl FfiSignedness for CVoidInfo {

6
crates/lune-std-ffi/src/data/box_data/mod.rs
View file

@ -74,7 +74,7 @@ impl BoxData {
) -> LuaResult<LuaAnyUserData<'lua>> { ) -> LuaResult<LuaAnyUserData<'lua>> {
let target = this.borrow::<BoxData>()?; let target = this.borrow::<BoxData>()?;
let mut bounds = RefBounds::new(0, target.size()); let mut bounds = RefBounds::new(0, target.size());
let mut ptr = unsafe { target.get_pointer() }; let mut ptr = unsafe { target.get_inner_pointer() };
// Calculate offset // Calculate offset
if let Some(t) = offset { if let Some(t) = offset {
@ -121,13 +121,13 @@ impl Drop for BoxData {
} }
impl FfiData for BoxData { impl FfiData for BoxData {
fn check_boundary(&self, offset: isize, size: usize) -> bool { fn check_inner_boundary(&self, offset: isize, size: usize) -> bool {
if offset < 0 { if offset < 0 {
return false; return false;
} }
self.size() - (offset as usize) >= size self.size() - (offset as usize) >= size
} }
unsafe fn get_pointer(&self) -> *mut () { unsafe fn get_inner_pointer(&self) -> *mut () {
self.data.as_ptr().cast_mut().cast::<()>() self.data.as_ptr().cast_mut().cast::<()>()
} }
fn is_readable(&self) -> bool { fn is_readable(&self) -> bool {

39
crates/lune-std-ffi/src/data/callable_data.rs
View file

@ -7,8 +7,8 @@ use libffi::{
}; };
use mlua::prelude::*; use mlua::prelude::*;
use super::GetFfiData; use super::{GetFfiData, RefData};
use crate::ffi::{FfiArg, FfiResult}; use crate::ffi::{FfiArg, FfiData, FfiResult};
pub struct CallableData { pub struct CallableData {
cif: *mut ffi_cif, cif: *mut ffi_cif,
@ -42,33 +42,24 @@ impl CallableData {
ptr::null_mut() ptr::null_mut()
} else { } else {
let result_data = result.get_ffi_data()?; let result_data = result.get_ffi_data()?;
if result_data.check_boundary(0, self.result_info.size) { if !result_data.check_inner_boundary(0, self.result_info.size) {
return Err(LuaError::external("Result boundary check failed")); return Err(LuaError::external("Result boundary check failed"));
} }
result_data.get_pointer() result_data.get_inner_pointer()
} }
.cast::<c_void>(); .cast::<c_void>();
for index in 0..self.arg_info_list.len() { for index in 0..self.arg_info_list.len() {
let arg_info = self.arg_info_list.get(index).unwrap(); // let arg_info = self.arg_info_list.get(index).unwrap();
let arg = args let arg_value = args
.get(index) .get(index)
.ok_or_else(|| LuaError::external(format!("argument {index} required")))?; .ok_or_else(|| LuaError::external(format!("argument {index} required")))?
.as_userdata()
.ok_or_else(|| LuaError::external("argument should be Ref"))?;
let arg_pointer = if let LuaValue::UserData(userdata) = arg { let arg_ref = arg_value.borrow::<RefData>()?;
// BoxData, RefData, ...
let data_handle = userdata.get_ffi_data()?; arg_list.push(arg_ref.get_inner_pointer().cast::<c_void>());
if !data_handle.check_boundary(0, arg_info.size) {
return Err(LuaError::external(format!(
"argument {index} boundary check failed"
)));
}
data_handle.get_pointer()
} else {
// FIXME: buffer, string here
return Err(LuaError::external("unimpl"));
};
arg_list.push(arg_pointer.cast::<c_void>());
} }
ffi_call( ffi_call(
@ -84,16 +75,14 @@ impl CallableData {
impl LuaUserData for CallableData { impl LuaUserData for CallableData {
fn add_methods<'lua, M: LuaUserDataMethods<'lua, Self>>(methods: &mut M) { fn add_methods<'lua, M: LuaUserDataMethods<'lua, Self>>(methods: &mut M) {
methods.add_method( methods.add_meta_method(
"call", LuaMetaMethod::Call,
|_lua, this: &CallableData, mut args: LuaMultiValue| { |_lua, this: &CallableData, mut args: LuaMultiValue| {
let result = args.pop_front().ok_or_else(|| { let result = args.pop_front().ok_or_else(|| {
LuaError::external("First argument must be result data handle or nil") LuaError::external("First argument must be result data handle or nil")
})?; })?;
// FIXME: clone
unsafe { this.call(result, args) } unsafe { this.call(result, args) }
}, },
); );
// ref, leak ..?
} }
} }

21
crates/lune-std-ffi/src/data/closure_data.rs
View file

@ -39,11 +39,14 @@ unsafe extern "C" fn callback(
arg_pointers: *mut *mut c_void, arg_pointers: *mut *mut c_void,
closure_data: *mut c_void, closure_data: *mut c_void,
) { ) {
dbg!("before ud");
let closure_data = closure_data.cast::<ClosureData>().as_ref().unwrap(); let closure_data = closure_data.cast::<ClosureData>().as_ref().unwrap();
let lua = closure_data.lua.as_ref().unwrap(); let lua = closure_data.lua.as_ref().unwrap();
let len = (*cif).nargs as usize; let len = (*cif).nargs as usize;
let mut args = Vec::<LuaValue>::with_capacity(len + 1); let mut args = Vec::<LuaValue>::with_capacity(len + 1);
dbg!("before result");
// Push result pointer (ref) // Push result pointer (ref)
args.push(LuaValue::UserData( args.push(LuaValue::UserData(
lua.create_userdata(RefData::new( lua.create_userdata(RefData::new(
@ -54,6 +57,8 @@ unsafe extern "C" fn callback(
.unwrap(), .unwrap(),
)); ));
dbg!("before arg");
// Push arg pointer (ref) // Push arg pointer (ref)
for i in 0..len { for i in 0..len {
let arg_info = closure_data.arg_info_list.get(i).unwrap(); let arg_info = closure_data.arg_info_list.get(i).unwrap();
@ -67,6 +72,8 @@ unsafe extern "C" fn callback(
)); ));
} }
dbg!("before call");
closure_data closure_data
.func .func
.borrow() .borrow()
@ -112,10 +119,12 @@ impl ClosureData {
} }
impl FfiData for ClosureData { impl FfiData for ClosureData {
unsafe fn get_pointer(&self) -> *mut () { unsafe fn get_inner_pointer(&self) -> *mut () {
self.code.as_mut_ptr().cast::<()>() ptr::from_ref(&self.code.as_mut_ptr())
.cast_mut()
.cast::<()>()
} }
fn check_boundary(&self, offset: isize, size: usize) -> bool { fn check_inner_boundary(&self, offset: isize, size: usize) -> bool {
(offset as usize) + size <= SIZE_OF_POINTER (offset as usize) + size <= SIZE_OF_POINTER
} }
fn is_readable(&self) -> bool { fn is_readable(&self) -> bool {
@ -126,4 +135,8 @@ impl FfiData for ClosureData {
} }
} }
impl LuaUserData for ClosureData {} impl LuaUserData for ClosureData {
fn add_methods<'lua, M: LuaUserDataMethods<'lua, Self>>(methods: &mut M) {
// methods.add_function("ref", function);
}
}

25
crates/lune-std-ffi/src/data/ref_data/mod.rs
View file

@ -61,7 +61,7 @@ impl RefData {
let target = this.borrow::<RefData>()?; let target = this.borrow::<RefData>()?;
let luaref = lua.create_userdata(RefData::new( let luaref = lua.create_userdata(RefData::new(
ptr::from_ref(&target.ptr) as *mut (), ptr::from_ref(&**target.ptr) as *mut (),
BOX_REF_REF_FLAGS, BOX_REF_REF_FLAGS,
RefBounds { RefBounds {
below: 0, below: 0,
@ -76,18 +76,15 @@ impl RefData {
} }
pub unsafe fn deref(&self) -> LuaResult<Self> { pub unsafe fn deref(&self) -> LuaResult<Self> {
u8_test(self.flags, RefFlag::Dereferenceable.value()) if !u8_test(self.flags, RefFlag::Dereferenceable.value()) {
.then_some(()) return Err(LuaError::external("This pointer is not dereferenceable."));
.ok_or_else(|| LuaError::external("This pointer is not dereferenceable."))?; }
self.boundary if !self.boundary.check_sized(0, size_of::<usize>()) {
.check_sized(0, size_of::<usize>()) return Err(LuaError::external(
.then_some(()) "Offset is out of bounds. Dereferencing pointer requires size of usize",
.ok_or_else(|| { ));
LuaError::external( }
"Offset is out of bounds. Dereferencing pointer requires size of usize",
)
})?;
// FIXME flags // FIXME flags
Ok(Self::new( Ok(Self::new(
@ -139,10 +136,10 @@ impl Drop for RefData {
} }
impl FfiData for RefData { impl FfiData for RefData {
fn check_boundary(&self, offset: isize, size: usize) -> bool { fn check_inner_boundary(&self, offset: isize, size: usize) -> bool {
self.boundary.check_sized(offset, size) self.boundary.check_sized(offset, size)
} }
unsafe fn get_pointer(&self) -> *mut () { unsafe fn get_inner_pointer(&self) -> *mut () {
**self.ptr **self.ptr
} }
fn is_readable(&self) -> bool { fn is_readable(&self) -> bool {

4
crates/lune-std-ffi/src/ffi/cast.rs
View file

@ -11,8 +11,8 @@ where
From: AsPrimitive<Into>, From: AsPrimitive<Into>,
Into: 'static + Copy, Into: 'static + Copy,
{ {
let from_ptr = unsafe { from.get_pointer().cast::<From>() }; let from_ptr = unsafe { from.get_inner_pointer().cast::<From>() };
let into_ptr = unsafe { into.get_pointer().cast::<Into>() }; let into_ptr = unsafe { into.get_inner_pointer().cast::<Into>() };
unsafe { unsafe {
*into_ptr = (*from_ptr).as_(); *into_ptr = (*from_ptr).as_();

4
crates/lune-std-ffi/src/ffi/mod.rs
View file

@ -58,8 +58,8 @@ pub trait FfiConvert {
} }
pub trait FfiData { pub trait FfiData {
fn check_boundary(&self, offset: isize, size: usize) -> bool; fn check_inner_boundary(&self, offset: isize, size: usize) -> bool;
unsafe fn get_pointer(&self) -> *mut (); unsafe fn get_inner_pointer(&self) -> *mut ();
fn is_writable(&self) -> bool; fn is_writable(&self) -> bool;
fn is_readable(&self) -> bool; fn is_readable(&self) -> bool;
} }

17
crates/lune-std-ffi/src/lib.rs
View file

@ -1,7 +1,5 @@
#![allow(clippy::cargo_common_metadata)] #![allow(clippy::cargo_common_metadata)]
use c::CVoidInfo;
use data::RefData;
use lune_utils::TableBuilder; use lune_utils::TableBuilder;
use mlua::prelude::*; use mlua::prelude::*;
@ -10,8 +8,8 @@ mod data;
mod ffi; mod ffi;
use crate::{ use crate::{
c::{export_ctypes, CFnInfo, CStructInfo}, c::export as c_export,
data::{create_nullptr, BoxData, LibData}, data::{create_nullptr, BoxData, LibData, RefData},
}; };
/** /**
@ -23,22 +21,15 @@ use crate::{
*/ */
pub fn module(lua: &Lua) -> LuaResult<LuaTable> { pub fn module(lua: &Lua) -> LuaResult<LuaTable> {
let result = TableBuilder::new(lua)? let result = TableBuilder::new(lua)?
.with_values(export_ctypes(lua)?)?
.with_value("void", CVoidInfo::new())?
.with_function("nullRef", |lua, ()| create_nullptr(lua))? .with_function("nullRef", |lua, ()| create_nullptr(lua))?
.with_function("box", |_lua, size: usize| Ok(BoxData::new(size)))? .with_function("box", |_lua, size: usize| Ok(BoxData::new(size)))?
.with_function("open", |_lua, name: String| LibData::new(name))? .with_function("open", |_lua, name: String| LibData::new(name))?
.with_function("structInfo", |lua, types: LuaTable| {
CStructInfo::from_table(lua, types)
})?
.with_function("uninitRef", |_lua, ()| Ok(RefData::new_uninit()))? .with_function("uninitRef", |_lua, ()| Ok(RefData::new_uninit()))?
.with_function("isInteger", |_lua, num: LuaValue| Ok(num.is_integer()))? .with_function("isInteger", |_lua, num: LuaValue| Ok(num.is_integer()))?
.with_function("fnInfo", |lua, (args, ret): (LuaTable, LuaAnyUserData)| { .with_value("c", c_export(lua)?)?;
CFnInfo::from_table(lua, args, ret)
})?;
#[cfg(debug_assertions)] #[cfg(debug_assertions)]
let result = result.with_function("debug_associate", |lua, str: String| { let result = result.with_function("debugAssociation", |lua, str: String| {
println!("WARNING: ffi.debug_associate is GC debug function, which only works for debug build. Do not use this function in production level codes."); println!("WARNING: ffi.debug_associate is GC debug function, which only works for debug build. Do not use this function in production level codes.");
ffi::association::get_table(lua, str.as_ref()) ffi::association::get_table(lua, str.as_ref())
})?; })?;

24
tests/ffi/external_closure/init.luau Normal file
View file

@ -0,0 +1,24 @@
local ffi = require("@lune/ffi")
local testdir = "./tests/ffi/external_closure"
local compile = require("../utility/compile")
compile(`{testdir}/lib.c`, `{testdir}/lib.so`)
local lib = ffi.open(`{testdir}/lib.so`)
local function test_closure()
local callback_info = ffi.c.fn({ ffi.c.int, ffi.c.int }, ffi.c.int)
local callback_closure = callback_info:closure(function(ret, a, b)
ffi.c.int:writeData(ret, ffi.c.int:readData(a) + ffi.c.int:readData(b))
end)
local closure_test_info = ffi.c.fn({ callback_info }, ffi.c.int)
local closure_test_callable = closure_test_info:callable(lib:find("closure_test"))
local result_box = ffi.box(ffi.c.int.size)
closure_test_callable(result_box, callback_closure:ref())
end
test_closure()

14
tests/ffi/external_closure/lib.c Normal file
View file

@ -0,0 +1,14 @@
#include<stdio.h>
typedef int (*lua_callback_t)(int a, int b);
int closure_test(lua_callback_t callback) {
printf("%p\n", callback);
printf("%d\n", (*callback)(12, 24));
return (*callback)(12, 24) * 2;
}
int closure(int a, int b) {
return a+b;
}

29
tests/ffi/external_math/init.luau
View file

@ -1,23 +1,22 @@
local ffi = require("@lune/ffi") local ffi = require("@lune/ffi")
local c = ffi.c
local testdir = "./tests/ffi/external_math" local testdir = "./tests/ffi/external_math"
local compile = require("../utility/compile") local compile = require("../utility/compile")
compile(`{testdir}/lib.c`, `{testdir}/lib.so`) compile(`{testdir}/lib.c`, `{testdir}/lib.so`)
local lib = ffi.open(`{testdir}/lib.so`) local lib = ffi.open(`{testdir}/lib.so`)
local function test_add_int() local function test_add_int()
local add_int = ffi.fnInfo({ ffi.int, ffi.int }, ffi.int) local add_int_info = c.fn({ c.int, c.int }, c.int)
local add_int_caller = add_int:callable(lib:find("add_int")) local add_int_callable = add_int_info:callable(lib:find("add_int"))
local resultBox = ffi.box(ffi.int.size) local result_box = ffi.box(c.int.size)
local arg1 = ffi.int:box(100) local arg1 = c.int:box(100)
local arg2 = ffi.int:box(200) local arg2 = c.int:box(200)
add_int_caller:call(resultBox, arg1, arg2) add_int_callable(result_box, arg1:ref(), arg2:ref())
local result = ffi.int:readData(resultBox) local result = c.int:readData(result_box)
assert(result == 300, `add_int failed. result expected 300, got {result}`) assert(result == 300, `add_int failed. result expected 300, got {result}`)
end end
@ -25,16 +24,16 @@ end
test_add_int() test_add_int()
local function test_mul_int() local function test_mul_int()
local mul_int = ffi.fnInfo({ ffi.int, ffi.int }, ffi.int) local mul_int = c.fn({ c.int, c.int }, c.int)
local mul_int_caller = mul_int:callable(lib:find("mul_int")) local mul_int_caller = mul_int:callable(lib:find("mul_int"))
local resultBox = ffi.box(ffi.int.size) local resultBox = ffi.box(c.int.size)
local arg1 = ffi.int:box(100) local arg1 = c.int:box(100)
local arg2 = ffi.int:box(200) local arg2 = c.int:box(200)
mul_int_caller:call(resultBox, arg1, arg2) mul_int_caller(resultBox, arg1:ref(), arg2:ref())
local result = ffi.int:readData(resultBox) local result = c.int:readData(resultBox)
assert(result == 20000, `mul_int failed. result expected 20000, got {result}`) assert(result == 20000, `mul_int failed. result expected 20000, got {result}`)
end end

23
tests/ffi/external_pointer/init.luau Normal file
View file

@ -0,0 +1,23 @@
local ffi = require("@lune/ffi")
local c = ffi.c
local testdir = "./tests/ffi/external_pointer"
local compile = require("../utility/compile")
compile(`{testdir}/lib.c`, `{testdir}/lib.so`)
local lib = ffi.open(`{testdir}/lib.so`)
local function test_pointer()
local pointer_info = c.fn({ c.int:ptr() }, c.void)
local pointer_callable = pointer_info:callable(lib:find("pointer"))
local a = ffi.box(c.int.size)
pointer_callable(nil, a:ref():ref())
local result = c.int:readData(a)
assert(result == 123, `pointer failed. result expected 123, got {result}`)
end
test_pointer()

3
tests/ffi/external_pointer/lib.c Normal file
View file

@ -0,0 +1,3 @@
void pointer(int *a) {
*a = 123;
}

6
tests/ffi/external_print/init.luau
View file

@ -8,11 +8,11 @@ compile(`{testdir}/lib.c`, `{testdir}/lib.so`)
local lib = ffi.open(`{testdir}/lib.so`) local lib = ffi.open(`{testdir}/lib.so`)
local function test_hello_world() local function test_hello_world()
local add_int = ffi.fnInfo({}, ffi.void) local hello_world_info = ffi.fnInfo({}, ffi.void)
local hello_world_caller = add_int:callable(lib:find("hello_world")) local hello_world_callable = hello_world_info:callable(lib:find("hello_world"))
hello_world_caller:call(nil) hello_world_callable:call(nil)
end end
test_hello_world() test_hello_world()

107
types/ffi.luau
View file

@ -4,8 +4,8 @@ export type CTypeInfo<T, R> = {
signedness: boolean, signedness: boolean,
-- subtype -- subtype
ptrInfo: (self: CTypeInfo<T, R>) -> CPtrInfo<CTypeInfo<T, R>>, ptr: (self: CTypeInfo<T, R>) -> CPtrInfo<CTypeInfo<T, R>>,
arrInfo: (self: CTypeInfo<T, R>, len: number) -> CArrInfo<CTypeInfo<T, R>, R>, arr: (self: CTypeInfo<T, R>, len: number) -> CArrInfo<CTypeInfo<T, R>, R>,
-- realize -- realize
box: (self: CTypeInfo<T, R>, val: R) -> Box, box: (self: CTypeInfo<T, R>, val: R) -> Box,
@ -23,8 +23,8 @@ export type CPtrInfo<T> = {
-- subtype -- subtype
-- FIXME: recursive types; 'any' should be CPtrInfo -- FIXME: recursive types; 'any' should be CPtrInfo
arrInfo: (self: CPtrInfo<T>, len: number) -> any, arr: (self: CPtrInfo<T>, len: number) -> any,
ptrInfo: (self: CPtrInfo<T>) -> any, ptr: (self: CPtrInfo<T>) -> any,
readRef: (self: CPtrInfo<T>, target: (Ref|Box), offset: number?) -> Ref, readRef: (self: CPtrInfo<T>, target: (Ref|Box), offset: number?) -> Ref,
writeRef: (self: CPtrInfo<T>, target: (Ref|Box), value: (Ref|Box), offset: number?) -> (), writeRef: (self: CPtrInfo<T>, target: (Ref|Box), value: (Ref|Box), offset: number?) -> (),
@ -36,7 +36,7 @@ export type CArrInfo<T, R> = {
inner: T, inner: T,
-- subtype -- subtype
ptrInfo: (self: CArrInfo<T, R>) -> CPtrInfo<T>, ptr: (self: CArrInfo<T, R>) -> CPtrInfo<T>,
-- realize -- realize
box: (self: CArrInfo<T, R>, table: { T }) -> Box, box: (self: CArrInfo<T, R>, table: { T }) -> Box,
@ -49,12 +49,12 @@ export type CArrInfo<T, R> = {
export type CFnInfo = { export type CFnInfo = {
callable: (self: CFnInfo, functionRef: Ref) -> Callable, callable: (self: CFnInfo, functionRef: Ref) -> Callable,
closure: (self: CFnInfo, (...Ref)->()) -> (), closure: (self: CFnInfo, (ret: Ref, ...Ref)->()) -> Closure,
} }
export type CStructInfo = { export type CStructInfo = {
arrInfo: (self: CStructInfo, len: number) -> CArrInfo<CStructInfo, {any}>, arr: (self: CStructInfo, len: number) -> CArrInfo<CStructInfo, {any}>,
ptrInfo: (self: CStructInfo) -> CPtrInfo<CStructInfo>, ptr: (self: CStructInfo) -> CPtrInfo<CStructInfo>,
box: (self: CStructInfo, table: { any }) -> Box, box: (self: CStructInfo, table: { any }) -> Box,
readData: (self: CStructInfo, target: (Ref|Box), offset: number?) -> { any }, readData: (self: CStructInfo, target: (Ref|Box), offset: number?) -> { any },
@ -62,7 +62,7 @@ export type CStructInfo = {
} }
export type CVoidInfo = { export type CVoidInfo = {
ptrInfo: (self: CVoidInfo) -> CPtrInfo<CVoidInfo>, ptr: (self: CVoidInfo) -> CPtrInfo<CVoidInfo>,
} }
type NumCType<T> = CTypeInfo<T, (number|any)> type NumCType<T> = CTypeInfo<T, (number|any)>
@ -151,42 +151,60 @@ export type Lib = {
find: (self: Lib, sym: string) -> Ref, find: (self: Lib, sym: string) -> Ref,
} }
export type Callable = { -- export type AppliedCallable = ()->()
call: (self: Callable, result: (Ref | Box)?, ...(Ref | Box))->();
export type Callable = (ret: (Ref|Box)?, ...Ref)->() & {
-- apply: (self: Callable, args: Args)->AppliedCallable,
} }
export type Closure = {
ref: (self: Closure)->Ref,
}
local c = {}
c.u8 = {} :: u8
c.u16 = {} :: u16
c.u32 = {} :: u32
c.u64 = {} :: u64
c.u128 = {} :: u128
c.i8 = {} :: i8
c.i16 = {} :: i16
c.i32 = {} :: i32
c.i64 = {} :: i64
c.i128 = {} :: i128
c.f32 = {} :: f32
c.f64 = {} :: f64
c.usize = {} :: usize
c.isize = {} :: isize
c.char = {} :: char
c.float = {} :: float
c.double = {} :: double
c.uchar = {} :: uchar
c.schar = {} :: schar
c.short = {} :: short
c.ushort = {} :: ushort
c.int = {} :: int
c.uint = {} :: uint
c.long = {} :: long
c.ulong = {} :: ulong
c.longlong = {} :: longlong
c.ulonglong = {} :: ulonglong
c.void = {} :: CVoidInfo
function c.fn(args: { CTypes }, ret: CTypes): CFnInfo
return nil :: any
end
function c.struct(inner: { CTypes }): CStructInfo
return nil :: any
end
local ffi = {} local ffi = {}
ffi.u8 = {} :: u8 ffi.c = c
ffi.u16 = {} :: u16
ffi.u32 = {} :: u32
ffi.u64 = {} :: u64
ffi.u128 = {} :: u128
ffi.i8 = {} :: i8
ffi.i16 = {} :: i16
ffi.i32 = {} :: i32
ffi.i64 = {} :: i64
ffi.i128 = {} :: i128
ffi.f32 = {} :: f32
ffi.f64 = {} :: f64
ffi.usize = {} :: usize
ffi.isize = {} :: isize
ffi.char = {} :: char
ffi.float = {} :: float
ffi.double = {} :: double
ffi.uchar = {} :: uchar
ffi.schar = {} :: schar
ffi.short = {} :: short
ffi.ushort = {} :: ushort
ffi.int = {} :: int
ffi.uint = {} :: uint
ffi.long = {} :: long
ffi.ulong = {} :: ulong
ffi.longlong = {} :: longlong
ffi.ulonglong = {} :: ulonglong
ffi.void = {} :: CVoidInfo
function ffi.nullRef(): Ref function ffi.nullRef(): Ref
return nil :: any return nil :: any
@ -208,12 +226,5 @@ function ffi.isInteger<T>(val: T): boolean
return nil :: any return nil :: any
end end
function ffi.fnInfo(args: { CTypes }, ret: CTypes): CFnInfo
return nil :: any
end
function ffi.structInfo(inner: { CTypes }): CStructInfo
return nil :: any
end
return ffi return ffi