Skip to content

Commit

Permalink
Format kern's cfg-if'd modules (#135)
Browse files Browse the repository at this point in the history
The conditionally-included modules are not being
automatically formatted due to:
rust-lang/rustfmt#4656

Although there is a patch to fix this issue upstream, this PR manually fixes these unformatted modules.
  • Loading branch information
smklein authored Jan 26, 2021
1 parent 02c5538 commit 6e9fb36
Showing 1 changed file with 16 additions and 14 deletions.
30 changes: 16 additions & 14 deletions kern/src/arch/arm_m.rs
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
//!
//! For performance and (believe it or not) simplicity, this implementation uses
//! several different interrupt service routines:
//!
//!
//! - `SVCall` implements the `SVC` instruction used to make syscalls.
//! - `SysTick` handles interrupts from the System Tick Timer, used to maintain
//! the kernel timestamp.
Expand Down Expand Up @@ -72,11 +72,11 @@ use core::ptr::NonNull;

use zerocopy::FromBytes;

use abi::{FaultSource, FaultInfo};
use crate::app;
use crate::task;
use crate::time::Timestamp;
use crate::umem::USlice;
use abi::{FaultInfo, FaultSource};

/// Log things from kernel context. This macro is made visible to the rest of
/// the kernel by a chain of `#[macro_use]` attributes, but its implementation
Expand All @@ -96,8 +96,8 @@ use crate::umem::USlice;
///
#[cfg(not(any(feature = "klog-semihosting", feature = "klog-itm")))]
macro_rules! klog {
($s:expr) => { };
($s:expr, $($tt:tt)*) => { };
($s:expr) => {};
($s:expr, $($tt:tt)*) => {};
}

#[cfg(feature = "klog-itm")]
Expand Down Expand Up @@ -126,18 +126,18 @@ macro_rules! klog {

macro_rules! uassert {
($cond : expr) => {
if ! $cond {
if !$cond {
panic!("Assertion failed!");
}
}
};
}

macro_rules! uassert_eq {
($cond1 : expr, $cond2 : expr) => {
if ! ($cond1 == $cond2) {
if !($cond1 == $cond2) {
panic!("Assertion failed!");
}
}
};
}

/// On ARMvx-M we use a global to record the task table position and extent.
Expand Down Expand Up @@ -448,8 +448,8 @@ pub fn apply_memory_protection(task: &task::Task) {
// Outer/inner non-cacheable, outer shared.
(0b01000100, 0b10)
} else {
let rw =
u32::from(ratts.contains(app::RegionAttributes::READ)) << 1
let rw = u32::from(ratts.contains(app::RegionAttributes::READ))
<< 1
| u32::from(ratts.contains(app::RegionAttributes::WRITE));
// write-back transient, not shared
(0b0100_0100 | rw | rw << 4, 0b00)
Expand Down Expand Up @@ -680,7 +680,9 @@ pub unsafe extern "C" fn SVCall() {
///
/// You can use this safely at kernel entry points, exactly once, to create a
/// reference to the task table.
pub unsafe fn with_task_table<R>(body: impl FnOnce(&mut [task::Task]) -> R) -> R{
pub unsafe fn with_task_table<R>(
body: impl FnOnce(&mut [task::Task]) -> R,
) -> R {
let tasks = core::slice::from_raw_parts_mut(
TASK_TABLE_BASE.expect("kernel not started").as_mut(),
TASK_TABLE_SIZE,
Expand All @@ -694,7 +696,7 @@ pub unsafe fn with_task_table<R>(body: impl FnOnce(&mut [task::Task]) -> R) -> R
///
/// Because the lifetime of the reference passed into `body` is anonymous, the
/// reference can't easily be stored, which is deliberate.
pub fn with_irq_table<R>(body: impl FnOnce(&[abi::Interrupt]) -> R) -> R{
pub fn with_irq_table<R>(body: impl FnOnce(&[abi::Interrupt]) -> R) -> R {
// Safety: as long as a legit pointer was stored in IRQ_TABLE_BASE, or no
// pointer has been stored, we can do this safely.
let table = unsafe {
Expand Down Expand Up @@ -770,7 +772,8 @@ fn pend_context_switch_from_isr() {
#[naked]
#[no_mangle]
pub unsafe extern "C" fn PendSV() {
asm!("
asm!(
"
@ store volatile state.
@ first, get a pointer to the current task.
movw r0, #:lower16:CURRENT_TASK_PTR
Expand Down Expand Up @@ -847,7 +850,6 @@ pub unsafe extern "C" fn DefaultHandler() {
// 13 is currently reserved
// 14=PendSV is handled above by its own handler
// 15=SysTick is handled above by its own handler

x if x > 16 => {
// Hardware interrupt
let irq_num = exception_num - 16;
Expand Down

0 comments on commit 6e9fb36

Please sign in to comment.