aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Jonas Schievink <jonasschievink@gmail.com> 2020-08-31 23:19:01 +0200
committerGravatar Jonas Schievink <jonasschievink@gmail.com> 2020-10-13 21:31:36 +0200
commitd01bdda2fd40728810c2a989b248dd4f5d369a7b (patch)
tree9458e40d5f5c9dac727f25afbc34989971d333c6
parent10b29d3a4fc43503c25fb2c7ffbeaad44c2fb103 (diff)
downloadcortex-m-d01bdda2fd40728810c2a989b248dd4f5d369a7b.tar.gz
cortex-m-d01bdda2fd40728810c2a989b248dd4f5d369a7b.tar.zst
cortex-m-d01bdda2fd40728810c2a989b248dd4f5d369a7b.zip
Add __syscall assembly
-rw-r--r--asm/inline.rs7
-rw-r--r--asm/lib.rs5
-rw-r--r--bin/thumbv6m-none-eabi-lto.abin14432 -> 15040 bytes
-rw-r--r--bin/thumbv6m-none-eabi.abin17496 -> 18136 bytes
-rw-r--r--bin/thumbv7em-none-eabi-lto.abin18648 -> 19288 bytes
-rw-r--r--bin/thumbv7em-none-eabi.abin21892 -> 22532 bytes
-rw-r--r--bin/thumbv7em-none-eabihf-lto.abin19624 -> 20276 bytes
-rw-r--r--bin/thumbv7em-none-eabihf.abin22976 -> 23616 bytes
-rw-r--r--bin/thumbv7m-none-eabi-lto.abin17408 -> 18040 bytes
-rw-r--r--bin/thumbv7m-none-eabi.abin20724 -> 21364 bytes
-rw-r--r--bin/thumbv8m.base-none-eabi-lto.abin17688 -> 18300 bytes
-rw-r--r--bin/thumbv8m.base-none-eabi.abin21208 -> 21836 bytes
-rw-r--r--bin/thumbv8m.main-none-eabi-lto.abin22376 -> 22960 bytes
-rw-r--r--bin/thumbv8m.main-none-eabi.abin26560 -> 27188 bytes
-rw-r--r--bin/thumbv8m.main-none-eabihf-lto.abin23360 -> 23948 bytes
-rw-r--r--bin/thumbv8m.main-none-eabihf.abin27612 -> 28236 bytes
16 files changed, 10 insertions, 2 deletions
diff --git a/asm/inline.rs b/asm/inline.rs
index 9a0c66e..688604e 100644
--- a/asm/inline.rs
+++ b/asm/inline.rs
@@ -175,6 +175,13 @@ pub unsafe fn __wfi() {
asm!("wfi");
}
+/// Semihosting syscall.
+#[inline(always)]
+pub unsafe fn __syscall(mut nr: u32, arg: u32) -> u32 {
+ asm!("bkpt #0xab", inout("r0") nr, in("r1") arg);
+ nr
+}
+
// v7m *AND* v8m.main, but *NOT* v8m.base
#[cfg(any(armv7m, armv8m_main))]
pub use self::v7m::*;
diff --git a/asm/lib.rs b/asm/lib.rs
index 93d56fb..ec46d5b 100644
--- a/asm/lib.rs
+++ b/asm/lib.rs
@@ -46,7 +46,7 @@ macro_rules! shims {
pub unsafe extern "C" fn $name(
$($arg: $argty),*
) $(-> $ret)? {
- crate::inline::$name($($arg)*)
+ crate::inline::$name($($arg),*)
}
)+
};
@@ -72,9 +72,10 @@ shims! {
fn __udf();
fn __wfe();
fn __wfi();
+ fn __syscall(nr: u32, arg: u32) -> u32;
}
-// v7m *AND* v8m.main, but *NOT* v8m.base
+// v7m *AND* v8m.main, but *NOT* v8m.base
#[cfg(any(armv7m, armv8m_main))]
shims! {
fn __basepri_max(val: u8);
diff --git a/bin/thumbv6m-none-eabi-lto.a b/bin/thumbv6m-none-eabi-lto.a
index 6ee0427..93d2953 100644
--- a/bin/thumbv6m-none-eabi-lto.a
+++ b/bin/thumbv6m-none-eabi-lto.a
Binary files differ
diff --git a/bin/thumbv6m-none-eabi.a b/bin/thumbv6m-none-eabi.a
index 34dba4a..5fbc73c 100644
--- a/bin/thumbv6m-none-eabi.a
+++ b/bin/thumbv6m-none-eabi.a
Binary files differ
diff --git a/bin/thumbv7em-none-eabi-lto.a b/bin/thumbv7em-none-eabi-lto.a
index 781ea4c..608cbf1 100644
--- a/bin/thumbv7em-none-eabi-lto.a
+++ b/bin/thumbv7em-none-eabi-lto.a
Binary files differ
diff --git a/bin/thumbv7em-none-eabi.a b/bin/thumbv7em-none-eabi.a
index 05d98ba..665ff58 100644
--- a/bin/thumbv7em-none-eabi.a
+++ b/bin/thumbv7em-none-eabi.a
Binary files differ
diff --git a/bin/thumbv7em-none-eabihf-lto.a b/bin/thumbv7em-none-eabihf-lto.a
index b0a2204..feecade 100644
--- a/bin/thumbv7em-none-eabihf-lto.a
+++ b/bin/thumbv7em-none-eabihf-lto.a
Binary files differ
diff --git a/bin/thumbv7em-none-eabihf.a b/bin/thumbv7em-none-eabihf.a
index bd416b5..7517720 100644
--- a/bin/thumbv7em-none-eabihf.a
+++ b/bin/thumbv7em-none-eabihf.a
Binary files differ
diff --git a/bin/thumbv7m-none-eabi-lto.a b/bin/thumbv7m-none-eabi-lto.a
index a6ff71a..bf84238 100644
--- a/bin/thumbv7m-none-eabi-lto.a
+++ b/bin/thumbv7m-none-eabi-lto.a
Binary files differ
diff --git a/bin/thumbv7m-none-eabi.a b/bin/thumbv7m-none-eabi.a
index 1f57c90..803a0ba 100644
--- a/bin/thumbv7m-none-eabi.a
+++ b/bin/thumbv7m-none-eabi.a
Binary files differ
diff --git a/bin/thumbv8m.base-none-eabi-lto.a b/bin/thumbv8m.base-none-eabi-lto.a
index d157ab5..559bf13 100644
--- a/bin/thumbv8m.base-none-eabi-lto.a
+++ b/bin/thumbv8m.base-none-eabi-lto.a
Binary files differ
diff --git a/bin/thumbv8m.base-none-eabi.a b/bin/thumbv8m.base-none-eabi.a
index 6142436..abfa14f 100644
--- a/bin/thumbv8m.base-none-eabi.a
+++ b/bin/thumbv8m.base-none-eabi.a
Binary files differ
diff --git a/bin/thumbv8m.main-none-eabi-lto.a b/bin/thumbv8m.main-none-eabi-lto.a
index f5849b1..1a381f8 100644
--- a/bin/thumbv8m.main-none-eabi-lto.a
+++ b/bin/thumbv8m.main-none-eabi-lto.a
Binary files differ
diff --git a/bin/thumbv8m.main-none-eabi.a b/bin/thumbv8m.main-none-eabi.a
index 63a0dd0..4d4d5c6 100644
--- a/bin/thumbv8m.main-none-eabi.a
+++ b/bin/thumbv8m.main-none-eabi.a
Binary files differ
diff --git a/bin/thumbv8m.main-none-eabihf-lto.a b/bin/thumbv8m.main-none-eabihf-lto.a
index 5dae3aa..ab82609 100644
--- a/bin/thumbv8m.main-none-eabihf-lto.a
+++ b/bin/thumbv8m.main-none-eabihf-lto.a
Binary files differ
diff --git a/bin/thumbv8m.main-none-eabihf.a b/bin/thumbv8m.main-none-eabihf.a
index 3989cda..2d4703a 100644
--- a/bin/thumbv8m.main-none-eabihf.a
+++ b/bin/thumbv8m.main-none-eabihf.a
Binary files differ