metta-systems
/
vesper
1
1
Fork 0
Code Issues 2 Pull Requests Releases Wiki Activity

Move stack start constant to linker script

This commit is contained in:
Berkus Decker 2020-10-14 03:19:01 +03:00
parent ded53c16a7
commit 2f663f61de
2 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
linker/aarch64.ld
View File

@ -13,6 +13,7 @@ ENTRY(_boot_cores);
SECTIONS SECTIONS
{ {
. = 0x80000; /* AArch64 boot address is 0x80000, 4K-aligned */ . = 0x80000; /* AArch64 boot address is 0x80000, 4K-aligned */
__STACK_START = .; /* Stack grows from here on down. */
__BOOT_START = .; __BOOT_START = .;
.text : .text :
{ {

25
nucleus/src/arch/aarch64/boot.rs
View File

@ -45,11 +45,12 @@ unsafe fn reset() -> ! {
// Boundaries of the .bss section, provided by the linker script // Boundaries of the .bss section, provided by the linker script
static mut __BSS_START: u64; static mut __BSS_START: u64;
static mut __BSS_END: u64; static mut __BSS_END: u64;
// Stack placed before first executable instruction
static __STACK_START: u64;
} }
// Set stack pointer. Used in case we started in EL1. // Set stack pointer. Used in case we started in EL1.
const STACK_START: u64 = 0x80_000; SP.set(&__STACK_START as *const u64 as u64);
SP.set(STACK_START);
// Zeroes the .bss section // Zeroes the .bss section
r0::zero_bss(&mut __BSS_START, &mut __BSS_END); r0::zero_bss(&mut __BSS_START, &mut __BSS_END);
@ -94,8 +95,14 @@ fn setup_and_enter_el1_from_el2() -> ! {
// Set up SP_EL1 (stack pointer), which will be used by EL1 once // Set up SP_EL1 (stack pointer), which will be used by EL1 once
// we "return" to it. // we "return" to it.
const STACK_START: u64 = 0x80_000; extern "C" {
SP_EL1.set(STACK_START); // Stack placed before first executable instruction
static __STACK_START: u64;
}
// SAFETY: Only single core is booting and accessing this constant.
unsafe {
SP_EL1.set(&__STACK_START as *const u64 as u64);
}
// Use `eret` to "return" to EL1. This will result in execution of // Use `eret` to "return" to EL1. This will result in execution of
// `reset()` in EL1. // `reset()` in EL1.
@ -159,8 +166,14 @@ fn setup_and_enter_el1_from_el3() -> ! {
// Set up SP_EL1 (stack pointer), which will be used by EL1 once // Set up SP_EL1 (stack pointer), which will be used by EL1 once
// we "return" to it. // we "return" to it.
const STACK_START: u64 = 0x80_000; extern "C" {
SP_EL1.set(STACK_START); // Stack placed before first executable instruction
static __STACK_START: u64;
}
// SAFETY: Only single core is booting and accessing this constant.
unsafe {
SP_EL1.set(&__STACK_START as *const u64 as u64);
}
// Use `eret` to "return" to EL1. This will result in execution of // Use `eret` to "return" to EL1. This will result in execution of
// `reset()` in EL1. // `reset()` in EL1.