rust-embedded · jonathanpallant · Feb 25, 2025 · Feb 24, 2025 · Feb 24, 2025 · Feb 25, 2025
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -36,7 +36,7 @@ jobs:
     runs-on: ubuntu-24.04
     strategy:
       matrix:
-        rust: [stable, 1.82]
+        rust: [stable, 1.59]
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -231,7 +231,7 @@ jobs:
           rustup default stable
       - name: Run cargo test
         run: |
-          cargo test --manifest-path cortex-r/Cargo.toml
+          cargo test --manifest-path cortex-ar/Cargo.toml
 
   # Run some programs in QEMU
   qemu-test:

diff --git a/Cargo.toml b/Cargo.toml
@@ -3,7 +3,7 @@ exclude = [
   "arm-targets",
 ]
 members = [
-  "cortex-r",
+  "cortex-ar",
   "cortex-r-examples",
   "cortex-r-rt",
 ]

diff --git a/LICENSE-MIT b/LICENSE-MIT
@@ -1,5 +1,5 @@
-Copyright (c) The Cortex-R Crate Developers
 Copyright (c) Ferrous Systems
+Copyright (c) The Rust Embedded Devices Working Group developers
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/README.md b/README.md
@@ -1,16 +1,21 @@
 # Rust on Arm Cortex-R
 
-This repository contains support libraries for Rust on Arm Cortex-R.
+This repository provides support for:
 
-These libraries have been written by Ferrous Systems, and are based on the
+* Armv7-R Processors, like the Arm Cortex-R5
+* Armv8-R AArch32 Processors, like the Arm Cortex-R52
+* Armv7-A Processors, like the Arm Cortex-A5
+* Armv8-A AArch32 Processors, like the Arm Cortex-A53 running in 32-bit mode
+
+These libraries were originally written by Ferrous Systems, and are based on the
 [`cortex-m` libraries] from the [Rust Embedded Devices Working Group].
 
 [`cortex-m` libraries]: https://github.com/rust-embedded/cortex-m
 [Rust Embedded Devices Working Group]: https://github.com/rust-embedded
 
 There are currently three libraries here:
 
-* [cortex-r](./cortex-r/) - support library for Cortex-R CPUs (like [cortex-m])
+* [cortex-ar](./cortex-ar/) - support library for Cortex-R and Cortex-A CPUs (like [cortex-m])
 * [cortex-r-rt](./cortex-r-rt/) - run-time library for Cortex-R CPUs (like [cortex-m-rt])
 * [arm-targets](./arm-targets/) - a helper library for your build.rs that sets various `--cfg` flags according to the current target
 
@@ -21,8 +26,8 @@ There are also example programs for QEMU in the [cortex-r-examples](./cortex-r-e
 
 ## Licence
 
-* Copyright (c) Ferrous Systems, 2025
-* Copyright (c) The Cortex-M Team <cortex-m@teams.rust-embedded.org>
+* Copyright (c) Ferrous Systems
+* Copyright (c) The Rust Embedded Devices Working Group developers
 
 Licensed under either [MIT](./LICENSE-MIT) or [Apache-2.0](./LICENSE-APACHE) at
 your option.

diff --git a/arm-targets/Cargo.toml b/arm-targets/Cargo.toml
@@ -1,12 +1,16 @@
 [package]
-authors = ["Jonathan Pallant <jonathan.pallant@ferrous-systems.com>", "The Cortex-R Team <cortex-r@teams.rust-embedded.org>"]
+authors = [
+    "Jonathan Pallant <jonathan.pallant@ferrous-systems.com>",
+    "The Cortex-R Team <cortex-r@teams.rust-embedded.org>"
+]
+categories = ["development-tools::build-utils"]
 description = "Compile-time feature detection for Arm processors"
 edition = "2021"
 license = "MIT OR Apache-2.0"
 name = "arm-targets"
 readme = "README.md"
 repository = "https://github.com/rust-embedded/cortex-r.git"
-rust-version = "1.82"
+rust-version = "1.59"
 version = "0.1.0"
 
 [dependencies]
diff --git a/cortex-r/Cargo.toml → cortex-ar/Cargo.toml b/cortex-r/Cargo.toml → cortex-ar/Cargo.toml
@@ -1,9 +1,24 @@
 [package]
-authors = ["Jonathan Pallant <jonathan.pallant@ferrous-systems.com>", "The Cortex-R Team <cortex-r@teams.rust-embedded.org>"]
-description = "CPU support for Arm Cortex-R"
+authors = [
+    "Jonathan Pallant <jonathan.pallant@ferrous-systems.com>",
+    "The Cortex-R Team <cortex-r@teams.rust-embedded.org>",
+]
+categories = [
+    "embedded",
+    "no-std",
+]
+description = "CPU support for AArch32 Arm Cortex-R and Arm Cortex-A"
 edition = "2021"
+keywords = [
+    "arm",
+    "cortex-a",
+    "cortex-r",
+    "embedded",
+    "no_std",
+    "no-std",
+]
 license = "MIT OR Apache-2.0"
-name = "cortex-r"
+name = "cortex-ar"
 readme = "README.md"
 repository = "https://github.com/rust-embedded/cortex-r.git"
 rust-version = "1.82"

diff --git a/cortex-ar/README.md b/cortex-ar/README.md
@@ -0,0 +1,39 @@
+# Support for Arm Cortex-R (AArch32) and Arm Corex-A (AArch32)
+
+This crate provides access to CPU registers and common peripherals for:
+
+* Armv7-R Processors, like the Arm Cortex-R5
+* Armv8-R AArch32 Processors, like the Arm Cortex-R52
+* Armv7-A Processors, like the Arm Cortex-A5
+* Armv8-A AArch32 Processors, like the Arm Cortex-A53 running in 32-bit mode
+
+It does not support processors running in AArch64 mode - A64 machine code uses
+different instructions for reading/writing system registers.
+
+This crate contains:
+
+* Raw register access to many Armv7-R and Armv8-R AArch32 system registers
+* A driver for the PMSAv7 Memory Protection Unit (MPU)
+* A driver for the PMSAv8-R Memory Protection Unit (MPU)
+* A driver for the Arm Generic Timer
+
+If you need a driver for the Arm Generic Interrupt Controller, see
+<https://github.com/google/arm-gic>.
+
+## Minimum Supported Rust Version (MSRV)
+
+This crate is guaranteed to compile on stable Rust 1.82.0 and up. It *might*
+compile with older versions but that may change in any new patch release.
+
+## Licence
+
+Copyright (c) Ferrous Systems, 2025
+
+Licensed under either [MIT](./LICENSE-MIT) or [Apache-2.0](./LICENSE-APACHE) at
+your option.
+
+## Contribution
+
+Unless you explicitly state otherwise, any contribution intentionally submitted
+for inclusion in the work by you shall be licensed as above, without any
+additional terms or conditions.
diff --git a/cortex-r/build.rs → cortex-ar/build.rs b/cortex-r/build.rs → cortex-ar/build.rs
diff --git a/cortex-r/src/asm.rs → cortex-ar/src/asm.rs b/cortex-r/src/asm.rs → cortex-ar/src/asm.rs
diff --git a/cortex-r/src/critical_section.rs → cortex-ar/src/critical_section.rs b/cortex-r/src/critical_section.rs → cortex-ar/src/critical_section.rs
diff --git a/cortex-r/src/generic_timer/el0.rs → cortex-ar/src/generic_timer/el0.rs b/cortex-r/src/generic_timer/el0.rs → cortex-ar/src/generic_timer/el0.rs
@@ -6,7 +6,7 @@ use crate::register;
 ///
 /// Note that for most of these APIs to work, EL0 needs to have been granted
 /// access using methods like
-/// [El2GenericTimer::el0_access_physical_counter](crate::generic_timer::El2GenericTimer::el0_access_physical_counter).
+/// [El1PhysicalTimer::el0_access_physical_counter](crate::generic_timer::El1PhysicalTimer::el0_access_physical_counter).
 pub struct El0PhysicalTimer();
 
 impl El0PhysicalTimer {

diff --git a/cortex-r/src/generic_timer/el1.rs → cortex-ar/src/generic_timer/el1.rs b/cortex-r/src/generic_timer/el1.rs → cortex-ar/src/generic_timer/el1.rs
diff --git a/cortex-r/src/generic_timer/el2.rs → cortex-ar/src/generic_timer/el2.rs b/cortex-r/src/generic_timer/el2.rs → cortex-ar/src/generic_timer/el2.rs
diff --git a/cortex-r/src/generic_timer/mod.rs → cortex-ar/src/generic_timer/mod.rs b/cortex-r/src/generic_timer/mod.rs → cortex-ar/src/generic_timer/mod.rs
diff --git a/cortex-r/src/interrupt.rs → cortex-ar/src/interrupt.rs b/cortex-r/src/interrupt.rs → cortex-ar/src/interrupt.rs
diff --git a/cortex-r/src/lib.rs → cortex-ar/src/lib.rs b/cortex-r/src/lib.rs → cortex-ar/src/lib.rs
diff --git a/cortex-r/src/pmsav7.rs → cortex-ar/src/pmsav7.rs b/cortex-r/src/pmsav7.rs → cortex-ar/src/pmsav7.rs
diff --git a/cortex-r/src/pmsav8.rs → cortex-ar/src/pmsav8.rs b/cortex-r/src/pmsav8.rs → cortex-ar/src/pmsav8.rs
diff --git a/cortex-r/src/register/actlr.rs → cortex-ar/src/register/actlr.rs b/cortex-r/src/register/actlr.rs → cortex-ar/src/register/actlr.rs
diff --git a/cortex-r/src/register/actlr2.rs → cortex-ar/src/register/actlr2.rs b/cortex-r/src/register/actlr2.rs → cortex-ar/src/register/actlr2.rs
diff --git a/cortex-r/src/register/adfsr.rs → cortex-ar/src/register/adfsr.rs b/cortex-r/src/register/adfsr.rs → cortex-ar/src/register/adfsr.rs
diff --git a/cortex-r/src/register/aidr.rs → cortex-ar/src/register/aidr.rs b/cortex-r/src/register/aidr.rs → cortex-ar/src/register/aidr.rs
diff --git a/cortex-r/src/register/aifsr.rs → cortex-ar/src/register/aifsr.rs b/cortex-r/src/register/aifsr.rs → cortex-ar/src/register/aifsr.rs
diff --git a/cortex-r/src/register/amair0.rs → cortex-ar/src/register/amair0.rs b/cortex-r/src/register/amair0.rs → cortex-ar/src/register/amair0.rs
diff --git a/cortex-r/src/register/amair1.rs → cortex-ar/src/register/amair1.rs b/cortex-r/src/register/amair1.rs → cortex-ar/src/register/amair1.rs
diff --git a/cortex-r/src/register/armv8r/cntfrq.rs → cortex-ar/src/register/armv8r/cntfrq.rs b/cortex-r/src/register/armv8r/cntfrq.rs → cortex-ar/src/register/armv8r/cntfrq.rs
diff --git a/cortex-r/src/register/armv8r/cnthctl.rs → cortex-ar/src/register/armv8r/cnthctl.rs b/cortex-r/src/register/armv8r/cnthctl.rs → cortex-ar/src/register/armv8r/cnthctl.rs
diff --git a/cortex-r/src/register/armv8r/cnthp_ctl.rs → cortex-ar/src/register/armv8r/cnthp_ctl.rs b/cortex-r/src/register/armv8r/cnthp_ctl.rs → cortex-ar/src/register/armv8r/cnthp_ctl.rs
diff --git a/cortex-r/src/register/armv8r/cnthp_cval.rs → cortex-ar/src/register/armv8r/cnthp_cval.rs b/cortex-r/src/register/armv8r/cnthp_cval.rs → cortex-ar/src/register/armv8r/cnthp_cval.rs
diff --git a/cortex-r/src/register/armv8r/cnthp_tval.rs → cortex-ar/src/register/armv8r/cnthp_tval.rs b/cortex-r/src/register/armv8r/cnthp_tval.rs → cortex-ar/src/register/armv8r/cnthp_tval.rs
diff --git a/cortex-r/src/register/armv8r/cntkctl.rs → cortex-ar/src/register/armv8r/cntkctl.rs b/cortex-r/src/register/armv8r/cntkctl.rs → cortex-ar/src/register/armv8r/cntkctl.rs
diff --git a/cortex-r/src/register/armv8r/cntp_ctl.rs → cortex-ar/src/register/armv8r/cntp_ctl.rs b/cortex-r/src/register/armv8r/cntp_ctl.rs → cortex-ar/src/register/armv8r/cntp_ctl.rs
diff --git a/cortex-r/src/register/armv8r/cntp_cval.rs → cortex-ar/src/register/armv8r/cntp_cval.rs b/cortex-r/src/register/armv8r/cntp_cval.rs → cortex-ar/src/register/armv8r/cntp_cval.rs
diff --git a/cortex-r/src/register/armv8r/cntp_tval.rs → cortex-ar/src/register/armv8r/cntp_tval.rs b/cortex-r/src/register/armv8r/cntp_tval.rs → cortex-ar/src/register/armv8r/cntp_tval.rs
diff --git a/cortex-r/src/register/armv8r/cntpct.rs → cortex-ar/src/register/armv8r/cntpct.rs b/cortex-r/src/register/armv8r/cntpct.rs → cortex-ar/src/register/armv8r/cntpct.rs
diff --git a/cortex-r/src/register/armv8r/cntv_ctl.rs → cortex-ar/src/register/armv8r/cntv_ctl.rs b/cortex-r/src/register/armv8r/cntv_ctl.rs → cortex-ar/src/register/armv8r/cntv_ctl.rs
diff --git a/cortex-r/src/register/armv8r/cntv_cval.rs → cortex-ar/src/register/armv8r/cntv_cval.rs b/cortex-r/src/register/armv8r/cntv_cval.rs → cortex-ar/src/register/armv8r/cntv_cval.rs
diff --git a/cortex-r/src/register/armv8r/cntv_tval.rs → cortex-ar/src/register/armv8r/cntv_tval.rs b/cortex-r/src/register/armv8r/cntv_tval.rs → cortex-ar/src/register/armv8r/cntv_tval.rs
diff --git a/cortex-r/src/register/armv8r/cntvct.rs → cortex-ar/src/register/armv8r/cntvct.rs b/cortex-r/src/register/armv8r/cntvct.rs → cortex-ar/src/register/armv8r/cntvct.rs
diff --git a/cortex-r/src/register/armv8r/cntvoff.rs → cortex-ar/src/register/armv8r/cntvoff.rs b/cortex-r/src/register/armv8r/cntvoff.rs → cortex-ar/src/register/armv8r/cntvoff.rs
diff --git a/cortex-r/src/register/armv8r/hacr.rs → cortex-ar/src/register/armv8r/hacr.rs b/cortex-r/src/register/armv8r/hacr.rs → cortex-ar/src/register/armv8r/hacr.rs
diff --git a/cortex-r/src/register/armv8r/hactlr.rs → cortex-ar/src/register/armv8r/hactlr.rs b/cortex-r/src/register/armv8r/hactlr.rs → cortex-ar/src/register/armv8r/hactlr.rs
diff --git a/cortex-r/src/register/armv8r/hactlr2.rs → cortex-ar/src/register/armv8r/hactlr2.rs b/cortex-r/src/register/armv8r/hactlr2.rs → cortex-ar/src/register/armv8r/hactlr2.rs
diff --git a/cortex-r/src/register/armv8r/hadfsr.rs → cortex-ar/src/register/armv8r/hadfsr.rs b/cortex-r/src/register/armv8r/hadfsr.rs → cortex-ar/src/register/armv8r/hadfsr.rs
diff --git a/cortex-r/src/register/armv8r/haifsr.rs → cortex-ar/src/register/armv8r/haifsr.rs b/cortex-r/src/register/armv8r/haifsr.rs → cortex-ar/src/register/armv8r/haifsr.rs
diff --git a/cortex-r/src/register/armv8r/hamair0.rs → cortex-ar/src/register/armv8r/hamair0.rs b/cortex-r/src/register/armv8r/hamair0.rs → cortex-ar/src/register/armv8r/hamair0.rs
diff --git a/cortex-r/src/register/armv8r/hamair1.rs → cortex-ar/src/register/armv8r/hamair1.rs b/cortex-r/src/register/armv8r/hamair1.rs → cortex-ar/src/register/armv8r/hamair1.rs
diff --git a/cortex-r/src/register/armv8r/hcptr.rs → cortex-ar/src/register/armv8r/hcptr.rs b/cortex-r/src/register/armv8r/hcptr.rs → cortex-ar/src/register/armv8r/hcptr.rs
diff --git a/cortex-r/src/register/armv8r/hcr.rs → cortex-ar/src/register/armv8r/hcr.rs b/cortex-r/src/register/armv8r/hcr.rs → cortex-ar/src/register/armv8r/hcr.rs
diff --git a/cortex-r/src/register/armv8r/hcr2.rs → cortex-ar/src/register/armv8r/hcr2.rs b/cortex-r/src/register/armv8r/hcr2.rs → cortex-ar/src/register/armv8r/hcr2.rs
diff --git a/cortex-r/src/register/armv8r/hdcr.rs → cortex-ar/src/register/armv8r/hdcr.rs b/cortex-r/src/register/armv8r/hdcr.rs → cortex-ar/src/register/armv8r/hdcr.rs
diff --git a/cortex-r/src/register/armv8r/hdfar.rs → cortex-ar/src/register/armv8r/hdfar.rs b/cortex-r/src/register/armv8r/hdfar.rs → cortex-ar/src/register/armv8r/hdfar.rs
diff --git a/cortex-r/src/register/armv8r/hifar.rs → cortex-ar/src/register/armv8r/hifar.rs b/cortex-r/src/register/armv8r/hifar.rs → cortex-ar/src/register/armv8r/hifar.rs
diff --git a/cortex-r/src/register/armv8r/hmair0.rs → cortex-ar/src/register/armv8r/hmair0.rs b/cortex-r/src/register/armv8r/hmair0.rs → cortex-ar/src/register/armv8r/hmair0.rs
diff --git a/cortex-r/src/register/armv8r/hmair1.rs → cortex-ar/src/register/armv8r/hmair1.rs b/cortex-r/src/register/armv8r/hmair1.rs → cortex-ar/src/register/armv8r/hmair1.rs
diff --git a/cortex-r/src/register/armv8r/hmpuir.rs → cortex-ar/src/register/armv8r/hmpuir.rs b/cortex-r/src/register/armv8r/hmpuir.rs → cortex-ar/src/register/armv8r/hmpuir.rs
diff --git a/cortex-r/src/register/armv8r/hpfar.rs → cortex-ar/src/register/armv8r/hpfar.rs b/cortex-r/src/register/armv8r/hpfar.rs → cortex-ar/src/register/armv8r/hpfar.rs
diff --git a/cortex-r/src/register/armv8r/hprbar.rs → cortex-ar/src/register/armv8r/hprbar.rs b/cortex-r/src/register/armv8r/hprbar.rs → cortex-ar/src/register/armv8r/hprbar.rs
diff --git a/cortex-r/src/register/armv8r/hprbar0.rs → cortex-ar/src/register/armv8r/hprbar0.rs b/cortex-r/src/register/armv8r/hprbar0.rs → cortex-ar/src/register/armv8r/hprbar0.rs
diff --git a/cortex-r/src/register/armv8r/hprbar1.rs → cortex-ar/src/register/armv8r/hprbar1.rs b/cortex-r/src/register/armv8r/hprbar1.rs → cortex-ar/src/register/armv8r/hprbar1.rs
diff --git a/cortex-r/src/register/armv8r/hprbar10.rs → cortex-ar/src/register/armv8r/hprbar10.rs b/cortex-r/src/register/armv8r/hprbar10.rs → cortex-ar/src/register/armv8r/hprbar10.rs
diff --git a/cortex-r/src/register/armv8r/hprbar11.rs → cortex-ar/src/register/armv8r/hprbar11.rs b/cortex-r/src/register/armv8r/hprbar11.rs → cortex-ar/src/register/armv8r/hprbar11.rs
diff --git a/cortex-r/src/register/armv8r/hprbar12.rs → cortex-ar/src/register/armv8r/hprbar12.rs b/cortex-r/src/register/armv8r/hprbar12.rs → cortex-ar/src/register/armv8r/hprbar12.rs
diff --git a/cortex-r/src/register/armv8r/hprbar13.rs → cortex-ar/src/register/armv8r/hprbar13.rs b/cortex-r/src/register/armv8r/hprbar13.rs → cortex-ar/src/register/armv8r/hprbar13.rs
diff --git a/cortex-r/src/register/armv8r/hprbar14.rs → cortex-ar/src/register/armv8r/hprbar14.rs b/cortex-r/src/register/armv8r/hprbar14.rs → cortex-ar/src/register/armv8r/hprbar14.rs
diff --git a/cortex-r/src/register/armv8r/hprbar15.rs → cortex-ar/src/register/armv8r/hprbar15.rs b/cortex-r/src/register/armv8r/hprbar15.rs → cortex-ar/src/register/armv8r/hprbar15.rs
diff --git a/cortex-r/src/register/armv8r/hprbar2.rs → cortex-ar/src/register/armv8r/hprbar2.rs b/cortex-r/src/register/armv8r/hprbar2.rs → cortex-ar/src/register/armv8r/hprbar2.rs
diff --git a/cortex-r/src/register/armv8r/hprbar3.rs → cortex-ar/src/register/armv8r/hprbar3.rs b/cortex-r/src/register/armv8r/hprbar3.rs → cortex-ar/src/register/armv8r/hprbar3.rs
diff --git a/cortex-r/src/register/armv8r/hprbar4.rs → cortex-ar/src/register/armv8r/hprbar4.rs b/cortex-r/src/register/armv8r/hprbar4.rs → cortex-ar/src/register/armv8r/hprbar4.rs
diff --git a/cortex-r/src/register/armv8r/hprbar5.rs → cortex-ar/src/register/armv8r/hprbar5.rs b/cortex-r/src/register/armv8r/hprbar5.rs → cortex-ar/src/register/armv8r/hprbar5.rs
diff --git a/cortex-r/src/register/armv8r/hprbar6.rs → cortex-ar/src/register/armv8r/hprbar6.rs b/cortex-r/src/register/armv8r/hprbar6.rs → cortex-ar/src/register/armv8r/hprbar6.rs
diff --git a/cortex-r/src/register/armv8r/hprbar7.rs → cortex-ar/src/register/armv8r/hprbar7.rs b/cortex-r/src/register/armv8r/hprbar7.rs → cortex-ar/src/register/armv8r/hprbar7.rs
diff --git a/cortex-r/src/register/armv8r/hprbar8.rs → cortex-ar/src/register/armv8r/hprbar8.rs b/cortex-r/src/register/armv8r/hprbar8.rs → cortex-ar/src/register/armv8r/hprbar8.rs
diff --git a/cortex-r/src/register/armv8r/hprbar9.rs → cortex-ar/src/register/armv8r/hprbar9.rs b/cortex-r/src/register/armv8r/hprbar9.rs → cortex-ar/src/register/armv8r/hprbar9.rs
diff --git a/cortex-r/src/register/armv8r/hprenr.rs → cortex-ar/src/register/armv8r/hprenr.rs b/cortex-r/src/register/armv8r/hprenr.rs → cortex-ar/src/register/armv8r/hprenr.rs
diff --git a/cortex-r/src/register/armv8r/hprlar.rs → cortex-ar/src/register/armv8r/hprlar.rs b/cortex-r/src/register/armv8r/hprlar.rs → cortex-ar/src/register/armv8r/hprlar.rs
diff --git a/cortex-r/src/register/armv8r/hprlar0.rs → cortex-ar/src/register/armv8r/hprlar0.rs b/cortex-r/src/register/armv8r/hprlar0.rs → cortex-ar/src/register/armv8r/hprlar0.rs
diff --git a/cortex-r/src/register/armv8r/hprlar1.rs → cortex-ar/src/register/armv8r/hprlar1.rs b/cortex-r/src/register/armv8r/hprlar1.rs → cortex-ar/src/register/armv8r/hprlar1.rs
diff --git a/cortex-r/src/register/armv8r/hprlar10.rs → cortex-ar/src/register/armv8r/hprlar10.rs b/cortex-r/src/register/armv8r/hprlar10.rs → cortex-ar/src/register/armv8r/hprlar10.rs
diff --git a/cortex-r/src/register/armv8r/hprlar11.rs → cortex-ar/src/register/armv8r/hprlar11.rs b/cortex-r/src/register/armv8r/hprlar11.rs → cortex-ar/src/register/armv8r/hprlar11.rs
diff --git a/cortex-r/src/register/armv8r/hprlar12.rs → cortex-ar/src/register/armv8r/hprlar12.rs b/cortex-r/src/register/armv8r/hprlar12.rs → cortex-ar/src/register/armv8r/hprlar12.rs
diff --git a/cortex-r/src/register/armv8r/hprlar13.rs → cortex-ar/src/register/armv8r/hprlar13.rs b/cortex-r/src/register/armv8r/hprlar13.rs → cortex-ar/src/register/armv8r/hprlar13.rs
diff --git a/cortex-r/src/register/armv8r/hprlar14.rs → cortex-ar/src/register/armv8r/hprlar14.rs b/cortex-r/src/register/armv8r/hprlar14.rs → cortex-ar/src/register/armv8r/hprlar14.rs
diff --git a/cortex-r/src/register/armv8r/hprlar15.rs → cortex-ar/src/register/armv8r/hprlar15.rs b/cortex-r/src/register/armv8r/hprlar15.rs → cortex-ar/src/register/armv8r/hprlar15.rs
diff --git a/cortex-r/src/register/armv8r/hprlar2.rs → cortex-ar/src/register/armv8r/hprlar2.rs b/cortex-r/src/register/armv8r/hprlar2.rs → cortex-ar/src/register/armv8r/hprlar2.rs
diff --git a/cortex-r/src/register/armv8r/hprlar3.rs → cortex-ar/src/register/armv8r/hprlar3.rs b/cortex-r/src/register/armv8r/hprlar3.rs → cortex-ar/src/register/armv8r/hprlar3.rs
diff --git a/cortex-r/src/register/armv8r/hprlar4.rs → cortex-ar/src/register/armv8r/hprlar4.rs b/cortex-r/src/register/armv8r/hprlar4.rs → cortex-ar/src/register/armv8r/hprlar4.rs
diff --git a/cortex-r/src/register/armv8r/hprlar5.rs → cortex-ar/src/register/armv8r/hprlar5.rs b/cortex-r/src/register/armv8r/hprlar5.rs → cortex-ar/src/register/armv8r/hprlar5.rs
diff --git a/cortex-r/src/register/armv8r/hprlar6.rs → cortex-ar/src/register/armv8r/hprlar6.rs b/cortex-r/src/register/armv8r/hprlar6.rs → cortex-ar/src/register/armv8r/hprlar6.rs
diff --git a/cortex-r/src/register/armv8r/hprlar7.rs → cortex-ar/src/register/armv8r/hprlar7.rs b/cortex-r/src/register/armv8r/hprlar7.rs → cortex-ar/src/register/armv8r/hprlar7.rs
diff --git a/cortex-r/src/register/armv8r/hprlar8.rs → cortex-ar/src/register/armv8r/hprlar8.rs b/cortex-r/src/register/armv8r/hprlar8.rs → cortex-ar/src/register/armv8r/hprlar8.rs
diff --git a/cortex-r/src/register/armv8r/hprlar9.rs → cortex-ar/src/register/armv8r/hprlar9.rs b/cortex-r/src/register/armv8r/hprlar9.rs → cortex-ar/src/register/armv8r/hprlar9.rs
diff --git a/cortex-r/src/register/armv8r/hprselr.rs → cortex-ar/src/register/armv8r/hprselr.rs b/cortex-r/src/register/armv8r/hprselr.rs → cortex-ar/src/register/armv8r/hprselr.rs
diff --git a/cortex-r/src/register/armv8r/hsctlr.rs → cortex-ar/src/register/armv8r/hsctlr.rs b/cortex-r/src/register/armv8r/hsctlr.rs → cortex-ar/src/register/armv8r/hsctlr.rs
diff --git a/cortex-r/src/register/armv8r/hsr.rs → cortex-ar/src/register/armv8r/hsr.rs b/cortex-r/src/register/armv8r/hsr.rs → cortex-ar/src/register/armv8r/hsr.rs
diff --git a/cortex-r/src/register/armv8r/hstr.rs → cortex-ar/src/register/armv8r/hstr.rs b/cortex-r/src/register/armv8r/hstr.rs → cortex-ar/src/register/armv8r/hstr.rs
diff --git a/cortex-r/src/register/armv8r/htpidr.rs → cortex-ar/src/register/armv8r/htpidr.rs b/cortex-r/src/register/armv8r/htpidr.rs → cortex-ar/src/register/armv8r/htpidr.rs
diff --git a/cortex-r/src/register/armv8r/hvbar.rs → cortex-ar/src/register/armv8r/hvbar.rs b/cortex-r/src/register/armv8r/hvbar.rs → cortex-ar/src/register/armv8r/hvbar.rs
diff --git a/cortex-r/src/register/armv8r/mod.rs → cortex-ar/src/register/armv8r/mod.rs b/cortex-r/src/register/armv8r/mod.rs → cortex-ar/src/register/armv8r/mod.rs
diff --git a/cortex-r/src/register/armv8r/prbar.rs → cortex-ar/src/register/armv8r/prbar.rs b/cortex-r/src/register/armv8r/prbar.rs → cortex-ar/src/register/armv8r/prbar.rs
diff --git a/cortex-r/src/register/armv8r/prbar0.rs → cortex-ar/src/register/armv8r/prbar0.rs b/cortex-r/src/register/armv8r/prbar0.rs → cortex-ar/src/register/armv8r/prbar0.rs
diff --git a/cortex-r/src/register/armv8r/prbar1.rs → cortex-ar/src/register/armv8r/prbar1.rs b/cortex-r/src/register/armv8r/prbar1.rs → cortex-ar/src/register/armv8r/prbar1.rs
diff --git a/cortex-r/src/register/armv8r/prbar10.rs → cortex-ar/src/register/armv8r/prbar10.rs b/cortex-r/src/register/armv8r/prbar10.rs → cortex-ar/src/register/armv8r/prbar10.rs
diff --git a/cortex-r/src/register/armv8r/prbar11.rs → cortex-ar/src/register/armv8r/prbar11.rs b/cortex-r/src/register/armv8r/prbar11.rs → cortex-ar/src/register/armv8r/prbar11.rs
diff --git a/cortex-r/src/register/armv8r/prbar12.rs → cortex-ar/src/register/armv8r/prbar12.rs b/cortex-r/src/register/armv8r/prbar12.rs → cortex-ar/src/register/armv8r/prbar12.rs
diff --git a/cortex-r/src/register/armv8r/prbar13.rs → cortex-ar/src/register/armv8r/prbar13.rs b/cortex-r/src/register/armv8r/prbar13.rs → cortex-ar/src/register/armv8r/prbar13.rs
diff --git a/cortex-r/src/register/armv8r/prbar14.rs → cortex-ar/src/register/armv8r/prbar14.rs b/cortex-r/src/register/armv8r/prbar14.rs → cortex-ar/src/register/armv8r/prbar14.rs
diff --git a/cortex-r/src/register/armv8r/prbar15.rs → cortex-ar/src/register/armv8r/prbar15.rs b/cortex-r/src/register/armv8r/prbar15.rs → cortex-ar/src/register/armv8r/prbar15.rs
diff --git a/cortex-r/src/register/armv8r/prbar2.rs → cortex-ar/src/register/armv8r/prbar2.rs b/cortex-r/src/register/armv8r/prbar2.rs → cortex-ar/src/register/armv8r/prbar2.rs
diff --git a/cortex-r/src/register/armv8r/prbar3.rs → cortex-ar/src/register/armv8r/prbar3.rs b/cortex-r/src/register/armv8r/prbar3.rs → cortex-ar/src/register/armv8r/prbar3.rs
diff --git a/cortex-r/src/register/armv8r/prbar4.rs → cortex-ar/src/register/armv8r/prbar4.rs b/cortex-r/src/register/armv8r/prbar4.rs → cortex-ar/src/register/armv8r/prbar4.rs
diff --git a/cortex-r/src/register/armv8r/prbar5.rs → cortex-ar/src/register/armv8r/prbar5.rs b/cortex-r/src/register/armv8r/prbar5.rs → cortex-ar/src/register/armv8r/prbar5.rs
diff --git a/cortex-r/src/register/armv8r/prbar6.rs → cortex-ar/src/register/armv8r/prbar6.rs b/cortex-r/src/register/armv8r/prbar6.rs → cortex-ar/src/register/armv8r/prbar6.rs
diff --git a/cortex-r/src/register/armv8r/prbar7.rs → cortex-ar/src/register/armv8r/prbar7.rs b/cortex-r/src/register/armv8r/prbar7.rs → cortex-ar/src/register/armv8r/prbar7.rs
diff --git a/cortex-r/src/register/armv8r/prbar8.rs → cortex-ar/src/register/armv8r/prbar8.rs b/cortex-r/src/register/armv8r/prbar8.rs → cortex-ar/src/register/armv8r/prbar8.rs
diff --git a/cortex-r/src/register/armv8r/prbar9.rs → cortex-ar/src/register/armv8r/prbar9.rs b/cortex-r/src/register/armv8r/prbar9.rs → cortex-ar/src/register/armv8r/prbar9.rs
diff --git a/cortex-r/src/register/armv8r/prlar.rs → cortex-ar/src/register/armv8r/prlar.rs b/cortex-r/src/register/armv8r/prlar.rs → cortex-ar/src/register/armv8r/prlar.rs
diff --git a/cortex-r/src/register/armv8r/prlar0.rs → cortex-ar/src/register/armv8r/prlar0.rs b/cortex-r/src/register/armv8r/prlar0.rs → cortex-ar/src/register/armv8r/prlar0.rs
diff --git a/cortex-r/src/register/armv8r/prlar1.rs → cortex-ar/src/register/armv8r/prlar1.rs b/cortex-r/src/register/armv8r/prlar1.rs → cortex-ar/src/register/armv8r/prlar1.rs
diff --git a/cortex-r/src/register/armv8r/prlar10.rs → cortex-ar/src/register/armv8r/prlar10.rs b/cortex-r/src/register/armv8r/prlar10.rs → cortex-ar/src/register/armv8r/prlar10.rs
diff --git a/cortex-r/src/register/armv8r/prlar11.rs → cortex-ar/src/register/armv8r/prlar11.rs b/cortex-r/src/register/armv8r/prlar11.rs → cortex-ar/src/register/armv8r/prlar11.rs
diff --git a/cortex-r/src/register/armv8r/prlar12.rs → cortex-ar/src/register/armv8r/prlar12.rs b/cortex-r/src/register/armv8r/prlar12.rs → cortex-ar/src/register/armv8r/prlar12.rs
diff --git a/cortex-r/src/register/armv8r/prlar13.rs → cortex-ar/src/register/armv8r/prlar13.rs b/cortex-r/src/register/armv8r/prlar13.rs → cortex-ar/src/register/armv8r/prlar13.rs
diff --git a/cortex-r/src/register/armv8r/prlar14.rs → cortex-ar/src/register/armv8r/prlar14.rs b/cortex-r/src/register/armv8r/prlar14.rs → cortex-ar/src/register/armv8r/prlar14.rs
diff --git a/cortex-r/src/register/armv8r/prlar15.rs → cortex-ar/src/register/armv8r/prlar15.rs b/cortex-r/src/register/armv8r/prlar15.rs → cortex-ar/src/register/armv8r/prlar15.rs
diff --git a/cortex-r/src/register/armv8r/prlar2.rs → cortex-ar/src/register/armv8r/prlar2.rs b/cortex-r/src/register/armv8r/prlar2.rs → cortex-ar/src/register/armv8r/prlar2.rs
diff --git a/cortex-r/src/register/armv8r/prlar3.rs → cortex-ar/src/register/armv8r/prlar3.rs b/cortex-r/src/register/armv8r/prlar3.rs → cortex-ar/src/register/armv8r/prlar3.rs
diff --git a/cortex-r/src/register/armv8r/prlar4.rs → cortex-ar/src/register/armv8r/prlar4.rs b/cortex-r/src/register/armv8r/prlar4.rs → cortex-ar/src/register/armv8r/prlar4.rs
diff --git a/cortex-r/src/register/armv8r/prlar5.rs → cortex-ar/src/register/armv8r/prlar5.rs b/cortex-r/src/register/armv8r/prlar5.rs → cortex-ar/src/register/armv8r/prlar5.rs
diff --git a/cortex-r/src/register/armv8r/prlar6.rs → cortex-ar/src/register/armv8r/prlar6.rs b/cortex-r/src/register/armv8r/prlar6.rs → cortex-ar/src/register/armv8r/prlar6.rs
diff --git a/cortex-r/src/register/armv8r/prlar7.rs → cortex-ar/src/register/armv8r/prlar7.rs b/cortex-r/src/register/armv8r/prlar7.rs → cortex-ar/src/register/armv8r/prlar7.rs
diff --git a/cortex-r/src/register/armv8r/prlar8.rs → cortex-ar/src/register/armv8r/prlar8.rs b/cortex-r/src/register/armv8r/prlar8.rs → cortex-ar/src/register/armv8r/prlar8.rs
diff --git a/cortex-r/src/register/armv8r/prlar9.rs → cortex-ar/src/register/armv8r/prlar9.rs b/cortex-r/src/register/armv8r/prlar9.rs → cortex-ar/src/register/armv8r/prlar9.rs
diff --git a/cortex-r/src/register/armv8r/prselr.rs → cortex-ar/src/register/armv8r/prselr.rs b/cortex-r/src/register/armv8r/prselr.rs → cortex-ar/src/register/armv8r/prselr.rs
diff --git a/cortex-r/src/register/armv8r/vbar.rs → cortex-ar/src/register/armv8r/vbar.rs b/cortex-r/src/register/armv8r/vbar.rs → cortex-ar/src/register/armv8r/vbar.rs
diff --git a/cortex-r/src/register/ccsidr.rs → cortex-ar/src/register/ccsidr.rs b/cortex-r/src/register/ccsidr.rs → cortex-ar/src/register/ccsidr.rs
diff --git a/cortex-r/src/register/clidr.rs → cortex-ar/src/register/clidr.rs b/cortex-r/src/register/clidr.rs → cortex-ar/src/register/clidr.rs
diff --git a/cortex-r/src/register/contextidr.rs → cortex-ar/src/register/contextidr.rs b/cortex-r/src/register/contextidr.rs → cortex-ar/src/register/contextidr.rs
diff --git a/cortex-r/src/register/cpacr.rs → cortex-ar/src/register/cpacr.rs b/cortex-r/src/register/cpacr.rs → cortex-ar/src/register/cpacr.rs
diff --git a/cortex-r/src/register/cpsr.rs → cortex-ar/src/register/cpsr.rs b/cortex-r/src/register/cpsr.rs → cortex-ar/src/register/cpsr.rs
diff --git a/cortex-r/src/register/csselr.rs → cortex-ar/src/register/csselr.rs b/cortex-r/src/register/csselr.rs → cortex-ar/src/register/csselr.rs
diff --git a/cortex-r/src/register/ctr.rs → cortex-ar/src/register/ctr.rs b/cortex-r/src/register/ctr.rs → cortex-ar/src/register/ctr.rs
diff --git a/cortex-r/src/register/dfar.rs → cortex-ar/src/register/dfar.rs b/cortex-r/src/register/dfar.rs → cortex-ar/src/register/dfar.rs
diff --git a/cortex-r/src/register/dfsr.rs → cortex-ar/src/register/dfsr.rs b/cortex-r/src/register/dfsr.rs → cortex-ar/src/register/dfsr.rs
diff --git a/cortex-r/src/register/dlr.rs → cortex-ar/src/register/dlr.rs b/cortex-r/src/register/dlr.rs → cortex-ar/src/register/dlr.rs
diff --git a/cortex-r/src/register/dracr.rs → cortex-ar/src/register/dracr.rs b/cortex-r/src/register/dracr.rs → cortex-ar/src/register/dracr.rs
diff --git a/cortex-r/src/register/drbar.rs → cortex-ar/src/register/drbar.rs b/cortex-r/src/register/drbar.rs → cortex-ar/src/register/drbar.rs
diff --git a/cortex-r/src/register/drsr.rs → cortex-ar/src/register/drsr.rs b/cortex-r/src/register/drsr.rs → cortex-ar/src/register/drsr.rs
diff --git a/cortex-r/src/register/dspsr.rs → cortex-ar/src/register/dspsr.rs b/cortex-r/src/register/dspsr.rs → cortex-ar/src/register/dspsr.rs
diff --git a/cortex-r/src/register/fcseidr.rs → cortex-ar/src/register/fcseidr.rs b/cortex-r/src/register/fcseidr.rs → cortex-ar/src/register/fcseidr.rs
diff --git a/cortex-r/src/register/icc_pmr.rs → cortex-ar/src/register/icc_pmr.rs b/cortex-r/src/register/icc_pmr.rs → cortex-ar/src/register/icc_pmr.rs
diff --git a/cortex-r/src/register/id_afr0.rs → cortex-ar/src/register/id_afr0.rs b/cortex-r/src/register/id_afr0.rs → cortex-ar/src/register/id_afr0.rs
diff --git a/cortex-r/src/register/id_dfr0.rs → cortex-ar/src/register/id_dfr0.rs b/cortex-r/src/register/id_dfr0.rs → cortex-ar/src/register/id_dfr0.rs
diff --git a/cortex-r/src/register/id_isar0.rs → cortex-ar/src/register/id_isar0.rs b/cortex-r/src/register/id_isar0.rs → cortex-ar/src/register/id_isar0.rs
diff --git a/cortex-r/src/register/id_isar1.rs → cortex-ar/src/register/id_isar1.rs b/cortex-r/src/register/id_isar1.rs → cortex-ar/src/register/id_isar1.rs
diff --git a/cortex-r/src/register/id_isar2.rs → cortex-ar/src/register/id_isar2.rs b/cortex-r/src/register/id_isar2.rs → cortex-ar/src/register/id_isar2.rs
diff --git a/cortex-r/src/register/id_isar3.rs → cortex-ar/src/register/id_isar3.rs b/cortex-r/src/register/id_isar3.rs → cortex-ar/src/register/id_isar3.rs
diff --git a/cortex-r/src/register/id_isar4.rs → cortex-ar/src/register/id_isar4.rs b/cortex-r/src/register/id_isar4.rs → cortex-ar/src/register/id_isar4.rs
diff --git a/cortex-r/src/register/id_isar5.rs → cortex-ar/src/register/id_isar5.rs b/cortex-r/src/register/id_isar5.rs → cortex-ar/src/register/id_isar5.rs
diff --git a/cortex-r/src/register/id_mmfr0.rs → cortex-ar/src/register/id_mmfr0.rs b/cortex-r/src/register/id_mmfr0.rs → cortex-ar/src/register/id_mmfr0.rs
diff --git a/cortex-r/src/register/id_mmfr1.rs → cortex-ar/src/register/id_mmfr1.rs b/cortex-r/src/register/id_mmfr1.rs → cortex-ar/src/register/id_mmfr1.rs
diff --git a/cortex-r/src/register/id_mmfr2.rs → cortex-ar/src/register/id_mmfr2.rs b/cortex-r/src/register/id_mmfr2.rs → cortex-ar/src/register/id_mmfr2.rs
diff --git a/cortex-r/src/register/id_mmfr3.rs → cortex-ar/src/register/id_mmfr3.rs b/cortex-r/src/register/id_mmfr3.rs → cortex-ar/src/register/id_mmfr3.rs
diff --git a/cortex-r/src/register/id_mmfr4.rs → cortex-ar/src/register/id_mmfr4.rs b/cortex-r/src/register/id_mmfr4.rs → cortex-ar/src/register/id_mmfr4.rs
diff --git a/cortex-r/src/register/id_pfr0.rs → cortex-ar/src/register/id_pfr0.rs b/cortex-r/src/register/id_pfr0.rs → cortex-ar/src/register/id_pfr0.rs
diff --git a/cortex-r/src/register/id_pfr1.rs → cortex-ar/src/register/id_pfr1.rs b/cortex-r/src/register/id_pfr1.rs → cortex-ar/src/register/id_pfr1.rs
diff --git a/cortex-r/src/register/ifar.rs → cortex-ar/src/register/ifar.rs b/cortex-r/src/register/ifar.rs → cortex-ar/src/register/ifar.rs
diff --git a/cortex-r/src/register/ifsr.rs → cortex-ar/src/register/ifsr.rs b/cortex-r/src/register/ifsr.rs → cortex-ar/src/register/ifsr.rs
diff --git a/cortex-r/src/register/imp/imp_atcmregionr.rs → ...ex-ar/src/register/imp/imp_atcmregionr.rs b/cortex-r/src/register/imp/imp_atcmregionr.rs → ...ex-ar/src/register/imp/imp_atcmregionr.rs
diff --git a/cortex-r/src/register/imp/imp_bpctlr.rs → cortex-ar/src/register/imp/imp_bpctlr.rs b/cortex-r/src/register/imp/imp_bpctlr.rs → cortex-ar/src/register/imp/imp_bpctlr.rs
diff --git a/cortex-r/src/register/imp/imp_btcmregionr.rs → ...ex-ar/src/register/imp/imp_btcmregionr.rs b/cortex-r/src/register/imp/imp_btcmregionr.rs → ...ex-ar/src/register/imp/imp_btcmregionr.rs
diff --git a/cortex-r/src/register/imp/imp_buildoptr.rs → cortex-ar/src/register/imp/imp_buildoptr.rs b/cortex-r/src/register/imp/imp_buildoptr.rs → cortex-ar/src/register/imp/imp_buildoptr.rs
diff --git a/cortex-r/src/register/imp/imp_bustimeoutr.rs → ...ex-ar/src/register/imp/imp_bustimeoutr.rs b/cortex-r/src/register/imp/imp_bustimeoutr.rs → ...ex-ar/src/register/imp/imp_bustimeoutr.rs
diff --git a/cortex-r/src/register/imp/imp_cbar.rs → cortex-ar/src/register/imp/imp_cbar.rs b/cortex-r/src/register/imp/imp_cbar.rs → cortex-ar/src/register/imp/imp_cbar.rs
diff --git a/cortex-r/src/register/imp/imp_cdbgdcd.rs → cortex-ar/src/register/imp/imp_cdbgdcd.rs b/cortex-r/src/register/imp/imp_cdbgdcd.rs → cortex-ar/src/register/imp/imp_cdbgdcd.rs
diff --git a/cortex-r/src/register/imp/imp_cdbgdci.rs → cortex-ar/src/register/imp/imp_cdbgdci.rs b/cortex-r/src/register/imp/imp_cdbgdci.rs → cortex-ar/src/register/imp/imp_cdbgdci.rs
diff --git a/cortex-r/src/register/imp/imp_cdbgdct.rs → cortex-ar/src/register/imp/imp_cdbgdct.rs b/cortex-r/src/register/imp/imp_cdbgdct.rs → cortex-ar/src/register/imp/imp_cdbgdct.rs
diff --git a/cortex-r/src/register/imp/imp_cdbgdr0.rs → cortex-ar/src/register/imp/imp_cdbgdr0.rs b/cortex-r/src/register/imp/imp_cdbgdr0.rs → cortex-ar/src/register/imp/imp_cdbgdr0.rs
diff --git a/cortex-r/src/register/imp/imp_cdbgdr1.rs → cortex-ar/src/register/imp/imp_cdbgdr1.rs b/cortex-r/src/register/imp/imp_cdbgdr1.rs → cortex-ar/src/register/imp/imp_cdbgdr1.rs
diff --git a/cortex-r/src/register/imp/imp_cdbgdr2.rs → cortex-ar/src/register/imp/imp_cdbgdr2.rs b/cortex-r/src/register/imp/imp_cdbgdr2.rs → cortex-ar/src/register/imp/imp_cdbgdr2.rs
diff --git a/cortex-r/src/register/imp/imp_cdbgicd.rs → cortex-ar/src/register/imp/imp_cdbgicd.rs b/cortex-r/src/register/imp/imp_cdbgicd.rs → cortex-ar/src/register/imp/imp_cdbgicd.rs
diff --git a/cortex-r/src/register/imp/imp_cdbgict.rs → cortex-ar/src/register/imp/imp_cdbgict.rs b/cortex-r/src/register/imp/imp_cdbgict.rs → cortex-ar/src/register/imp/imp_cdbgict.rs
diff --git a/cortex-r/src/register/imp/imp_csctlr.rs → cortex-ar/src/register/imp/imp_csctlr.rs b/cortex-r/src/register/imp/imp_csctlr.rs → cortex-ar/src/register/imp/imp_csctlr.rs
diff --git a/cortex-r/src/register/imp/imp_ctcmregionr.rs → ...ex-ar/src/register/imp/imp_ctcmregionr.rs b/cortex-r/src/register/imp/imp_ctcmregionr.rs → ...ex-ar/src/register/imp/imp_ctcmregionr.rs
diff --git a/cortex-r/src/register/imp/imp_dcerr0.rs → cortex-ar/src/register/imp/imp_dcerr0.rs b/cortex-r/src/register/imp/imp_dcerr0.rs → cortex-ar/src/register/imp/imp_dcerr0.rs
diff --git a/cortex-r/src/register/imp/imp_dcerr1.rs → cortex-ar/src/register/imp/imp_dcerr1.rs b/cortex-r/src/register/imp/imp_dcerr1.rs → cortex-ar/src/register/imp/imp_dcerr1.rs
diff --git a/cortex-r/src/register/imp/imp_flasherr0.rs → cortex-ar/src/register/imp/imp_flasherr0.rs b/cortex-r/src/register/imp/imp_flasherr0.rs → cortex-ar/src/register/imp/imp_flasherr0.rs
diff --git a/cortex-r/src/register/imp/imp_flasherr1.rs → cortex-ar/src/register/imp/imp_flasherr1.rs b/cortex-r/src/register/imp/imp_flasherr1.rs → cortex-ar/src/register/imp/imp_flasherr1.rs
diff --git a/...-r/src/register/imp/imp_flashifregionr.rs → ...ar/src/register/imp/imp_flashifregionr.rs b/...-r/src/register/imp/imp_flashifregionr.rs → ...ar/src/register/imp/imp_flashifregionr.rs
diff --git a/cortex-r/src/register/imp/imp_icerr0.rs → cortex-ar/src/register/imp/imp_icerr0.rs b/cortex-r/src/register/imp/imp_icerr0.rs → cortex-ar/src/register/imp/imp_icerr0.rs
diff --git a/cortex-r/src/register/imp/imp_icerr1.rs → cortex-ar/src/register/imp/imp_icerr1.rs b/cortex-r/src/register/imp/imp_icerr1.rs → cortex-ar/src/register/imp/imp_icerr1.rs
diff --git a/cortex-r/src/register/imp/imp_intmonr.rs → cortex-ar/src/register/imp/imp_intmonr.rs b/cortex-r/src/register/imp/imp_intmonr.rs → cortex-ar/src/register/imp/imp_intmonr.rs
diff --git a/cortex-r/src/register/imp/imp_memprotctlr.rs → ...ex-ar/src/register/imp/imp_memprotctlr.rs b/cortex-r/src/register/imp/imp_memprotctlr.rs → ...ex-ar/src/register/imp/imp_memprotctlr.rs
diff --git a/...-r/src/register/imp/imp_periphpregionr.rs → ...ar/src/register/imp/imp_periphpregionr.rs b/...-r/src/register/imp/imp_periphpregionr.rs → ...ar/src/register/imp/imp_periphpregionr.rs
diff --git a/cortex-r/src/register/imp/imp_pinoptr.rs → cortex-ar/src/register/imp/imp_pinoptr.rs b/cortex-r/src/register/imp/imp_pinoptr.rs → cortex-ar/src/register/imp/imp_pinoptr.rs
diff --git a/cortex-r/src/register/imp/imp_qosr.rs → cortex-ar/src/register/imp/imp_qosr.rs b/cortex-r/src/register/imp/imp_qosr.rs → cortex-ar/src/register/imp/imp_qosr.rs
diff --git a/cortex-r/src/register/imp/imp_slavepctlr.rs → cortex-ar/src/register/imp/imp_slavepctlr.rs b/cortex-r/src/register/imp/imp_slavepctlr.rs → cortex-ar/src/register/imp/imp_slavepctlr.rs
diff --git a/cortex-r/src/register/imp/imp_tcmerr0.rs → cortex-ar/src/register/imp/imp_tcmerr0.rs b/cortex-r/src/register/imp/imp_tcmerr0.rs → cortex-ar/src/register/imp/imp_tcmerr0.rs
diff --git a/cortex-r/src/register/imp/imp_tcmerr1.rs → cortex-ar/src/register/imp/imp_tcmerr1.rs b/cortex-r/src/register/imp/imp_tcmerr1.rs → cortex-ar/src/register/imp/imp_tcmerr1.rs
diff --git a/cortex-r/src/register/imp/imp_tcmsyndr0.rs → cortex-ar/src/register/imp/imp_tcmsyndr0.rs b/cortex-r/src/register/imp/imp_tcmsyndr0.rs → cortex-ar/src/register/imp/imp_tcmsyndr0.rs
diff --git a/cortex-r/src/register/imp/imp_tcmsyndr1.rs → cortex-ar/src/register/imp/imp_tcmsyndr1.rs b/cortex-r/src/register/imp/imp_tcmsyndr1.rs → cortex-ar/src/register/imp/imp_tcmsyndr1.rs
diff --git a/cortex-r/src/register/imp/imp_testr0.rs → cortex-ar/src/register/imp/imp_testr0.rs b/cortex-r/src/register/imp/imp_testr0.rs → cortex-ar/src/register/imp/imp_testr0.rs
diff --git a/cortex-r/src/register/imp/mod.rs → cortex-ar/src/register/imp/mod.rs b/cortex-r/src/register/imp/mod.rs → cortex-ar/src/register/imp/mod.rs
diff --git a/cortex-r/src/register/iracr.rs → cortex-ar/src/register/iracr.rs b/cortex-r/src/register/iracr.rs → cortex-ar/src/register/iracr.rs
diff --git a/cortex-r/src/register/irbar.rs → cortex-ar/src/register/irbar.rs b/cortex-r/src/register/irbar.rs → cortex-ar/src/register/irbar.rs
diff --git a/cortex-r/src/register/irsr.rs → cortex-ar/src/register/irsr.rs b/cortex-r/src/register/irsr.rs → cortex-ar/src/register/irsr.rs
diff --git a/cortex-r/src/register/mair0.rs → cortex-ar/src/register/mair0.rs b/cortex-r/src/register/mair0.rs → cortex-ar/src/register/mair0.rs
diff --git a/cortex-r/src/register/mair1.rs → cortex-ar/src/register/mair1.rs b/cortex-r/src/register/mair1.rs → cortex-ar/src/register/mair1.rs
diff --git a/cortex-r/src/register/midr.rs → cortex-ar/src/register/midr.rs b/cortex-r/src/register/midr.rs → cortex-ar/src/register/midr.rs
diff --git a/cortex-r/src/register/mod.rs → cortex-ar/src/register/mod.rs b/cortex-r/src/register/mod.rs → cortex-ar/src/register/mod.rs
diff --git a/cortex-r/src/register/mpidr.rs → cortex-ar/src/register/mpidr.rs b/cortex-r/src/register/mpidr.rs → cortex-ar/src/register/mpidr.rs
diff --git a/cortex-r/src/register/mpuir.rs → cortex-ar/src/register/mpuir.rs b/cortex-r/src/register/mpuir.rs → cortex-ar/src/register/mpuir.rs
diff --git a/cortex-r/src/register/nsacr.rs → cortex-ar/src/register/nsacr.rs b/cortex-r/src/register/nsacr.rs → cortex-ar/src/register/nsacr.rs
diff --git a/cortex-r/src/register/par.rs → cortex-ar/src/register/par.rs b/cortex-r/src/register/par.rs → cortex-ar/src/register/par.rs
diff --git a/cortex-r/src/register/pmccfiltr.rs → cortex-ar/src/register/pmccfiltr.rs b/cortex-r/src/register/pmccfiltr.rs → cortex-ar/src/register/pmccfiltr.rs
diff --git a/cortex-r/src/register/pmccntr.rs → cortex-ar/src/register/pmccntr.rs b/cortex-r/src/register/pmccntr.rs → cortex-ar/src/register/pmccntr.rs
diff --git a/cortex-r/src/register/pmceid0.rs → cortex-ar/src/register/pmceid0.rs b/cortex-r/src/register/pmceid0.rs → cortex-ar/src/register/pmceid0.rs
diff --git a/cortex-r/src/register/pmceid1.rs → cortex-ar/src/register/pmceid1.rs b/cortex-r/src/register/pmceid1.rs → cortex-ar/src/register/pmceid1.rs
diff --git a/cortex-r/src/register/pmcntenclr.rs → cortex-ar/src/register/pmcntenclr.rs b/cortex-r/src/register/pmcntenclr.rs → cortex-ar/src/register/pmcntenclr.rs
diff --git a/cortex-r/src/register/pmcntenset.rs → cortex-ar/src/register/pmcntenset.rs b/cortex-r/src/register/pmcntenset.rs → cortex-ar/src/register/pmcntenset.rs
diff --git a/cortex-r/src/register/pmcr.rs → cortex-ar/src/register/pmcr.rs b/cortex-r/src/register/pmcr.rs → cortex-ar/src/register/pmcr.rs
diff --git a/cortex-r/src/register/pmevcntr0.rs → cortex-ar/src/register/pmevcntr0.rs b/cortex-r/src/register/pmevcntr0.rs → cortex-ar/src/register/pmevcntr0.rs
diff --git a/cortex-r/src/register/pmevcntr1.rs → cortex-ar/src/register/pmevcntr1.rs b/cortex-r/src/register/pmevcntr1.rs → cortex-ar/src/register/pmevcntr1.rs
diff --git a/cortex-r/src/register/pmevcntr2.rs → cortex-ar/src/register/pmevcntr2.rs b/cortex-r/src/register/pmevcntr2.rs → cortex-ar/src/register/pmevcntr2.rs
diff --git a/cortex-r/src/register/pmevcntr3.rs → cortex-ar/src/register/pmevcntr3.rs b/cortex-r/src/register/pmevcntr3.rs → cortex-ar/src/register/pmevcntr3.rs
diff --git a/cortex-r/src/register/pmevtyper0.rs → cortex-ar/src/register/pmevtyper0.rs b/cortex-r/src/register/pmevtyper0.rs → cortex-ar/src/register/pmevtyper0.rs
diff --git a/cortex-r/src/register/pmevtyper1.rs → cortex-ar/src/register/pmevtyper1.rs b/cortex-r/src/register/pmevtyper1.rs → cortex-ar/src/register/pmevtyper1.rs
diff --git a/cortex-r/src/register/pmevtyper2.rs → cortex-ar/src/register/pmevtyper2.rs b/cortex-r/src/register/pmevtyper2.rs → cortex-ar/src/register/pmevtyper2.rs
diff --git a/cortex-r/src/register/pmevtyper3.rs → cortex-ar/src/register/pmevtyper3.rs b/cortex-r/src/register/pmevtyper3.rs → cortex-ar/src/register/pmevtyper3.rs
diff --git a/cortex-r/src/register/pmintenclr.rs → cortex-ar/src/register/pmintenclr.rs b/cortex-r/src/register/pmintenclr.rs → cortex-ar/src/register/pmintenclr.rs
diff --git a/cortex-r/src/register/pmintenset.rs → cortex-ar/src/register/pmintenset.rs b/cortex-r/src/register/pmintenset.rs → cortex-ar/src/register/pmintenset.rs
diff --git a/cortex-r/src/register/pmovsr.rs → cortex-ar/src/register/pmovsr.rs b/cortex-r/src/register/pmovsr.rs → cortex-ar/src/register/pmovsr.rs
diff --git a/cortex-r/src/register/pmovsset.rs → cortex-ar/src/register/pmovsset.rs b/cortex-r/src/register/pmovsset.rs → cortex-ar/src/register/pmovsset.rs
diff --git a/cortex-r/src/register/pmselr.rs → cortex-ar/src/register/pmselr.rs b/cortex-r/src/register/pmselr.rs → cortex-ar/src/register/pmselr.rs
diff --git a/cortex-r/src/register/pmswinc.rs → cortex-ar/src/register/pmswinc.rs b/cortex-r/src/register/pmswinc.rs → cortex-ar/src/register/pmswinc.rs
diff --git a/cortex-r/src/register/pmuserenr.rs → cortex-ar/src/register/pmuserenr.rs b/cortex-r/src/register/pmuserenr.rs → cortex-ar/src/register/pmuserenr.rs
diff --git a/cortex-r/src/register/pmxevcntr.rs → cortex-ar/src/register/pmxevcntr.rs b/cortex-r/src/register/pmxevcntr.rs → cortex-ar/src/register/pmxevcntr.rs
diff --git a/cortex-r/src/register/pmxevtyper.rs → cortex-ar/src/register/pmxevtyper.rs b/cortex-r/src/register/pmxevtyper.rs → cortex-ar/src/register/pmxevtyper.rs
diff --git a/cortex-r/src/register/revidr.rs → cortex-ar/src/register/revidr.rs b/cortex-r/src/register/revidr.rs → cortex-ar/src/register/revidr.rs
diff --git a/cortex-r/src/register/rgnr.rs → cortex-ar/src/register/rgnr.rs b/cortex-r/src/register/rgnr.rs → cortex-ar/src/register/rgnr.rs
diff --git a/cortex-r/src/register/rvbar.rs → cortex-ar/src/register/rvbar.rs b/cortex-r/src/register/rvbar.rs → cortex-ar/src/register/rvbar.rs
diff --git a/cortex-r/src/register/sctlr.rs → cortex-ar/src/register/sctlr.rs b/cortex-r/src/register/sctlr.rs → cortex-ar/src/register/sctlr.rs
diff --git a/cortex-r/src/register/tcmtr.rs → cortex-ar/src/register/tcmtr.rs b/cortex-r/src/register/tcmtr.rs → cortex-ar/src/register/tcmtr.rs
diff --git a/cortex-r/src/register/tlbtr.rs → cortex-ar/src/register/tlbtr.rs b/cortex-r/src/register/tlbtr.rs → cortex-ar/src/register/tlbtr.rs
diff --git a/cortex-r/src/register/tpidrprw.rs → cortex-ar/src/register/tpidrprw.rs b/cortex-r/src/register/tpidrprw.rs → cortex-ar/src/register/tpidrprw.rs
diff --git a/cortex-r/src/register/tpidruro.rs → cortex-ar/src/register/tpidruro.rs b/cortex-r/src/register/tpidruro.rs → cortex-ar/src/register/tpidruro.rs
diff --git a/cortex-r/src/register/tpidrurw.rs → cortex-ar/src/register/tpidrurw.rs b/cortex-r/src/register/tpidrurw.rs → cortex-ar/src/register/tpidrurw.rs
diff --git a/cortex-r/src/register/vmpidr.rs → cortex-ar/src/register/vmpidr.rs b/cortex-r/src/register/vmpidr.rs → cortex-ar/src/register/vmpidr.rs
diff --git a/cortex-r/src/register/vpidr.rs → cortex-ar/src/register/vpidr.rs b/cortex-r/src/register/vpidr.rs → cortex-ar/src/register/vpidr.rs
diff --git a/cortex-r/src/register/vsctlr.rs → cortex-ar/src/register/vsctlr.rs b/cortex-r/src/register/vsctlr.rs → cortex-ar/src/register/vsctlr.rs
diff --git a/cortex-r-examples/Cargo.toml b/cortex-r-examples/Cargo.toml
@@ -12,7 +12,7 @@ version = "0.1.0"
 
 [dependencies]
 arm-gic = {git = "https://github.com/google/arm-gic.git", rev = "46a8fc1720f5c28fccf4dfb5953b88dab7012e9c", optional = true}
-cortex-r = {path = "../cortex-r", features = ["critical-section-single-core"]}
+cortex-ar = {path = "../cortex-ar", features = ["critical-section-single-core"]}
 cortex-r-rt = {path = "../cortex-r-rt"}
 semihosting = {version = "0.1.18", features = ["stdio"]}
 

diff --git a/cortex-r-examples/src/bin/generic_timer.rs b/cortex-r-examples/src/bin/generic_timer.rs
@@ -26,8 +26,8 @@ fn main() {
 /// Let's test some timers!
 #[cfg(arm_architecture = "v8-r")]
 fn main() {
-    use cortex_r::generic_timer::{El1PhysicalTimer, El1VirtualTimer, GenericTimer};
-    let cntfrq = cortex_r::register::Cntfrq::read().0;
+    use cortex_ar::generic_timer::{El1PhysicalTimer, El1VirtualTimer, GenericTimer};
+    let cntfrq = cortex_ar::register::Cntfrq::read().0;
     println!("cntfrq = {:.03} MHz", cntfrq as f32 / 1_000_000.0);
 
     let delay_ticks = cntfrq * 2;

diff --git a/cortex-r-examples/src/bin/gic.rs b/cortex-r-examples/src/bin/gic.rs
@@ -4,7 +4,7 @@
 #![no_main]
 
 // pull in our start-up code
-use cortex_r as _;
+use cortex_ar as _;
 use cortex_r_examples as _;
 
 use arm_gic::{
@@ -33,7 +33,7 @@ const GICD_BASE_OFFSET: usize = 0x0000_0000usize;
 const GICR_BASE_OFFSET: usize = 0x0010_0000usize;
 
 fn dump_cpsr() {
-    let cpsr = cortex_r::register::Cpsr::read();
+    let cpsr = cortex_ar::register::Cpsr::read();
     println!("CPSR: {:?}", cpsr);
 }
 
@@ -42,7 +42,7 @@ fn dump_cpsr() {
 /// Called by [`kmain`].
 fn main() -> Result<(), core::fmt::Error> {
     // Get the GIC address by reading CBAR
-    let periphbase = cortex_r::register::ImpCbar::read().periphbase();
+    let periphbase = cortex_ar::register::ImpCbar::read().periphbase();
     println!("Found PERIPHBASE {:010p}", periphbase);
     let gicd_base = periphbase.wrapping_byte_add(GICD_BASE_OFFSET);
     let gicr_base = periphbase.wrapping_byte_add(GICR_BASE_OFFSET);
@@ -70,7 +70,7 @@ fn main() -> Result<(), core::fmt::Error> {
     println!("Enabling interrupts...");
     dump_cpsr();
     unsafe {
-        cortex_r::interrupt::enable();
+        cortex_ar::interrupt::enable();
     }
     dump_cpsr();
 
@@ -87,7 +87,7 @@ fn main() -> Result<(), core::fmt::Error> {
     );
 
     for _ in 0..1_000_000 {
-        cortex_r::asm::nop();
+        cortex_ar::asm::nop();
     }
 
     Ok(())

diff --git a/cortex-r-examples/src/bin/hello.rs b/cortex-r-examples/src/bin/hello.rs
@@ -4,7 +4,7 @@
 #![no_main]
 
 // pull in our start-up code
-use cortex_r as _;
+use cortex_ar as _;
 use cortex_r_examples as _;
 
 use semihosting::println;

diff --git a/cortex-r-examples/src/bin/registers.rs b/cortex-r-examples/src/bin/registers.rs
@@ -4,7 +4,7 @@
 #![no_main]
 
 // pull in our start-up code
-use cortex_r as _;
+use cortex_ar as _;
 use cortex_r_examples as _;
 
 use semihosting::println;
@@ -24,20 +24,20 @@ pub extern "C" fn kmain() {
 }
 
 fn chip_info() {
-    println!("{:?}", cortex_r::register::Midr::read());
-    println!("{:?}", cortex_r::register::Cpsr::read());
+    println!("{:?}", cortex_ar::register::Midr::read());
+    println!("{:?}", cortex_ar::register::Cpsr::read());
     #[cfg(arm_architecture = "v8-r")]
     {
-        println!("{:?}", cortex_r::register::ImpCbar::read());
-        println!("{:?}", cortex_r::register::Vbar::read());
+        println!("{:?}", cortex_ar::register::ImpCbar::read());
+        println!("{:?}", cortex_ar::register::Vbar::read());
         // This only works in EL2 and start-up put us in EL1
-        // println!("{:?}", cortex_r::register::Hvbar::read());
+        // println!("{:?}", cortex_ar::register::Hvbar::read());
     }
 }
 
 #[cfg(arm_architecture = "v7-r")]
 fn mpu_pmsa_v7() {
-    use cortex_r::{
+    use cortex_ar::{
         pmsav7::{CacheablePolicy, Config, MemAttr, Mpu, Region, RegionSize},
         register::Mpuir,
     };
@@ -90,7 +90,7 @@ fn mpu_pmsa_v7() {
 
 #[cfg(arm_architecture = "v8-r")]
 fn mpu_pmsa_v8() {
-    use cortex_r::{
+    use cortex_ar::{
         pmsav8::{
             AccessPerms, Cacheable, Config, El1Mpu, MemAttr, Region, RwAllocPolicy, Shareability,
         },
@@ -140,12 +140,12 @@ fn mpu_pmsa_v8() {
 fn test_changing_sctlr() {
     println!(
         "{:?} before setting C, I and Z",
-        cortex_r::register::Sctlr::read()
+        cortex_ar::register::Sctlr::read()
     );
-    cortex_r::register::Sctlr::modify(|w| {
+    cortex_ar::register::Sctlr::modify(|w| {
         w.set_c(true);
         w.set_i(true);
         w.set_z(true);
     });
-    println!("{:?} after", cortex_r::register::Sctlr::read());
+    println!("{:?} after", cortex_ar::register::Sctlr::read());
 }
diff --git a/cortex-r-examples/src/bin/svc.rs b/cortex-r-examples/src/bin/svc.rs
@@ -4,7 +4,7 @@
 #![no_main]
 
 // pull in our start-up code
-use cortex_r as _;
+use cortex_ar as _;
 use cortex_r_examples as _;
 
 use semihosting::println;
@@ -27,7 +27,7 @@ fn main() -> Result<(), core::fmt::Error> {
     let y = x + 1;
     let z = (y as f64) * 1.5;
     println!("x = {}, y = {}, z = {:0.3}", x, y, z);
-    cortex_r::svc!(0xABCDEF);
+    cortex_ar::svc!(0xABCDEF);
     println!("x = {}, y = {}, z = {:0.3}", x, y, z);
     panic!("I am an example panic");
 }
@@ -38,6 +38,6 @@ unsafe extern "C" fn _svc_handler(arg: u32) {
     println!("In _svc_handler, with arg={:#06x}", arg);
     if arg == 0xABCDEF {
         // test nested SVC calls
-        cortex_r::svc!(0x456789);
+        cortex_ar::svc!(0x456789);
     }
 }
diff --git a/cortex-r-rt/Cargo.toml b/cortex-r-rt/Cargo.toml
@@ -1,7 +1,22 @@
 [package]
-authors = ["Jonathan Pallant <jonathan.pallant@ferrous-systems.com>", "The Cortex-R Team <cortex-r@teams.rust-embedded.org>"]
+authors = [
+    "Jonathan Pallant <jonathan.pallant@ferrous-systems.com>",
+    "The Cortex-R Team <cortex-r@teams.rust-embedded.org>"
+]
+categories = [
+    "embedded",
+    "no-std",
+]
 description = "Run-time support for Arm Cortex-R"
 edition = "2021"
+keywords = [
+    "arm",
+    "cortex-r",
+    "embedded",
+    "no_std",
+    "no-std",
+    "run-time",
+]
 license = "MIT OR Apache-2.0"
 name = "cortex-r-rt"
 readme = "README.md"
@@ -10,7 +25,7 @@ rust-version = "1.82"
 version = "0.1.0"
 
 [dependencies]
-cortex-r = {version = "0.1.0", path = "../cortex-r"}
+cortex-ar = {version = "0.1.0", path = "../cortex-ar"}
 semihosting = {version = "0.1.18", features = ["stdio"]}
 
 [features]

diff --git a/cortex-r-rt/src/lib.rs b/cortex-r-rt/src/lib.rs
@@ -85,10 +85,10 @@
 
 #![no_std]
 
-use cortex_r::register::{cpsr::ProcessorMode, Cpsr};
+use cortex_ar::register::{cpsr::ProcessorMode, Cpsr};
 
 #[cfg(arm_architecture = "v8-r")]
-use cortex_r::register::Hactlr;
+use cortex_ar::register::Hactlr;
 
 /// Our default exception handler.
 ///
@@ -424,7 +424,7 @@ core::arch::global_asm!(
             .raw_value()
     },
     te_bit = const {
-        cortex_r::register::Sctlr::new_with_raw_value(0)
+        cortex_ar::register::Sctlr::new_with_raw_value(0)
             .with_te(true)
             .raw_value()
     }