arch: change cortex-m33 to use cortex-v7m

This commit changes the `cortex-m33` crate to use `cortex-v7m`,
because the v7m is compatible with v8m, and there is no reason to
just have 2 crates with the same code.

Author: JADarius

Cargo.toml

@@ -6,7 +6,6 @@
 members = [
     "arch/cortex-m",
     "arch/cortex-v7m",
-    "arch/cortex-v8m",
     "arch/cortex-m0",
     "arch/cortex-m0p",
     "arch/cortex-m3",

arch/cortex-m33/Cargo.toml

@@ -11,7 +11,7 @@ edition.workspace = true
 [dependencies]
 kernel = { path = "../../kernel" }
 cortexm = { path = "../cortex-m" }
-cortexv8m = { path = "../cortex-v8m" }
+cortexv7m = { path = "../cortex-v7m" }
 
 [lints]
 workspace = true

arch/cortex-m33/src/lib.rs

@@ -12,6 +12,7 @@ pub mod mpu {
     use kernel::utilities::StaticRef;
     pub type MPU = cortexm::mpu::MPU<16, 32>;
 
+    // This is the address for the Non-secure MPU, which is backwards compatible.
     const MPU_BASE_ADDRESS: StaticRef<cortexm::mpu::MpuRegisters> =
         unsafe { StaticRef::new(0xE002ED90 as *const cortexm::mpu::MpuRegisters) };
 
@@ -35,17 +36,17 @@ pub use cortexm::CortexMVariant;
 pub enum CortexM33 {}
 
 impl cortexm::CortexMVariant for CortexM33 {
-    const GENERIC_ISR: unsafe extern "C" fn() = cortexv8m::generic_isr_arm_v8m;
-    const SYSTICK_HANDLER: unsafe extern "C" fn() = cortexv8m::systick_handler_arm_v8m;
-    const SVC_HANDLER: unsafe extern "C" fn() = cortexv8m::svc_handler_arm_v8m;
-    const HARD_FAULT_HANDLER: unsafe extern "C" fn() = cortexv8m::hard_fault_handler_arm_v8m;
+    const GENERIC_ISR: unsafe extern "C" fn() = cortexv7m::generic_isr_arm_v7m;
+    const SYSTICK_HANDLER: unsafe extern "C" fn() = cortexv7m::systick_handler_arm_v7m;
+    const SVC_HANDLER: unsafe extern "C" fn() = cortexv7m::svc_handler_arm_v7m;
+    const HARD_FAULT_HANDLER: unsafe extern "C" fn() = cortexv7m::hard_fault_handler_arm_v7m;
 
     #[cfg(all(target_arch = "arm", target_os = "none"))]
     unsafe fn switch_to_user(
         user_stack: *const usize,
         process_regs: &mut [usize; 8],
     ) -> *const usize {
-        cortexv8m::switch_to_user_arm_v8m(user_stack, process_regs)
+        cortexv7m::switch_to_user_arm_v7m(user_stack, process_regs)
     }
 
     #[cfg(not(all(target_arch = "arm", target_os = "none")))]