user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add support for building std::os::uefi docs

Browse source 
Signed-off-by: Ayush Singh <ayushsingh1325@gmail.com>
This commit is contained in:
Ayush Singh 2023-03-27 19:53:53 +05:30 • committed by Ayush Singh
parent 032e3766d5
commit 5df24d18b6
No known key found for this signature in database
GPG key ID: 05CEF5C789E55A74
7 changed files with 38 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,7 +1,7 @@
//! Global Allocator for UEFI.
//! Uses [r-efi-alloc](https://crates.io/crates/r-efi-alloc)
use crate::alloc::{handle_alloc_error, GlobalAlloc, Layout, System};
use crate::alloc::{GlobalAlloc, Layout, System};
const MEMORY_TYPE: u32 = r_efi::efi::LOADER_DATA;
@ -13,11 +13,8 @@ unsafe impl GlobalAlloc for System {
return crate::ptr::null_mut();
}
let system_table = match crate::os::uefi::env::try_system_table() {
None => return crate::ptr::null_mut(),
Some(x) => x.as_ptr() as *mut _,
};
// If boot services is valid then SystemTable is not null.
let system_table = crate::os::uefi::env::system_table().as_ptr().cast();
// The caller must ensure non-0 layout
unsafe { r_efi_alloc::raw::alloc(system_table, layout, MEMORY_TYPE) }
}
@ -28,10 +25,8 @@ unsafe impl GlobalAlloc for System {
return;
}
let system_table = match crate::os::uefi::env::try_system_table() {
None => handle_alloc_error(layout),
Some(x) => x.as_ptr() as *mut _,
};
// If boot services is valid then SystemTable is not null.
let system_table = crate::os::uefi::env::system_table().as_ptr().cast();
// The caller must ensure non-0 layout
unsafe { r_efi_alloc::raw::dealloc(system_table, ptr, layout) }
}

11
library/std/src/sys/uefi/helpers.rs
View file

@ -46,7 +46,7 @@ pub(crate) fn locate_handles(mut guid: Guid) -> io::Result<Vec<NonNull<crate::ff
if r.is_error() { Err(status_to_io_error(r)) } else { Ok(()) }
}
let boot_services = boot_services().ok_or(BOOT_SERVICES_UNAVAILABLE)?;
let boot_services = boot_services().ok_or(BOOT_SERVICES_UNAVAILABLE)?.cast();
let mut buf_len = 0usize;
// This should always fail since the size of buffer is 0. This call should update the buf_len
@ -82,7 +82,8 @@ pub(crate) fn open_protocol<T>(
handle: NonNull<crate::ffi::c_void>,
mut protocol_guid: Guid,
) -> io::Result<NonNull<T>> {
let boot_services = boot_services().ok_or(BOOT_SERVICES_UNAVAILABLE)?;
let boot_services: NonNull<efi::BootServices> =
boot_services().ok_or(BOOT_SERVICES_UNAVAILABLE)?.cast();
let system_handle = uefi::env::image_handle();
let mut protocol: MaybeUninit<*mut T> = MaybeUninit::uninit();
@ -279,7 +280,8 @@ pub(crate) fn create_event(
handler: Option<efi::EventNotify>,
context: *mut crate::ffi::c_void,
) -> io::Result<NonNull<crate::ffi::c_void>> {
let boot_services = boot_services().ok_or(BOOT_SERVICES_UNAVAILABLE)?;
let boot_services: NonNull<efi::BootServices> =
boot_services().ok_or(BOOT_SERVICES_UNAVAILABLE)?.cast();
let mut exit_boot_service_event: r_efi::efi::Event = crate::ptr::null_mut();
let r = unsafe {
let create_event = (*boot_services.as_ptr()).create_event;
@ -294,7 +296,8 @@ pub(crate) fn create_event(
}
pub(crate) fn close_event(evt: NonNull<crate::ffi::c_void>) -> io::Result<()> {
let boot_services = boot_services().ok_or(BOOT_SERVICES_UNAVAILABLE)?;
let boot_services: NonNull<efi::BootServices> =
boot_services().ok_or(BOOT_SERVICES_UNAVAILABLE)?.cast();
let r = unsafe {
let close_event = (*boot_services.as_ptr()).close_event;
(close_event)(evt.as_ptr())

1
library/std/src/sys/uefi/mod.rs
View file

@ -129,6 +129,7 @@ pub fn abort_internal() -> ! {
if let (Some(boot_services), Some(handle)) =
(uefi::env::boot_services(), uefi::env::try_image_handle())
{
let boot_services: NonNull<r_efi::efi::BootServices> = boot_services.cast();
let _ = unsafe {
((*boot_services.as_ptr()).exit)(
handle.as_ptr(),