refactor: 📦 Replace cortex-a with aarch64-cpu

Cargo.lock

@@ -23,6 +23,15 @@ dependencies = [
  "mach 0.1.2",
 ]
 
+[[package]]
+name = "aarch64-cpu"
+version = "9.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3aceb88e55ba626a5479279268d009a92d9d00eacce0de1b8c236c7ad31b7225"
+dependencies = [
+ "tock-registers",
+]
+
 [[package]]
 name = "aho-corasick"
 version = "0.7.19"
@@ -94,10 +103,10 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 name = "chainboot"
 version = "0.0.1"
 dependencies = [
+ "aarch64-cpu",
  "bit_field",
  "bitflags",
  "cfg-if",
- "cortex-a",
  "machine",
  "seahash",
  "snafu",
@@ -145,15 +154,6 @@ dependencies = [
  "os_str_bytes",
 ]
 
-[[package]]
-name = "cortex-a"
-version = "8.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0cd4524931a4e0ec50ae91f0d55f571f31ffe11dd9ce2f9905b8343c018c25bb"
-dependencies = [
- "tock-registers",
-]
-
 [[package]]
 name = "crossterm"
 version = "0.25.0"
@@ -363,11 +363,11 @@ dependencies = [
 name = "machine"
 version = "0.0.1"
 dependencies = [
+ "aarch64-cpu",
  "bit_field",
  "bitflags",
  "buddy-alloc",
  "cfg-if",
- "cortex-a",
  "once_cell",
  "qemu-exit",
  "snafu",
@@ -433,10 +433,10 @@ dependencies = [
 name = "nucleus"
 version = "0.0.1"
 dependencies = [
+ "aarch64-cpu",
  "bit_field",
  "bitflags",
  "cfg-if",
- "cortex-a",
  "machine",
  "snafu",
  "tock-registers",

bin/chainboot/Cargo.toml

@@ -25,7 +25,7 @@ rpi4 = ["machine/rpi4"]
 
 [dependencies]
 machine = { path = "../../machine" }
-cortex-a = "8.0"
+aarch64-cpu = "9.0"
 tock-registers = "0.8.1"
 ux = { version = "0.1", default-features = false }
 usize_conversions = "0.2"

bin/chainboot/src/boot.rs

@@ -4,8 +4,8 @@
 #[link_section = ".text.chainboot.entry"]
 pub unsafe extern "C" fn _start() -> ! {
     use {
+        aarch64_cpu::registers::{MPIDR_EL1, SP},
         core::cell::UnsafeCell,
-        cortex_a::registers::{MPIDR_EL1, SP},
         machine::endless_sleep,
         tock_registers::interfaces::{Readable, Writeable},
     };

bin/chainboot/src/main.rs

@@ -8,8 +8,8 @@
 #![no_builtins]
 
 use {
+    aarch64_cpu::asm::barrier,
     core::hash::Hasher,
-    cortex_a::asm::barrier,
     machine::{
         devices::SerialOps,
         platform::rpi3::{gpio::GPIO, pl011_uart::PL011Uart, BcmHost},

machine/Cargo.toml

@@ -29,7 +29,7 @@ rpi4 = []
 
 [dependencies]
 qemu-exit = "3.0"
-cortex-a = "8.0"
+aarch64-cpu = "9.0"
 tock-registers = "0.8.1"
 ux = { version = "0.1", default-features = false }
 usize_conversions = "0.2"

machine/src/arch/aarch64/boot.rs

@@ -10,12 +10,12 @@
 
 use {
     crate::endless_sleep,
+    aarch64_cpu::{asm, registers::*},
     core::{
         cell::UnsafeCell,
         slice,
         sync::atomic::{self, Ordering},
     },
-    cortex_a::{asm, registers::*},
     tock_registers::interfaces::{Readable, Writeable},
 };
 

machine/src/arch/aarch64/jtag.rs

@@ -1,8 +1,8 @@
 //! JTAG helper functions.
 
 use {
+    aarch64_cpu::asm,
     core::ptr::{read_volatile, write_volatile},
-    cortex_a::asm,
 };
 
 #[no_mangle]

machine/src/arch/aarch64/memory/mmu.rs

@@ -20,7 +20,7 @@ use {
         platform, println,
     },
     core::intrinsics::unlikely,
-    cortex_a::{
+    aarch64_cpu::{
         asm::barrier,
         registers::{ID_AA64MMFR0_EL1, SCTLR_EL1, TCR_EL1, TTBR0_EL1},
     },
@@ -84,7 +84,7 @@ impl<const AS_SIZE: usize> AddressSpace<AS_SIZE> {
 impl MemoryManagementUnit {
     /// Setup function for the MAIR_EL1 register.
     fn set_up_mair(&self) {
-        use cortex_a::registers::MAIR_EL1;
+        use aarch64_cpu::registers::MAIR_EL1;
         // Define the three memory types that we will map: Normal DRAM, Uncached and device.
         MAIR_EL1.write(
             // Attribute 2 -- Device Memory

machine/src/arch/aarch64/mod.rs

@@ -5,7 +5,7 @@
 
 //! Implementation of aarch64 kernel functions.
 
-use cortex_a::asm;
+use aarch64_cpu::asm;
 
 mod boot;
 #[cfg(feature = "jtag")]

machine/src/arch/aarch64/traps.rs

@@ -51,7 +51,7 @@
 
 use {
     crate::{arch::endless_sleep, println},
-    cortex_a::{
+    aarch64_cpu::{
         asm::barrier,
         registers::{ESR_EL1, FAR_EL1, SPSR_EL1, VBAR_EL1},
     },

machine/src/platform/rpi3/mailbox.rs

@@ -14,6 +14,7 @@
 use {
     super::BcmHost,
     crate::{platform::MMIODerefWrapper, println, DMA_ALLOCATOR},
+    aarch64_cpu::asm::barrier,
     core::{
         alloc::{AllocError, Allocator, Layout},
         mem,
@@ -21,7 +22,6 @@ use {
         result::Result as CoreResult,
         sync::atomic::{compiler_fence, Ordering},
     },
-    cortex_a::asm::barrier,
     snafu::Snafu,
     tock_registers::{
         interfaces::{Readable, Writeable},

nucleus/Cargo.toml

@@ -28,7 +28,7 @@ rpi4 = ["machine/rpi4"]
 
 [dependencies]
 machine = { path = "../machine" }
-cortex-a = "8.0"
+aarch64-cpu = "9.0"
 tock-registers = "0.8.1"
 ux = { version = "0.1", default-features = false }
 usize_conversions = "0.2"