mathieu/os-rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use ImageDataType for allocation type

Browse source 
Signed-off-by: Ayush Singh <ayushdevel1325@gmail.com>
This commit is contained in:
Ayush Singh 2023-10-25 22:38:39 +05:30
parent b66fe58f68
commit 441068b613
No known key found for this signature in database
GPG key ID: 05CEF5C789E55A74
1 changed files with 19 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
library/std/src/sys/uefi/alloc.rs
View file

@ -1,13 +1,17 @@
//! Global Allocator for UEFI.
//! Uses [r-efi-alloc](https://crates.io/crates/r-efi-alloc)
use crate::alloc::{GlobalAlloc, Layout, System};
use r_efi::protocols::loaded_image;
const MEMORY_TYPE: u32 = r_efi::efi::LOADER_DATA;
use crate::alloc::{GlobalAlloc, Layout, System};
use crate::sync::OnceLock;
use crate::sys::uefi::helpers;
#[stable(feature = "alloc_system_type", since = "1.28.0")]
unsafe impl GlobalAlloc for System {
unsafe fn alloc(&self, layout: Layout) -> *mut u8 {
static EFI_MEMORY_TYPE: OnceLock<u32> = OnceLock::new();
// Return null pointer if boot services are not available
if crate::os::uefi::env::boot_services().is_none() {
return crate::ptr::null_mut();
@ -15,8 +19,20 @@ unsafe impl GlobalAlloc for System {
// If boot services is valid then SystemTable is not null.
let system_table = crate::os::uefi::env::system_table().as_ptr().cast();
// Each loaded image has an image handle that supports `EFI_LOADED_IMAGE_PROTOCOL`. Thus, this
// will never fail.
let mem_type = EFI_MEMORY_TYPE.get_or_init(|| {
let protocol = helpers::image_handle_protocol::<loaded_image::Protocol>(
loaded_image::PROTOCOL_GUID,
)
.unwrap();
// Gives allocations the memory type that the data sections were loaded as.
unsafe { (*protocol.as_ptr()).image_data_type }
});
// The caller must ensure non-0 layout
unsafe { r_efi_alloc::raw::alloc(system_table, layout, MEMORY_TYPE) }
unsafe { r_efi_alloc::raw::alloc(system_table, layout, *mem_type) }
}
unsafe fn dealloc(&self, ptr: *mut u8, layout: Layout) {