From 1e16beb70795b8761b6b3e3e729a0e45c96b6810 Mon Sep 17 00:00:00 2001
From: Astro <astro@spaceboyz.net>
Date: Wed, 12 Jun 2019 00:20:23 +0200
Subject: [PATCH] cortex_a9::regs: use crate::regs interface

---
 src/cortex_a9/regs.rs | 47 ++++++++++++++++++++++++++-----------------
 src/main.rs           |  7 ++++---
 2 files changed, 32 insertions(+), 22 deletions(-)

diff --git a/src/cortex_a9/regs.rs b/src/cortex_a9/regs.rs
index 15f1560..8cef265 100644
--- a/src/cortex_a9/regs.rs
+++ b/src/cortex_a9/regs.rs
@@ -1,12 +1,12 @@
-pub trait ReadableRegister<T> {
-    fn get(&self) -> T;
-}
+use crate::regs::{RegisterR, RegisterW};
 
 macro_rules! def_reg_get {
-    ($name:ty, $type:ty, $asm_instr:tt) => {
-        impl ReadableRegister<$type> for $name {
+    ($name:tt, $type: ty, $asm_instr:tt) => {
+        impl RegisterR for $name {
+            type R = $type;
+
             #[inline(always)]
-            fn get(&self) -> $type {
+            fn read(&self) -> Self::R {
                 let mut value;
                 unsafe { asm!($asm_instr : "=r" (value) ::: "volatile") }
                 value
@@ -15,17 +15,19 @@ macro_rules! def_reg_get {
     }
 }
 
-pub trait WritableRegister<T> {
-    fn set(&self, value: T);
-}
-
 macro_rules! def_reg_set {
     ($name:ty, $type:ty, $asm_instr:tt) => {
-        impl WritableRegister<$type> for $name {
+        impl RegisterW for $name {
+            type W = $type;
+
             #[inline(always)]
-            fn set(&self, value: $type) {
+            fn write(&mut self, value: Self::W) {
                 unsafe { asm!($asm_instr :: "r" (value) :: "volatile") }
             }
+
+            fn zeroed() -> Self::W {
+                0
+            }
         }
     }
 }
@@ -43,7 +45,18 @@ def_reg_set!(LR, u32, "mov lr, $0");
 pub struct MPIDR;
 def_reg_get!(MPIDR, u32, "mrc p15, 0, $0, c0, c0, 5");
 
+pub struct DFAR;
+def_reg_get!(DFAR, u32, "mrc p15, 0, $0, c6, c0, 0");
+
+pub struct DFSR;
+def_reg_get!(DFSR, u32, "mrc p15, 0, $0, c5, c0, 0");
+
+pub struct SCTLR;
+def_reg_get!(SCTLR, u32, "mrc p15, 0, $0, c1, c0, 0");
+def_reg_set!(SCTLR, u32, "mcr p15, 0, $0, c1, c0, 0");
+
 /// Invalidate TLBs
+#[inline(always)]
 pub fn tlbiall() {
     unsafe {
         asm!("mcr p15, 0, $0, c8, c7, 0" :: "r" (0) :: "volatile");
@@ -51,6 +64,7 @@ pub fn tlbiall() {
 }
 
 /// Invalidate I-Cache
+#[inline(always)]
 pub fn iciallu() {
     unsafe {
         asm!("mcr p15, 0, $0, c7, c5, 0" :: "r" (0) :: "volatile");
@@ -58,6 +72,7 @@ pub fn iciallu() {
 }
 
 /// Invalidate Branch Predictor Array
+#[inline(always)]
 pub fn bpiall() {
     unsafe {
         asm!("mcr p15, 0, $0, c7, c5, 6" :: "r" (0) :: "volatile");
@@ -65,16 +80,10 @@ pub fn bpiall() {
 }
 
 /// Invalidate D-Cache
+#[inline(always)]
 pub fn dccisw() {
     // TODO: $0 is r11 at what value?
     unsafe {
         asm!("mcr p15, 0, $0, c7, c5, 6" :: "r" (0) :: "volatile");
     }
 }
-
-/// Enable I-Cache and D-Cache
-pub fn sctlr() {
-    unsafe {
-        asm!("mcr p15, 0, $0, c1, c0, 0" :: "r" (0x00401004) :: "volatile");
-    }
-}
diff --git a/src/main.rs b/src/main.rs
index 54ad484..5141f40 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -18,6 +18,7 @@ mod uart;
 use uart::Uart;
 mod eth;
 
+use crate::regs::{RegisterR, RegisterW};
 use crate::cortex_a9::{asm, regs::*};
 
 extern "C" {
@@ -32,9 +33,9 @@ extern "C" {
 pub unsafe extern "C" fn _boot_cores() -> ! {
     const CORE_MASK: u32 = 0x3;
 
-    match MPIDR.get() & CORE_MASK {
+    match MPIDR.read() & CORE_MASK {
         0 => {
-            SP.set(&mut __stack_start as *mut _ as u32);
+            SP.write(&mut __stack_start as *mut _ as u32);
             boot_core0();
         }
         _ => loop {
@@ -67,7 +68,7 @@ fn l1_cache_init() {
     // (Initialize MMU)
 
     // Enable I-Cache and D-Cache
-    sctlr();
+    SCTLR.write(0x00401004);
 
     // Synchronization barriers
     // Allows MMU to start