Switch to tock-registers: Sources for tutorial 14

andre-richter · andre-richter · commit 7c0272c365d3 · 2021-07-06T23:22:56.000+02:00
diff --git a/14_virtual_mem_part2_mmio_remap/Cargo.lock b/14_virtual_mem_part2_mmio_remap/Cargo.lock
diff --git a/14_virtual_mem_part2_mmio_remap/Cargo.toml b/14_virtual_mem_part2_mmio_remap/Cargo.toml
@@ -9,8 +9,8 @@ lto = true
 
 [features]
 default = []
-bsp_rpi3 = ["register"]
-bsp_rpi4 = ["register"]
+bsp_rpi3 = ["tock-registers"]
+bsp_rpi4 = ["tock-registers"]
 test_build = ["qemu-exit"]
 
 ##--------------------------------------------------------------------------------------------------
@@ -21,12 +21,12 @@ test_build = ["qemu-exit"]
 test-types = { path = "test-types" }
 
 # Optional dependencies
-register = { version = "1.x.x", features = ["no_std_unit_tests"], optional = true }
-qemu-exit = { version = "1.x.x", optional = true }
+tock-registers = { version = "0.7.x", default-features = false, features = ["register_types"], optional = true }
+qemu-exit = { version = "2.x.x", optional = true }
 
 # Platform specific dependencies
 [target.'cfg(target_arch = "aarch64")'.dependencies]
-cortex-a = { version = "5.x.x" }
+cortex-a = { version = "6.x.x" }
 
 ##--------------------------------------------------------------------------------------------------
 ## Testing
diff --git a/14_virtual_mem_part2_mmio_remap/src/_arch/aarch64/cpu/boot.rs b/14_virtual_mem_part2_mmio_remap/src/_arch/aarch64/cpu/boot.rs
@@ -11,7 +11,8 @@
 //!
 //! crate::cpu::boot::arch_boot
 
-use cortex_a::{asm, regs::*};
+use cortex_a::{asm, registers::*};
+use tock_registers::interfaces::Writeable;
 
 // Assembly counterpart to this file.
 global_asm!(include_str!("boot.s"));
diff --git a/14_virtual_mem_part2_mmio_remap/src/_arch/aarch64/cpu/smp.rs b/14_virtual_mem_part2_mmio_remap/src/_arch/aarch64/cpu/smp.rs
@@ -11,7 +11,8 @@
 //!
 //! crate::cpu::smp::arch_smp
 
-use cortex_a::regs::*;
+use cortex_a::registers::*;
+use tock_registers::interfaces::Readable;
 
 //--------------------------------------------------------------------------------------------------
 // Public Code
diff --git a/14_virtual_mem_part2_mmio_remap/src/_arch/aarch64/exception.rs b/14_virtual_mem_part2_mmio_remap/src/_arch/aarch64/exception.rs
@@ -17,8 +17,11 @@ use crate::{
     memory::Address,
 };
 use core::{cell::UnsafeCell, fmt};
-use cortex_a::{barrier, regs::*};
-use register::InMemoryRegister;
+use cortex_a::{asm::barrier, registers::*};
+use tock_registers::{
+    interfaces::{Readable, Writeable},
+    registers::InMemoryRegister,
+};
 
 // Assembly counterpart to this file.
 global_asm!(include_str!("exception.s"));
diff --git a/14_virtual_mem_part2_mmio_remap/src/_arch/aarch64/exception/asynchronous.rs b/14_virtual_mem_part2_mmio_remap/src/_arch/aarch64/exception/asynchronous.rs
@@ -11,7 +11,8 @@
 //!
 //! crate::exception::asynchronous::arch_asynchronous
 
-use cortex_a::regs::*;
+use cortex_a::registers::*;
+use tock_registers::interfaces::{Readable, Writeable};
 
 //--------------------------------------------------------------------------------------------------
 // Private Definitions
@@ -22,7 +23,7 @@ mod daif_bits {
 }
 
 trait DaifField {
-    fn daif_field() -> register::Field<u64, DAIF::Register>;
+    fn daif_field() -> tock_registers::fields::Field<u64, DAIF::Register>;
 }
 
 struct Debug;
@@ -35,25 +36,25 @@ struct FIQ;
 //--------------------------------------------------------------------------------------------------
 
 impl DaifField for Debug {
-    fn daif_field() -> register::Field<u64, DAIF::Register> {
+    fn daif_field() -> tock_registers::fields::Field<u64, DAIF::Register> {
         DAIF::D
     }
 }
 
 impl DaifField for SError {
-    fn daif_field() -> register::Field<u64, DAIF::Register> {
+    fn daif_field() -> tock_registers::fields::Field<u64, DAIF::Register> {
         DAIF::A
     }
 }
 
 impl DaifField for IRQ {
-    fn daif_field() -> register::Field<u64, DAIF::Register> {
+    fn daif_field() -> tock_registers::fields::Field<u64, DAIF::Register> {
         DAIF::I
     }
 }
 
 impl DaifField for FIQ {
-    fn daif_field() -> register::Field<u64, DAIF::Register> {
+    fn daif_field() -> tock_registers::fields::Field<u64, DAIF::Register> {
         DAIF::F
     }
 }
diff --git a/14_virtual_mem_part2_mmio_remap/src/_arch/aarch64/memory/mmu.rs b/14_virtual_mem_part2_mmio_remap/src/_arch/aarch64/memory/mmu.rs
@@ -18,7 +18,8 @@ use crate::{
     memory::{mmu::TranslationGranule, Address, Physical},
 };
 use core::intrinsics::unlikely;
-use cortex_a::{barrier, regs::*};
+use cortex_a::{asm::barrier, registers::*};
+use tock_registers::interfaces::{ReadWriteable, Readable, Writeable};
 
 //--------------------------------------------------------------------------------------------------
 // Private Definitions
diff --git a/14_virtual_mem_part2_mmio_remap/src/_arch/aarch64/memory/mmu/translation_table.rs b/14_virtual_mem_part2_mmio_remap/src/_arch/aarch64/memory/mmu/translation_table.rs
@@ -24,7 +24,11 @@ use crate::{
     },
 };
 use core::convert;
-use register::{register_bitfields, InMemoryRegister};
+use tock_registers::{
+    interfaces::{Readable, Writeable},
+    register_bitfields,
+    registers::InMemoryRegister,
+};
 
 //--------------------------------------------------------------------------------------------------
 // Private Definitions
@@ -181,7 +185,7 @@ impl TableDescriptor {
 
 /// Convert the kernel's generic memory attributes to HW-specific attributes of the MMU.
 impl convert::From<AttributeFields>
-    for register::FieldValue<u64, STAGE1_PAGE_DESCRIPTOR::Register>
+    for tock_registers::fields::FieldValue<u64, STAGE1_PAGE_DESCRIPTOR::Register>
 {
     fn from(attribute_fields: AttributeFields) -> Self {
         // Memory attributes.
@@ -389,7 +393,7 @@ impl<const NUM_TABLES: usize> memory::mmu::translation_table::interface::Transla
                 return Err("Virtual page is already mapped");
             }
 
-            *page_descriptor = PageDescriptor::from_output_addr(phys_page.as_ptr(), &attr);
+            *page_descriptor = PageDescriptor::from_output_addr(phys_page.as_ptr(), attr);
         }
 
         Ok(())
diff --git a/14_virtual_mem_part2_mmio_remap/src/_arch/aarch64/time.rs b/14_virtual_mem_part2_mmio_remap/src/_arch/aarch64/time.rs
@@ -13,7 +13,8 @@
 
 use crate::{time, warn};
 use core::time::Duration;
-use cortex_a::{barrier, regs::*};
+use cortex_a::{asm::barrier, registers::*};
+use tock_registers::interfaces::{ReadWriteable, Readable, Writeable};
 
 //--------------------------------------------------------------------------------------------------
 // Private Definitions
diff --git a/14_virtual_mem_part2_mmio_remap/src/bsp/device_driver/arm/gicv2/gicc.rs b/14_virtual_mem_part2_mmio_remap/src/bsp/device_driver/arm/gicv2/gicc.rs
@@ -7,7 +7,11 @@
 use crate::{
     bsp::device_driver::common::MMIODerefWrapper, exception, synchronization::InitStateLock,
 };
-use register::{mmio::*, register_bitfields, register_structs};
+use tock_registers::{
+    interfaces::{Readable, Writeable},
+    register_bitfields, register_structs,
+    registers::ReadWrite,
+};
 
 //--------------------------------------------------------------------------------------------------
 // Private Definitions
diff --git a/14_virtual_mem_part2_mmio_remap/src/bsp/device_driver/arm/gicv2/gicd.rs b/14_virtual_mem_part2_mmio_remap/src/bsp/device_driver/arm/gicv2/gicd.rs
@@ -12,7 +12,11 @@ use crate::{
     state, synchronization,
     synchronization::{IRQSafeNullLock, InitStateLock},
 };
-use register::{mmio::*, register_bitfields, register_structs};
+use tock_registers::{
+    interfaces::{Readable, Writeable},
+    register_bitfields, register_structs,
+    registers::{ReadOnly, ReadWrite},
+};
 
 //--------------------------------------------------------------------------------------------------
 // Private Definitions
diff --git a/14_virtual_mem_part2_mmio_remap/src/bsp/device_driver/bcm/bcm2xxx_gpio.rs b/14_virtual_mem_part2_mmio_remap/src/bsp/device_driver/bcm/bcm2xxx_gpio.rs
@@ -9,7 +9,11 @@ use crate::{
     synchronization::IRQSafeNullLock,
 };
 use core::sync::atomic::{AtomicUsize, Ordering};
-use register::{mmio::*, register_bitfields, register_structs};
+use tock_registers::{
+    interfaces::{ReadWriteable, Writeable},
+    register_bitfields, register_structs,
+    registers::ReadWrite,
+};
 
 //--------------------------------------------------------------------------------------------------
 // Private Definitions
diff --git a/14_virtual_mem_part2_mmio_remap/src/bsp/device_driver/bcm/bcm2xxx_interrupt_controller/peripheral_ic.rs b/14_virtual_mem_part2_mmio_remap/src/bsp/device_driver/bcm/bcm2xxx_interrupt_controller/peripheral_ic.rs
@@ -10,7 +10,11 @@ use crate::{
     driver, exception, memory, synchronization,
     synchronization::{IRQSafeNullLock, InitStateLock},
 };
-use register::{mmio::*, register_structs};
+use tock_registers::{
+    interfaces::{Readable, Writeable},
+    register_structs,
+    registers::{ReadOnly, WriteOnly},
+};
 
 //--------------------------------------------------------------------------------------------------
 // Private Definitions
diff --git a/14_virtual_mem_part2_mmio_remap/src/bsp/device_driver/bcm/bcm2xxx_pl011_uart.rs b/14_virtual_mem_part2_mmio_remap/src/bsp/device_driver/bcm/bcm2xxx_pl011_uart.rs
@@ -17,7 +17,11 @@ use core::{
     fmt,
     sync::atomic::{AtomicUsize, Ordering},
 };
-use register::{mmio::*, register_bitfields, register_structs};
+use tock_registers::{
+    interfaces::{Readable, Writeable},
+    register_bitfields, register_structs,
+    registers::{ReadOnly, ReadWrite, WriteOnly},
+};
 
 //--------------------------------------------------------------------------------------------------
 // Private Definitions
@@ -84,6 +88,7 @@ register_bitfields! {
     LCR_H [
         /// Word length. These bits indicate the number of data bits transmitted or received in a
         /// frame.
+        #[allow(clippy::enum_variant_names)]
         WLEN OFFSET(5) NUMBITS(2) [
             FiveBit = 0b00,
             SixBit = 0b01,
diff --git a/14_virtual_mem_part2_mmio_remap/src/lib.rs b/14_virtual_mem_part2_mmio_remap/src/lib.rs
@@ -110,8 +110,8 @@
 #![allow(incomplete_features)]
 #![feature(asm)]
 #![feature(const_evaluatable_checked)]
-#![feature(const_fn)]
 #![feature(const_fn_fn_ptr_basics)]
+#![feature(const_fn_trait_bound)]
 #![feature(const_generics)]
 #![feature(const_panic)]
 #![feature(core_intrinsics)]

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,8 @@`
`11`	`11`	`//!`
`12`	`12`	`//! crate::exception::asynchronous::arch_asynchronous`
`13`	`13`
`14`		`-use cortex_a::regs::*;`
	`14`	`+use cortex_a::registers::*;`
	`15`	`+use tock_registers::interfaces::{Readable, Writeable};`
`15`	`16`
`16`	`17`	`//--------------------------------------------------------------------------------------------------`
`17`	`18`	`// Private Definitions`
`@@ -22,7 +23,7 @@ mod daif_bits {`
`22`	`23`	`}`
`23`	`24`
`24`	`25`	`trait DaifField {`
`25`		`- fn daif_field() -> register::Field<u64, DAIF::Register>;`
	`26`	`+ fn daif_field() -> tock_registers::fields::Field<u64, DAIF::Register>;`
`26`	`27`	`}`
`27`	`28`
`28`	`29`	`struct Debug;`
`@@ -35,25 +36,25 @@ struct FIQ;`
`35`	`36`	`//--------------------------------------------------------------------------------------------------`
`36`	`37`
`37`	`38`	`impl DaifField for Debug {`
`38`		`- fn daif_field() -> register::Field<u64, DAIF::Register> {`
	`39`	`+ fn daif_field() -> tock_registers::fields::Field<u64, DAIF::Register> {`
`39`	`40`	`DAIF::D`
`40`	`41`	`}`
`41`	`42`	`}`
`42`	`43`
`43`	`44`	`impl DaifField for SError {`
`44`		`- fn daif_field() -> register::Field<u64, DAIF::Register> {`
	`45`	`+ fn daif_field() -> tock_registers::fields::Field<u64, DAIF::Register> {`
`45`	`46`	`DAIF::A`
`46`	`47`	`}`
`47`	`48`	`}`
`48`	`49`
`49`	`50`	`impl DaifField for IRQ {`
`50`		`- fn daif_field() -> register::Field<u64, DAIF::Register> {`
	`51`	`+ fn daif_field() -> tock_registers::fields::Field<u64, DAIF::Register> {`
`51`	`52`	`DAIF::I`
`52`	`53`	`}`
`53`	`54`	`}`
`54`	`55`
`55`	`56`	`impl DaifField for FIQ {`
`56`		`- fn daif_field() -> register::Field<u64, DAIF::Register> {`
	`57`	`+ fn daif_field() -> tock_registers::fields::Field<u64, DAIF::Register> {`
`57`	`58`	`DAIF::F`
`58`	`59`	`}`
`59`	`60`	`}`