diff options
| author |  Jorge Aparicio <jorge@japaric.io>
| 2017-12-23 10:00:00 +0100 |
|---|---|---|
| committer | Jorge Aparicio <jorge@japaric.io>
| 2017-12-23 10:00:00 +0100 |
| commit | ed6aa6896e7e1bfcb39c867a105ded475f242129 (patch) | |
| tree | f2a8a57fe9aed6743d6528f54ecf49046a5b4fd7 /cortex-m-rt/src | |
| parent | 00541bb67dce44021eef828dc039c0ae65057d22 (diff) | |
| download | cortex-m-ed6aa6896e7e1bfcb39c867a105ded475f242129.tar.gz cortex-m-ed6aa6896e7e1bfcb39c867a105ded475f242129.tar.zst cortex-m-ed6aa6896e7e1bfcb39c867a105ded475f242129.zip | |
provide a DEBUG_MONITOR exception on ARMv7-M
Diffstat (limited to 'cortex-m-rt/src')
| -rw-r--r-- | cortex-m-rt/src/lib.rs | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/cortex-m-rt/src/lib.rs b/cortex-m-rt/src/lib.rs index 82dd9eb..df6640f 100644 --- a/cortex-m-rt/src/lib.rs +++ b/cortex-m-rt/src/lib.rs @@ -400,6 +400,12 @@ PENDSV = DEFAULT_HANDLER SYS_TICK = DEFAULT_HANDLER "#); +#[cfg(not(armv6m))] +global_asm!(r#" +.weak DEBUG_MONITOR +DEBUG_MONITOR = DEFAULT_HANDLER +"#); + #[cfg(target_arch = "arm")] extern "C" { fn NMI(); @@ -408,6 +414,8 @@ extern "C" { fn BUS_FAULT(); fn USAGE_FAULT(); fn SVCALL(); + #[cfg(not(armv6m))] + fn DEBUG_MONITOR(); fn PENDSV(); fn SYS_TICK(); } @@ -429,7 +437,10 @@ pub static EXCEPTIONS: [Option<unsafe extern "C" fn()>; 14] = [ None, None, Some(SVCALL), + #[cfg(armv6m)] None, + #[cfg(not(armv6m))] + Some(DEBUG_MONITOR), None, Some(PENDSV), Some(SYS_TICK), @@ -520,6 +531,9 @@ pub enum Exception { USAGE_FAULT, /// System service call via SWI instruction SVCALL, + /// Debug monitor + #[cfg(not(armv6m))] + DEBUG_MONITOR, /// Pendable request for system service PENDSV, /// System tick timer |