sjm
/
zc706
forked from M-Labs/zynq-rs
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

libcortex_a9: remove mmu::l1_table alignment through linker script 

no longer needed, #[repr(16384)] works now
This commit is contained in:
Astro 2020-04-30 03:36:18 +02:00
parent 83ff37e10e
commit 008a995429
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
experiments/link.x
View File

@ -39,7 +39,6 @@ SECTIONS
.bss (NOLOAD) : ALIGN(4) .bss (NOLOAD) : ALIGN(4)
{ {
__bss_start = .; __bss_start = .;
KEEP(*(.bss.l1_table));
*(.bss .bss.*); *(.bss .bss.*);
. = ALIGN(4); . = ALIGN(4);
__bss_end = .; __bss_end = .;

7
libcortex_a9/src/mmu.rs
View File

@ -94,14 +94,11 @@ impl L1Entry {
} }
const L1_TABLE_SIZE: usize = 4096; const L1_TABLE_SIZE: usize = 4096;
#[doc(hidden)] static mut l1_table: L1Table = L1Table {
#[link_section = ".bss.l1_table"]
#[no_mangle]
pub static mut l1_table: L1Table = L1Table {
table: [L1Entry(0); L1_TABLE_SIZE] table: [L1Entry(0); L1_TABLE_SIZE]
}; };
#[repr(align(16384))] #[repr(C, align(16384))]
pub struct L1Table { pub struct L1Table {
table: [L1Entry; L1_TABLE_SIZE] table: [L1Entry; L1_TABLE_SIZE]
} }