Skip to content

Check for CMSE ABI's as well #1093

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
defermelowie wants to merge 4 commits into
base: main
Choose a base branch
from
Open

Check for CMSE ABI's as well #1093

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1301806
Check for CMSE ABI's as well
defermelowie Jul 16, 2025
7fc717c
Remove unneeded return statement
defermelowie Jul 17, 2025
6ebd19f
Add test for CMSE ABIs
defermelowie Jul 30, 2025
fa88837
Merge branch 'mozilla:master' into master
defermelowie Sep 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/bindgen/parser.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -728,7 +728,7 @@ impl Parse {
items.join("::")
};

let is_extern_c = sig.abi.is_omitted() || sig.abi.is_c();
let is_extern_c = sig.abi.is_omitted() || sig.abi.is_c() || sig.abi.is_cmse();
let exported_name = named_symbol.exported_name();

match (is_extern_c, exported_name) {
Expand Down
27 changes: 16 additions & 11 deletions src/bindgen/utilities.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -371,24 +371,19 @@ impl_syn_item_helper!(syn::ItemTraitAlias);
/// Helper function for accessing Abi information
pub trait SynAbiHelpers {
fn is_c(&self) -> bool;
fn is_cmse(&self) -> bool;
fn is_omitted(&self) -> bool;
}

impl SynAbiHelpers for Option<syn::Abi> {
fn is_c(&self) -> bool {
if let Some(ref abi) = *self {
if let Some(ref lit_string) = abi.name {
return matches!(lit_string.value().as_str(), "C" | "C-unwind");
}
}
false
self.as_ref().is_some_and(|abi| abi.is_c())
}
fn is_cmse(&self) -> bool {
self.as_ref().is_some_and(|abi| abi.is_cmse())
}
fn is_omitted(&self) -> bool {
if let Some(ref abi) = *self {
abi.name.is_none()
} else {
false
}
self.as_ref().is_some_and(|abi| abi.is_omitted())
}
}

Expand All @@ -400,6 +395,16 @@ impl SynAbiHelpers for syn::Abi {
false
}
}
fn is_cmse(&self) -> bool {
if let Some(ref lit_string) = self.name {
matches!(
lit_string.value().as_str(),
"cmse-nonsecure-entry" | "cmse-nonsecure-call"
Copy link
Collaborator

@emilio emilio Jul 30, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hmm, I'm not sure why these function shouldn't be tagged with __attribute__((cmse_nonsecure_call)) and __attribute__((cmse_nonsecure_entry)), respectively. Mind elaborating on that?

Copy link
Author

@defermelowie defermelowie Sep 10, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Off the top of my head, that's because these annotations instruct the compiler to create veneers for these functions which is only important at their definition (in rust), call sites shouldn't care about this.

)
} else {
false
}
}
fn is_omitted(&self) -> bool {
self.name.is_none()
}
Expand Down