From ac2a8365721b453f005feb7fe1fb25615f76af7c Mon Sep 17 00:00:00 2001 From: Adam Greig Date: Fri, 25 Feb 2022 01:57:16 +0000 Subject: Put inline asm directly into cortex-m-semihosting so it doesn't need to depend on cortex-m 0.8 --- cortex-m-semihosting/src/lib.rs | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'cortex-m-semihosting/src') diff --git a/cortex-m-semihosting/src/lib.rs b/cortex-m-semihosting/src/lib.rs index 186e7e7..8306307 100644 --- a/cortex-m-semihosting/src/lib.rs +++ b/cortex-m-semihosting/src/lib.rs @@ -194,7 +194,13 @@ pub unsafe fn syscall(nr: usize, arg: &T) -> usize { pub unsafe fn syscall1(_nr: usize, _arg: usize) -> usize { match () { #[cfg(all(thumb, not(feature = "no-semihosting")))] - () => cortex_m::asm::semihosting_syscall(_nr as u32, _arg as u32) as usize, + () => { + use core::arch::asm; + let mut nr = _nr as u32; + let arg = _arg as u32; + asm!("bkpt #0xab", inout("r0") nr, in("r1") arg, options(nostack, preserves_flags)); + nr as usize + } #[cfg(all(thumb, feature = "no-semihosting"))] () => 0, #[cfg(not(thumb))] -- cgit v1.2.3