language-servers/slint
1
0
Fork 0
mirror of https://github.com/slint-ui/slint.git synced 2025-08-30 23:27:22 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

C++ Don't use aligned_malloc because we can't rely on that in esp-idf

Browse source 
Instead, try to do the alignment manually for over-aligned allocations
This commit is contained in:
Olivier Goffart 2023-07-19 16:32:27 +02:00
parent ef8ddaaa1d
commit 422c39d321
1 changed files with 20 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

25
api/cpp/lib.rs
View file

@ -143,17 +143,32 @@ mod allocator {
use core::ffi::c_void;
extern "C" {
pub fn free(p: *mut c_void);
// This function is part of C11 & C++17
pub fn aligned_alloc(alignment: usize, size: usize) -> *mut c_void;
pub fn malloc(size: usize) -> *mut c_void;
}
struct CAlloc;
unsafe impl core::alloc::GlobalAlloc for CAlloc {
unsafe fn alloc(&self, layout: Layout) -> *mut u8 {
aligned_alloc(layout.align(), layout.size()) as *mut u8
let align = layout.align();
if align <= core::mem::size_of::<usize>() {
malloc(layout.size()) as *mut u8
} else {
// Ideally we'd use alligned_alloc, but that function caused heap corruption with esp-idf
let ptr = malloc(layout.size() + align) as *mut u8;
let shift = align - (ptr as usize % align);
let ptr = ptr.add(shift);
core::ptr::write(ptr.sub(1), shift as u8);
ptr
}
}
unsafe fn dealloc(&self, ptr: *mut u8, _layout: Layout) {
free(ptr as *mut c_void);
unsafe fn dealloc(&self, ptr: *mut u8, layout: Layout) {
let align = layout.align();
if align <= core::mem::size_of::<usize>() {
free(ptr as *mut c_void);
} else {
let shift = core::ptr::read(ptr.sub(1)) as usize;
free(ptr.sub(shift) as *mut c_void);
}
}
}