Add support for efiapi abi

Author: OpenByteDev

Cargo.toml

@@ -41,5 +41,6 @@ unexpected_cfgs = { level = "warn", check-cfg = [
 	'cfg(has_abi_vectorcall)',
 	'cfg(has_abi_win64)',
 	'cfg(has_abi_sysv64)',
-	'cfg(has_abi_aapcs)'
+	'cfg(has_abi_aapcs)',
+	'cfg(has_abi_efiapi)'
 ]}

build.rs

@@ -34,4 +34,11 @@ fn main() {
     if t.arch == Arch::Arm {
         cargo_emit::rustc_cfg!("has_abi_aapcs");
     }
+
+    if matches!(
+        t.arch,
+        Arch::X86 | Arch::X86_64 | Arch::Arm | Arch::AArch64 | Arch::Riscv32 | Arch::Riscv64
+    ) {
+        cargo_emit::rustc_cfg!("has_abi_efiapi");
+    }
 }

out.txt

@@ -63,6 +63,9 @@ define_abi_marker!(SysV64Unwind, "sysv64-unwind");
 define_abi_marker!(Win64, "win64");
 define_abi_marker!(Win64Unwind, "win64-unwind");
 
+// Other
+define_abi_marker!(EfiApi, "efiapi");
+
 /// Macro to convert an abi string to the corresponding [`Abi`] marker type.
 #[macro_export]
 macro_rules! abi {
@@ -136,4 +139,9 @@ macro_rules! abi {
     ("win64-unwind") => {
         $crate::abi::Win64Unwind
     };
+
+    // Other
+    ("efiapi") => {
+        $crate::abi::EfiApi
+    };
 }

src/abi.rs

@@ -68,6 +68,10 @@ pub enum AbiValue {
         /// Whether unwinding across this abi boundary is allowed (`*-unwind`).
         unwind: bool,
     },
+
+    /* Other */
+    /// UEFI ABI, usually an alias of C, but sometimes an arch-specific alias.
+    EfiApi,
 }
 
 impl AbiValue {
@@ -76,6 +80,7 @@ impl AbiValue {
     pub const fn allows_unwind(&self) -> bool {
         match *self {
             AbiValue::Rust => true,
+            AbiValue::EfiApi => false,
             AbiValue::C { unwind }
             | AbiValue::System { unwind }
             | AbiValue::Aapcs { unwind }
@@ -106,6 +111,8 @@ impl AbiValue {
         let arch_arm = cfg!(target_arch = "arm");
         let arch_aarch64 = cfg!(target_arch = "aarch64");
         let arch_arm_any = arch_arm || arch_aarch64;
+        let arch_riscv32 = cfg!(target_arch = "riscv32");
+        let arch_riscv64 = cfg!(target_arch = "riscv64");
 
         #[allow(clippy::match_same_arms)]
         let out = match self {
@@ -144,6 +151,13 @@ impl AbiValue {
             AbiValue::SysV64 { unwind } if arch_x86_64 => AbiValue::SysV64 { unwind },
             AbiValue::Win64 { unwind } if arch_x86_64 => AbiValue::Win64 { unwind },
             AbiValue::SysV64 { .. } | AbiValue::Win64 { .. } => return None,
+
+            AbiValue::EfiApi if arch_x86_64 => AbiValue::Win64 { unwind: false },
+            AbiValue::EfiApi if arch_arm => AbiValue::Aapcs { unwind: false },
+            AbiValue::EfiApi if arch_x86 || arch_aarch64 || arch_riscv32 || arch_riscv64 => {
+                AbiValue::C { unwind: false }
+            }
+            AbiValue::EfiApi => return None,
         };
 
         Some(out)
@@ -160,8 +174,8 @@ macro_rules! abi_kind_impl {
     (
         $t:ty => {
             $(
-                $variant:ident $( { unwind: $uw:literal } )? => $tok:literal,
-            )*
+                $variant:ident $( { unwind: $uw:literal } )? => $tok:literal
+            ),* $(,)?
         }
     ) => {
         impl $t {
@@ -220,4 +234,5 @@ abi_kind_impl!(AbiValue => {
     SysV64 { unwind: true } => "sysv64-unwind",
     Win64 { unwind: false } => "win64",
     Win64 { unwind: true } => "win64-unwind",
+    EfiApi => "efiapi"
 });

src/abi_value.rs

@@ -20,8 +20,6 @@ ffi_opaque::opaque! {
 /// Type alias for a raw untyped function pointer.
 pub type UntypedFnPtr = *const OpaqueFn;
 
-cfg_tt::cfg_tt! {}
-
 cfg_tt::cfg_tt! {
 /// Marker trait for all function pointers.
 pub trait FnPtr:
@@ -66,6 +64,7 @@ pub trait FnPtr:
     #[cfg(has_abi_sysv64)](+ WithAbiImpl<abi::SysV64Unwind>)
     #[cfg(has_abi_win64)](+ WithAbiImpl<abi::Win64>)
     #[cfg(has_abi_win64)](+ WithAbiImpl<abi::Win64Unwind>)
+    #[cfg(has_abi_efiapi)](+ WithAbiImpl<abi::EfiApi>)
 {
     /// The argument types as a tuple.
     type Args: Tuple;

src/base.rs

@@ -24,7 +24,7 @@ macro_rules! impl_fn {
         impl_fn!(@impl_u_and_s ($($nm : $ty),*), System, "system");
         impl_fn!(@impl_u_and_s ($($nm : $ty),*), SystemUnwind, "system-unwind");
 
-        // Common platform ABIs
+        // Platform-specific ABIs
         #[cfg(has_abi_cdecl)]
         impl_fn!(@impl_u_and_s ($($nm : $ty),*), Cdecl, "cdecl");
         #[cfg(has_abi_cdecl)]
@@ -64,6 +64,9 @@ macro_rules! impl_fn {
         impl_fn!(@impl_u_and_s ($($nm : $ty),*), Aapcs, "aapcs");
         #[cfg(has_abi_aapcs)]
         impl_fn!(@impl_u_and_s ($($nm : $ty),*), AapcsUnwind, "aapcs-unwind");
+
+        #[cfg(has_abi_efiapi)]
+        impl_fn!(@impl_u_and_s ($($nm : $ty),*), EfiApi, "efiapi");
     };
 
     // call for safe and unsafe
@@ -170,6 +173,9 @@ macro_rules! impl_fn {
         impl_fn!(@impl_withabi ($($nm : $ty),*), $fn_type, $safety, "aapcs");
         #[cfg(has_abi_aapcs)]
         impl_fn!(@impl_withabi ($($nm : $ty),*), $fn_type, $safety, "aapcs-unwind");
+
+        #[cfg(has_abi_efiapi)]
+        impl_fn!(@impl_withabi ($($nm : $ty),*), $fn_type, $safety, "efiapi");
     };
 
     (@impl_withabi ($($nm:ident : $ty:ident),*), $fn_type:ty, $safety:tt, $abi:tt) => {