From b4d6884cc4c79aba56dfa17eafe0b28e4c54b90e Mon Sep 17 00:00:00 2001
From: Sean Cross <sean@xobs.io>
Date: Fri, 22 Mar 2024 15:53:11 +0800
Subject: [PATCH] kernel: use addr_of!() and addr_of_mut!()

DUe to https://github.com/rust-lang/rust/issues/114447 direct access to
static mut variables causes a warning which will be turned into an
error in the 2024 edition.

The workaround is to use `addr_of!()` and `addr_of_mut!()` macros and
then dereference that.

Signed-off-by: Sean Cross <sean@xobs.io>
---
 kernel/src/arch/riscv/process.rs | 4 ++--
 kernel/src/mem.rs                | 4 ++--
 kernel/src/services.rs           | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/kernel/src/arch/riscv/process.rs b/kernel/src/arch/riscv/process.rs
index cd9356d9e..178a29644 100644
--- a/kernel/src/arch/riscv/process.rs
+++ b/kernel/src/arch/riscv/process.rs
@@ -516,7 +516,7 @@ impl Process {
     }
 
     pub fn destroy(pid: PID) -> Result<(), xous_kernel::Error> {
-        let process_table = unsafe { &mut PROCESS_TABLE };
+        let process_table = unsafe { &mut *core::ptr::addr_of_mut!(PROCESS_TABLE) };
         let pid_idx = pid.get() as usize - 1;
         if pid_idx >= process_table.table.len() {
             panic!("attempted to destroy PID that exceeds table index: {}", pid);
@@ -597,7 +597,7 @@ impl core::fmt::Display for Thread {
 pub fn set_current_pid(pid: PID) {
     let pid_idx = (pid.get() - 1) as usize;
     unsafe {
-        let pt = &mut PROCESS_TABLE;
+        let pt = &mut *core::ptr::addr_of_mut!(PROCESS_TABLE);
 
         match pt.table.get(pid_idx) {
             None | Some(false) => panic!("PID {} does not exist", pid),
diff --git a/kernel/src/mem.rs b/kernel/src/mem.rs
index 32b9764fd..f04dd5fcd 100644
--- a/kernel/src/mem.rs
+++ b/kernel/src/mem.rs
@@ -93,7 +93,7 @@ impl MemoryManager {
     {
         #[cfg(baremetal)]
         unsafe {
-            f(&mut MEMORY_MANAGER)
+            f(&mut *core::ptr::addr_of_mut!(MEMORY_MANAGER))
         }
 
         #[cfg(not(baremetal))]
@@ -107,7 +107,7 @@ impl MemoryManager {
     {
         #[cfg(baremetal)]
         unsafe {
-            f(&MEMORY_MANAGER)
+            f(&*core::ptr::addr_of!(MEMORY_MANAGER))
         }
 
         #[cfg(not(baremetal))]
diff --git a/kernel/src/services.rs b/kernel/src/services.rs
index ceaf8947c..51b640e32 100644
--- a/kernel/src/services.rs
+++ b/kernel/src/services.rs
@@ -314,7 +314,7 @@ impl SystemServices {
     {
         #[cfg(baremetal)]
         unsafe {
-            f(&SYSTEM_SERVICES)
+            f(&*core::ptr::addr_of!(SYSTEM_SERVICES))
         }
         #[cfg(not(baremetal))]
         SYSTEM_SERVICES.with(|ss| f(&ss.borrow()))
@@ -326,7 +326,7 @@ impl SystemServices {
     {
         #[cfg(baremetal)]
         unsafe {
-            f(&mut SYSTEM_SERVICES)
+            f(&mut *core::ptr::addr_of_mut!(SYSTEM_SERVICES))
         }
 
         #[cfg(not(baremetal))]