Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
9 changes: 9 additions & 0 deletions crates/sel4/src/arch/arm/fault.rs
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,9 @@ declare_fault_newtype!(VmFault, seL4_Fault_VMFault);
#[sel4_cfg(KERNEL_MCS)]
declare_fault_newtype!(Timeout, seL4_Fault_Timeout);

#[sel4_cfg(HARDWARE_DEBUG_API)]
declare_fault_newtype!(DebugException, seL4_Fault_DebugException);

sel4_cfg_if! {
if #[sel4_cfg(ARM_HYPERVISOR_SUPPORT)] {
declare_fault_newtype!(VGicMaintenance, seL4_Fault_VGICMaintenance);
Expand All @@ -43,6 +46,8 @@ pub enum Fault {
VCpuFault(VCpuFault),
#[sel4_cfg(ARM_HYPERVISOR_SUPPORT)]
VPpiEvent(VPpiEvent),
#[sel4_cfg(HARDWARE_DEBUG_API)]
DebugException(DebugException),
}

impl Fault {
Expand Down Expand Up @@ -74,6 +79,10 @@ impl Fault {
sys::seL4_Fault_Splayed::VPPIEvent(inner) => {
Self::VPpiEvent(VPpiEvent::from_inner(inner))
}
#[sel4_cfg(HARDWARE_DEBUG_API)]
sys::seL4_Fault_Splayed::DebugException(inner) => {
Self::DebugException(DebugException::from_inner(inner))
}
}
}
}
Expand Down
10 changes: 5 additions & 5 deletions crates/sel4/sys/build/xml/invocations/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -224,8 +224,8 @@ impl<'a> InvocationGenerator<'a> {
out_params_passed_by_value: &[&Parameter],
) -> TokenStream {
let ret_struct_fields = out_params_passed_by_value.iter().map(|param| {
let name = format_ident!("{}", param.name);
let ty = format_ident!("{}", param.ty);
let name = raw_ident(&param.name);
let ty = raw_ident(&param.ty);
quote! {
#name: #ty
}
Expand Down Expand Up @@ -304,16 +304,16 @@ impl<'a> InvocationGenerator<'a> {
ParameterType::Primitive {
module_enum: false, ..
} => {
let name = format_ident!("{}", param.name);
let name = raw_ident(&param.name);
toks.extend(quote! {
ret.#name = self.get_mr_bits(#start..#end);
})
}
ParameterType::Struct { members } => {
assert!(self.parameter_types.get(&param.ty).pass_by_reference());
let name = format_ident!("{}", param.name);
let name = raw_ident(&param.name);
for (i, member) in members.iter().enumerate() {
let member = format_ident!("{}", member);
let member = raw_ident(member);
let member_start = start + i * WORD_SIZE;
let member_end = member_start + WORD_SIZE;
toks.extend(quote! {
Expand Down
Loading