cortex-m-rt: Fix max_int_handlers on armv8m

Fixed interrupt count for Cortex-M23 (ARMv8-M Baseline, 240) and Cortex-M33 (ARMv8-M Mainline, 480) based on the technical reference manual. The original value of 496 referred to the entire vector table length, with exceptions length already included in the assert check.

Author: decaday

cortex-m-rt/build.rs

@@ -68,12 +68,12 @@ INCLUDE device.x"#
         println!("cargo:rustc-cfg=cortex_m");
         println!("cargo:rustc-cfg=armv8m");
         println!("cargo:rustc-cfg=armv8m_base");
-        496
+        240
     } else if target.starts_with("thumbv8m.main") {
         println!("cargo:rustc-cfg=cortex_m");
         println!("cargo:rustc-cfg=armv8m");
         println!("cargo:rustc-cfg=armv8m_main");
-        496
+        480
     } else {
         // Non ARM target. We assume you're just testing the syntax.
         // This value seems as good as any.

cortex-m-rt/src/lib.rs

@@ -273,7 +273,8 @@
 //!
 //! - `__INTERRUPTS`. This is the device specific interrupt portion of the vector table; its exact
 //!   size depends on the target device but if the `"device"` feature has not been enabled it will
-//!   have a size of 32 vectors (on ARMv6-M), 240 vectors (on ARMv7-M) or 496 vectors (on ARMv8-M).
+//!   have a size of 32 vectors (on ARMv6-M), 240 vectors (on ARMv7-M, ARMv8-M Baseline) or 480
+//!   vectors (on ARMv8-M Mainline).
 //!   This array is located after `__EXCEPTIONS` in the `.vector_table` section.
 //!
 //! - `__pre_init`. This is a function to be run before RAM is initialized. It defaults to an empty
@@ -1259,7 +1260,7 @@ pub static __EXCEPTIONS: [Vector; 14] = [
 
 // If we are not targeting a specific device we bind all the potential device specific interrupts
 // to the default handler
-#[cfg(all(any(not(feature = "device"), test), not(armv6m), not(armv8m)))]
+#[cfg(all(any(not(feature = "device"), test), not(armv6m), not(armv8m_main)))]
 #[doc(hidden)]
 #[cfg_attr(cortex_m, link_section = ".vector_table.interrupts")]
 #[no_mangle]
@@ -1271,18 +1272,18 @@ pub static __INTERRUPTS: [unsafe extern "C" fn(); 240] = [{
     DefaultHandler
 }; 240];
 
-// ARMv8-M can have up to 496 device specific interrupts
-#[cfg(all(not(feature = "device"), armv8m))]
+// ARMv8-M Mainline can have up to 480 device specific interrupts
+#[cfg(all(not(feature = "device"), armv8m_main))]
 #[doc(hidden)]
 #[cfg_attr(cortex_m, link_section = ".vector_table.interrupts")]
 #[no_mangle]
-pub static __INTERRUPTS: [unsafe extern "C" fn(); 496] = [{
+pub static __INTERRUPTS: [unsafe extern "C" fn(); 480] = [{
     extern "C" {
         fn DefaultHandler();
     }
 
     DefaultHandler
-}; 496];
+}; 480];
 
 // ARMv6-M can only have a maximum of 32 device specific interrupts
 #[cfg(all(not(feature = "device"), armv6m))]