srenblad/zynq-rs
1
0
Fork 0
forked from M-Labs/zynq-rs
Code Pull Requests Activity

fix addr_of_mut warnings

Browse Source
This commit is contained in:
Simon Renblad 2024-12-04 10:36:30 +08:00
parent e15d89da48
commit 0159c46946
5 changed files with 27 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
experiments/src/main.rs
View File

@ -42,6 +42,7 @@ use libsupport_zynq::{
}; };
use log::{info, warn}; use log::{info, warn};
use core::sync::atomic::{AtomicBool, Ordering}; use core::sync::atomic::{AtomicBool, Ordering};
use core::ptr::addr_of_mut;
const HWADDR: [u8; 6] = [0, 0x23, 0xde, 0xea, 0xbe, 0xef]; const HWADDR: [u8; 6] = [0, 0x23, 0xde, 0xea, 0xbe, 0xef];

1
libcortex_a9/src/lib.rs
View File

@ -1,5 +1,6 @@
#![no_std] #![no_std]
#![feature(never_type)] #![feature(never_type)]
#![feature(ptr_as_ref_unchecked)]
extern crate alloc; extern crate alloc;

7
libcortex_a9/src/mmu.rs
View File

@ -1,4 +1,5 @@
use bit_field::BitField; use bit_field::BitField;
use core::ptr::{addr_of_mut, addr_of};
use super::{regs::*, asm::*, cache::*}; use super::{regs::*, asm::*, cache::*};
use libregister::RegisterW; use libregister::RegisterW;
@ -134,9 +135,9 @@ pub struct L1Table {
} }
impl L1Table { impl L1Table {
pub fn get() -> &'static mut Self { pub fn get() -> *mut L1Table {
unsafe { unsafe {
&mut L1_TABLE addr_of_mut!(L1_TABLE)
} }
} }
@ -391,7 +392,7 @@ pub fn with_mmu<F: FnMut() -> !>(l1table: &L1Table, mut f: F) -> ! {
let domains = AccessDomains::all_manager(); let domains = AccessDomains::all_manager();
DACR.write(domains.into()); DACR.write(domains.into());
let table_base = &l1table.table as *const _ as u32; let table_base = addr_of!(l1table.table) as u32;
assert!(table_base & 0x3fff == 0); assert!(table_base & 0x3fff == 0);
TTBR0.write( TTBR0.write(
TTBR0::zeroed() TTBR0::zeroed()

17
libcortex_a9/src/uncached.rs
View File

@ -23,13 +23,16 @@ impl<T> UncachedSlice<T> {
assert_eq!(start & (L1_PAGE_SIZE - 1), 0); assert_eq!(start & (L1_PAGE_SIZE - 1), 0);
for page_start in (start..(start + size)).step_by(L1_PAGE_SIZE) { for page_start in (start..(start + size)).step_by(L1_PAGE_SIZE) {
// non-shareable device unsafe {
L1Table::get() // non-shareable device
.update(page_start as *const (), |l1_section| { L1Table::get()
l1_section.tex = 0b10; .as_mut_unchecked()
l1_section.cacheable = true; .update(page_start as *const (), |l1_section| {
l1_section.bufferable = false; l1_section.tex = 0b10;
}); l1_section.cacheable = true;
l1_section.bufferable = false;
});
}
} }
let slice = unsafe { core::slice::from_raw_parts_mut(ptr, len) }; let slice = unsafe { core::slice::from_raw_parts_mut(ptr, len) };

16
libsupport_zynq/src/boot.rs
View File

@ -1,5 +1,5 @@
use r0::zero_bss; use r0::zero_bss;
use core::ptr::{addr_of_mut, write_volatile}; use core::ptr::{write_volatile, addr_of_mut};
use core::arch::asm; use core::arch::asm;
use libregister::{ use libregister::{
VolatileCell, VolatileCell,
@ -45,8 +45,11 @@ unsafe extern "C" fn boot_core0() -> ! {
zero_bss(addr_of_mut!(__bss_start), addr_of_mut!(__bss_end)); zero_bss(addr_of_mut!(__bss_start), addr_of_mut!(__bss_end));
let mmu_table = mmu::L1Table::get() let mmu_table = unsafe {
.setup_flat_layout(); mmu::L1Table::get()
.as_mut().unwrap()
.setup_flat_layout()
};
mmu::with_mmu(mmu_table, || { mmu::with_mmu(mmu_table, || {
mpcore.scu_control.start(); mpcore.scu_control.start();
ACTLR.enable_smp(); ACTLR.enable_smp();
@ -69,8 +72,11 @@ unsafe extern "C" fn boot_core1() -> ! {
let mpcore = mpcore::RegisterBlock::mpcore(); let mpcore = mpcore::RegisterBlock::mpcore();
mpcore.scu_invalidate.invalidate_core1(); mpcore.scu_invalidate.invalidate_core1();
let mmu_table = mmu::L1Table::get() let mmu_table = unsafe {
.setup_flat_layout(); mmu::L1Table::get()
.as_mut().unwrap()
.setup_flat_layout()
};
mmu::with_mmu(mmu_table, || { mmu::with_mmu(mmu_table, || {
ACTLR.enable_smp(); ACTLR.enable_smp();
ACTLR.enable_prefetch(); ACTLR.enable_prefetch();