Noratrieb/libuwuc
1
0
Fork 0
mirror of https://github.com/Noratrieb/libuwuc.git synced 2026-01-14 19:55:07 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix malloc mmap

Browse source
This commit is contained in:
nora 2023-10-01 16:18:25 +02:00
parent bbe7f04877
commit 609c5e6e3d
1 changed files with 13 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

17
libuwuc/src/alloc.rs
View file

@ -21,18 +21,22 @@ fn init() {
match state { match state {
Ok(_) => unsafe { Ok(_) => unsafe {
const HEAP_SIZE: usize = 0x100000; const HEAP_SIZE: usize = 0x100000;
let map_private = 0x0002;
let map_anon = 0x20; let map_anon = 0x20;
let prot_read = 1; let prot_read = 1;
let prod_write = 2; let prod_write = 2;
let start = mmap( let start = mmap_sys(
core::ptr::null(), core::ptr::null(),
HEAP_SIZE, HEAP_SIZE,
prot_read | prod_write, prot_read | prod_write,
map_anon, map_anon | map_private,
0, 0,
0, 0,
); );
if (start as isize) < 0 {
todo!("mmap failed");
}
ALLOCATOR.lock().init(start, HEAP_SIZE); ALLOCATOR.lock().init(start, HEAP_SIZE);
INIT_STATE.store(INIT, Ordering::Release); INIT_STATE.store(INIT, Ordering::Release);
@ -80,7 +84,8 @@ pub unsafe fn free(ptr: *mut u8) {
ALLOCATOR.dealloc(start, layout); ALLOCATOR.dealloc(start, layout);
} }
pub unsafe fn mmap( #[cfg_attr(miri, allow(unused_variables, unreachable_code))]
pub unsafe fn mmap_sys(
addr: *const u8, addr: *const u8,
size: usize, size: usize,
prot: c_int, prot: c_int,
@ -107,7 +112,11 @@ pub unsafe fn mmap(
#[cfg(test)] #[cfg(test)]
mod tests { mod tests {
#[test] #[test]
#[ignore = "uh"] fn init() {
super::init();
}
#[test]
fn malloc_free() { fn malloc_free() {
unsafe { unsafe {
let x = super::malloc_zeroed(10, 8); let x = super::malloc_zeroed(10, 8);