Skip to content

Rework exception macro expansion for faults #223

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

Draft
tropicaaal wants to merge 2 commits into
base: main
Choose a base branch
from
Draft

Rework exception macro expansion for faults #223

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
71a2563
Rework exception macro expansion for faults
tropicaaal Sep 2, 2026
5ddb48b
Disallow async entrypoints in `#[entry]` macro
tropicaaal Sep 2, 2026
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
121 changes: 47 additions & 74 deletions aarch32-rt-macros/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ pub fn entry(args: TokenStream, input: TokenStream) -> TokenStream {
&& f.sig.generics.params.is_empty()
&& f.sig.generics.where_clause.is_none()
&& f.sig.variadic.is_none()
&& f.sig.asyncness.is_none()
&& match f.sig.output {
ReturnType::Default => false,
ReturnType::Type(_, ref ty) => matches!(**ty, Type::Never(_)),
Expand Down Expand Up @@ -306,91 +307,52 @@ fn handle_vector(args: TokenStream, input: TokenStream, kind: VectorKind) -> Tok
};

let func_name = f.sig.ident.clone();
let block = f.block.clone();
let (ref cfgs, ref attrs) = extract_cfgs(f.attrs.clone());

let handler = match exception {
// Faulting exceptions that optionally take an address argument
//
// e.g.
// extern "C" fn _undefined_handler(addr: usize) -> !;
// unsafe extern "C" fn _undefined_handler(addr: usize) -> usize;
Exception::Undefined => {
let tramp_ident = Ident::new("__aarch32_rt_undefined_handler", Span::call_site());
if returns_never {
quote!(
#(#cfgs)*
#(#attrs)*
#[doc(hidden)]
#[export_name = "_undefined_handler"]
pub unsafe extern "C" fn #tramp_ident(addr: usize) -> ! {
#block
}

)
} else {
quote!(
#(#cfgs)*
#(#attrs)*
#[doc(hidden)]
#[export_name = "_undefined_handler"]
pub unsafe extern "C" fn #tramp_ident(addr: usize) -> usize {
#block
}
Exception::Undefined | Exception::DataAbort | Exception::PrefetchAbort => {
let fn_output = f.sig.output.clone();
let (tramp_ident, export_name) = match exception {
Exception::Undefined => (
Ident::new("__aarch32_rt_undefined_handler", Span::call_site()),
"_undefined_handler",
),
Exception::DataAbort => (
Ident::new("__aarch32_rt_data_abort_handler", Span::call_site()),
"_data_abort_handler",
),
Exception::PrefetchAbort => (
Ident::new("__aarch32_rt_prefetch_abort_handler", Span::call_site()),
"_prefetch_abort_handler",
),
_ => unreachable!(),
};

)
}
}
// extern "C" fn _prefetch_abort_handler(addr: usize) -> !;
// unsafe extern "C" fn _prefetch_abort_handler(addr: usize) -> usize;
Exception::PrefetchAbort => {
let tramp_ident = Ident::new("__aarch32_rt_prefetch_abort_handler", Span::call_site());
if returns_never {
let call_site = if f.sig.inputs.is_empty() {
quote!(
#(#cfgs)*
#(#attrs)*
#[doc(hidden)]
#[export_name = "_prefetch_abort_handler"]
pub unsafe extern "C" fn #tramp_ident(addr: usize) -> ! {
#block
}
#func_name()
)
} else {
quote!(
#(#cfgs)*
#(#attrs)*
#[doc(hidden)]
#[export_name = "_prefetch_abort_handler"]
pub unsafe extern "C" fn #tramp_ident(addr: usize) -> usize {
#block
}

#func_name(_addr)
)
}
}
// extern "C" fn _data_abort_handler(addr: usize) -> !;
// unsafe extern "C" fn _data_abort_handler(addr: usize) -> usize;
Exception::DataAbort => {
let tramp_ident = Ident::new("__aarch32_rt_data_abort_handler", Span::call_site());
if returns_never {
quote!(
#(#cfgs)*
#(#attrs)*
#[doc(hidden)]
#[export_name = "_data_abort_handler"]
pub unsafe extern "C" fn #tramp_ident(addr: usize) -> ! {
#block
}
};

)
} else {
quote!(
#(#cfgs)*
#(#attrs)*
#[doc(hidden)]
#[export_name = "_data_abort_handler"]
pub unsafe extern "C" fn #tramp_ident(addr: usize) -> usize {
#block
}
)
}
quote!(
#(#cfgs)*
#(#attrs)*
#[doc(hidden)]
#[export_name = #export_name]
pub unsafe extern "C" fn #tramp_ident(_addr: usize) #fn_output {
#f
#call_site
}
)
}
// extern "C" fn _svc_handler(arg: u32, args: &Frame) -> u32
Exception::SupervisorCall => {
Expand Down Expand Up @@ -425,13 +387,24 @@ fn handle_vector(args: TokenStream, input: TokenStream, kind: VectorKind) -> Tok
// extern "C" fn _irq_handler(addr: usize);
Exception::Irq => {
let tramp_ident = Ident::new("__aarch32_rt_irq_handler", Span::call_site());
let call_site = if f.sig.inputs.is_empty() {
quote!(
#func_name()
)
} else {
quote!(
#func_name(_addr)
)
};

quote!(
#(#cfgs)*
#(#attrs)*
#[doc(hidden)]
#[export_name = "_irq_handler"]
pub unsafe extern "C" fn #tramp_ident() {
#block
#f
#call_site
}
)
}
Expand Down
Loading