diff --git a/libcortex_a9/src/cache.rs b/libcortex_a9/src/cache.rs index 054e2d1..d4309e2 100644 --- a/libcortex_a9/src/cache.rs +++ b/libcortex_a9/src/cache.rs @@ -125,8 +125,8 @@ pub fn dcciall() { dsb(); } -const CACHE_LINE: usize = 0x20; -const CACHE_LINE_MASK: usize = CACHE_LINE - 1; +pub const CACHE_LINE: usize = 0x20; +pub const CACHE_LINE_MASK: usize = CACHE_LINE - 1; #[inline] fn cache_line_addrs(first_addr: usize, beyond_addr: usize) -> impl Iterator { @@ -136,13 +136,13 @@ fn cache_line_addrs(first_addr: usize, beyond_addr: usize) -> impl Iterator(object: &T) -> impl Iterator { +pub fn object_cache_line_addrs(object: &T) -> impl Iterator { let first_addr = object as *const _ as usize; let beyond_addr = (object as *const _ as usize) + core::mem::size_of_val(object); cache_line_addrs(first_addr, beyond_addr) } -fn slice_cache_line_addrs(slice: &[T]) -> impl Iterator { +pub fn slice_cache_line_addrs(slice: &[T]) -> impl Iterator { let first_addr = &slice[0] as *const _ as usize; let beyond_addr = (&slice[slice.len() - 1] as *const _ as usize) + core::mem::size_of_val(&slice[slice.len() - 1]); diff --git a/libcortex_a9/src/regs.rs b/libcortex_a9/src/regs.rs index 2b73cfe..86732fc 100644 --- a/libcortex_a9/src/regs.rs +++ b/libcortex_a9/src/regs.rs @@ -3,6 +3,7 @@ use libregister::{ RegisterR, RegisterW, RegisterRW, }; +#[macro_export] macro_rules! def_reg_r { ($name:tt, $type: ty, $asm_instr:tt) => { impl RegisterR for $name { @@ -18,6 +19,7 @@ macro_rules! def_reg_r { } } +#[macro_export] macro_rules! def_reg_w { ($name:ty, $type:ty, $asm_instr:tt) => { impl RegisterW for $name { @@ -37,6 +39,7 @@ macro_rules! def_reg_w { } } +#[macro_export] macro_rules! wrap_reg { ($mod_name: ident) => { pub mod $mod_name {