NaxdyOrg/embassy
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Added feature flag to embassy-rp intrinsics to avoid conflicts with rp2040-hal

Browse source
This commit is contained in:
Peter Krull 2023-04-23 15:50:46 +02:00
parent fb27594b2e
commit cc5bca8e83
1 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
embassy-rp/src/intrinsics.rs
View file

@ -402,6 +402,7 @@ macro_rules! division_function {
}; };
} }
#[cfg(all(target_arch = "arm", feature = "intrinsics"))]
division_function! { division_function! {
unsigned_divmod __aeabi_uidivmod __aeabi_uidiv ( u32 ) { unsigned_divmod __aeabi_uidivmod __aeabi_uidiv ( u32 ) {
"str r0, [r2, #0x060]", // DIV_UDIVIDEND "str r0, [r2, #0x060]", // DIV_UDIVIDEND
@ -409,6 +410,7 @@ division_function! {
} }
} }
#[cfg(all(target_arch = "arm", feature = "intrinsics"))]
division_function! { division_function! {
signed_divmod __aeabi_idivmod __aeabi_idiv ( i32 ) { signed_divmod __aeabi_idivmod __aeabi_idiv ( i32 ) {
"str r0, [r2, #0x068]", // DIV_SDIVIDEND "str r0, [r2, #0x068]", // DIV_SDIVIDEND
@ -416,6 +418,7 @@ division_function! {
} }
} }
#[cfg(all(target_arch = "arm", feature = "intrinsics"))]
fn divider_unsigned(n: u32, d: u32) -> DivResult<u32> { fn divider_unsigned(n: u32, d: u32) -> DivResult<u32> {
let packed = unsafe { unsigned_divmod(n, d) }; let packed = unsafe { unsigned_divmod(n, d) };
DivResult { DivResult {
@ -424,6 +427,7 @@ fn divider_unsigned(n: u32, d: u32) -> DivResult<u32> {
} }
} }
#[cfg(all(target_arch = "arm", feature = "intrinsics"))]
fn divider_signed(n: i32, d: i32) -> DivResult<i32> { fn divider_signed(n: i32, d: i32) -> DivResult<i32> {
let packed = unsafe { signed_divmod(n, d) }; let packed = unsafe { signed_divmod(n, d) };
// Double casts to avoid sign extension // Double casts to avoid sign extension
@ -441,6 +445,7 @@ struct DivResult<T> {
pub remainder: T, pub remainder: T,
} }
#[cfg(all(target_arch = "arm", feature = "intrinsics"))]
intrinsics! { intrinsics! {
extern "C" fn __udivsi3(n: u32, d: u32) -> u32 { extern "C" fn __udivsi3(n: u32, d: u32) -> u32 {
divider_unsigned(n, d).quotient divider_unsigned(n, d).quotient