Change ABI from pair of u32s to single u64
This commit is contained in:
parent
7edcf7c423
commit
5b40734f80
5 changed files with 152 additions and 151 deletions
|
@ -1,50 +1,55 @@
|
|||
pub use bincode;
|
||||
pub use serde;
|
||||
|
||||
#[repr(C)]
|
||||
// TODO: move the implementation to one place?
|
||||
pub struct __Buffer {
|
||||
pub ptr: *const u8,
|
||||
pub len: usize,
|
||||
pub ptr: u32, // *const u8,
|
||||
pub len: u32, // usize,
|
||||
}
|
||||
|
||||
impl __Buffer {
|
||||
pub fn into_u64(self) -> u64 {
|
||||
((self.ptr as u64) << 32) | (self.len as u64)
|
||||
}
|
||||
|
||||
pub fn from_u64(packed: u64) -> Self {
|
||||
__Buffer {
|
||||
ptr: (packed >> 32) as u32,
|
||||
len: packed as u32,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// Allocates a buffer with an exact size.
|
||||
/// We don't return the size because it has to be passed in anyway.
|
||||
#[no_mangle]
|
||||
pub extern "C" fn __alloc_buffer(len: usize) -> *const u8 {
|
||||
let vec = vec![0; len];
|
||||
pub extern "C" fn __alloc_buffer(len: u32) -> u32 {
|
||||
let vec = vec![0; len as usize];
|
||||
let buffer = unsafe { __Buffer::from_vec(vec) };
|
||||
return buffer.ptr;
|
||||
}
|
||||
|
||||
// /// Frees a given buffer, requires the size.
|
||||
// #[no_mangle]
|
||||
// pub extern "C" fn __free_buffer(ptr: *const u8, len: usize) {
|
||||
// let buffer = Buffer { ptr, len };
|
||||
// let vec = unsafe { buffer.to_vec() };
|
||||
// std::mem::drop(vec);
|
||||
// }
|
||||
/// Frees a given buffer, requires the size.
|
||||
#[no_mangle]
|
||||
pub extern "C" fn __free_buffer(buffer: u64) {
|
||||
let vec = unsafe { __Buffer::from_u64(buffer).to_vec() };
|
||||
std::mem::drop(vec);
|
||||
}
|
||||
|
||||
impl __Buffer {
|
||||
#[inline(always)]
|
||||
pub unsafe fn to_vec(&self) -> Vec<u8> {
|
||||
core::slice::from_raw_parts(self.ptr, self.len).to_vec()
|
||||
core::slice::from_raw_parts(self.ptr as *const u8, self.len as usize).to_vec()
|
||||
}
|
||||
|
||||
#[inline(always)]
|
||||
pub unsafe fn from_vec(mut vec: Vec<u8>) -> __Buffer {
|
||||
vec.shrink_to(0);
|
||||
let ptr = vec.as_ptr();
|
||||
let len = vec.len();
|
||||
let ptr = vec.as_ptr() as u32;
|
||||
let len = vec.len() as u32;
|
||||
std::mem::forget(vec);
|
||||
__Buffer { ptr, len }
|
||||
}
|
||||
|
||||
#[inline(always)]
|
||||
pub fn leak_to_heap(self) -> *const __Buffer {
|
||||
let boxed = Box::new(self);
|
||||
let ptr = Box::<__Buffer>::into_raw(boxed) as *const __Buffer;
|
||||
return ptr;
|
||||
}
|
||||
}
|
||||
|
||||
pub mod prelude {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue