aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Adam Greig <adam@adamgreig.com> 2020-03-15 19:40:37 +0000
committerGravatar Adam Greig <adam@adamgreig.com> 2020-03-15 19:40:47 +0000
commit539c6d00fffabaf7c3f61f2f8c1aaefa661fa500 (patch)
treea54c12251a7e7cbdafe6b2ee8909ab5acf63b492
parent1cb6baf8bd46b602c01d51e7a3c5c6e77af9c8f2 (diff)
downloadcortex-m-539c6d00fffabaf7c3f61f2f8c1aaefa661fa500.tar.gz
cortex-m-539c6d00fffabaf7c3f61f2f8c1aaefa661fa500.tar.zst
cortex-m-539c6d00fffabaf7c3f61f2f8c1aaefa661fa500.zip
Add UDF instruction. Closes #199.
-rw-r--r--asm.s8
-rw-r--r--bin/thumbv6m-none-eabi.abin2956 -> 3074 bytes
-rw-r--r--bin/thumbv7em-none-eabi.abin5184 -> 5302 bytes
-rw-r--r--bin/thumbv7em-none-eabihf.abin5184 -> 5302 bytes
-rw-r--r--bin/thumbv7m-none-eabi.abin4126 -> 4244 bytes
-rw-r--r--bin/thumbv8m.base-none-eabi.abin4056 -> 4174 bytes
-rw-r--r--bin/thumbv8m.main-none-eabi.abin6466 -> 6584 bytes
-rw-r--r--bin/thumbv8m.main-none-eabihf.abin6466 -> 6584 bytes
-rw-r--r--src/asm.rs24
9 files changed, 32 insertions, 0 deletions
diff --git a/asm.s b/asm.s
index fd2c7fa..975e1ce 100644
--- a/asm.s
+++ b/asm.s
@@ -114,6 +114,14 @@ __sev:
sev
bx lr
+
+ .section .text.__udf
+ .global __udf
+ .thumb_func
+__udf:
+ udf
+ bx lr
+
.section .text.__wfe
.global __wfe
.thumb_func
diff --git a/bin/thumbv6m-none-eabi.a b/bin/thumbv6m-none-eabi.a
index 0684d4e..92076d7 100644
--- a/bin/thumbv6m-none-eabi.a
+++ b/bin/thumbv6m-none-eabi.a
Binary files differ
diff --git a/bin/thumbv7em-none-eabi.a b/bin/thumbv7em-none-eabi.a
index cbfe5ae..a33db85 100644
--- a/bin/thumbv7em-none-eabi.a
+++ b/bin/thumbv7em-none-eabi.a
Binary files differ
diff --git a/bin/thumbv7em-none-eabihf.a b/bin/thumbv7em-none-eabihf.a
index cbfe5ae..a33db85 100644
--- a/bin/thumbv7em-none-eabihf.a
+++ b/bin/thumbv7em-none-eabihf.a
Binary files differ
diff --git a/bin/thumbv7m-none-eabi.a b/bin/thumbv7m-none-eabi.a
index 6e77aeb..5949e33 100644
--- a/bin/thumbv7m-none-eabi.a
+++ b/bin/thumbv7m-none-eabi.a
Binary files differ
diff --git a/bin/thumbv8m.base-none-eabi.a b/bin/thumbv8m.base-none-eabi.a
index 44ee9af..460e342 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.a b/bin/thumbv8m.main-none-eabi.a
index 6590c92..53c510f 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.a b/bin/thumbv8m.main-none-eabihf.a
index 6590c92..53c510f 100644
--- a/bin/thumbv8m.main-none-eabihf.a
+++ b/bin/thumbv8m.main-none-eabihf.a
Binary files differ
diff --git a/src/asm.rs b/src/asm.rs
index 7b1a9ce..593aeac 100644
--- a/src/asm.rs
+++ b/src/asm.rs
@@ -81,6 +81,30 @@ pub fn nop() {
}
}
+
+/// Generate an Undefined Instruction exception.
+///
+/// Can be used as a stable alternative to `core::intrinsics::abort`.
+#[inline]
+pub fn udf() {
+ match () {
+ #[cfg(all(cortex_m, feature = "inline-asm"))]
+ () => unsafe { asm!("udf" :::: "volatile") },
+
+ #[cfg(all(cortex_m, not(feature = "inline-asm")))]
+ () => unsafe {
+ extern "C" {
+ fn __udf();
+ }
+
+ __udf()
+ },
+
+ #[cfg(not(cortex_m))]
+ () => unimplemented!(),
+ }
+}
+
/// Wait For Event
#[inline]
pub fn wfe() {