drew/acadia
1
0
Fork 0
Code Issues 6 Pull requests Projects Releases Packages Wiki Activity Actions

Reorganize mammoth lib in rust.

Browse source
This commit is contained in:
Drew Galbraith 2024-07-28 19:26:23 -07:00
parent d5a5041c4b
commit d35e8d253f
12 changed files with 223 additions and 214 deletions
Download patch file Download diff file Expand all files Collapse all files

11
rust/lib/mammoth/src/mem.rs
View file

@ -1,5 +1,6 @@
use crate::init::SELF_VMAS_CAP;
use crate::syscall;
use crate::SELF_VMAS_CAP;
use crate::zion;
use linked_list_allocator::LockedHeap;
#[global_allocator]
@ -11,16 +12,16 @@ pub fn init_heap() {
// 1 MiB
let size = 0x10_0000;
let mut vmmo_cap = 0;
let obj_req = syscall::ZMemoryObjectCreateReq {
let obj_req = zion::ZMemoryObjectCreateReq {
size,
vmmo_cap: &mut vmmo_cap as *mut u64,
};
syscall::syscall(syscall::kZionMemoryObjectCreate, &obj_req)
syscall::syscall(zion::kZionMemoryObjectCreate, &obj_req)
.expect("Failed to create memory object");
unsafe {
let mut vaddr: u64 = 0;
let vmas_req = syscall::ZAddressSpaceMapReq {
let vmas_req = zion::ZAddressSpaceMapReq {
vmmo_cap,
vmas_cap: SELF_VMAS_CAP,
align: 0x2000,
@ -28,7 +29,7 @@ pub fn init_heap() {
vmas_offset: 0,
};
syscall::syscall(syscall::kZionAddressSpaceMap, &vmas_req)
syscall::syscall(zion::kZionAddressSpaceMap, &vmas_req)
.expect("Failed to map memory object");
ALLOCATOR.lock().init(vaddr as *mut u8, size as usize);
CAN_ALLOC = true;