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

libsupport_zynq: removed naked annotation

This commit is contained in:
pca006132 2021-01-15 16:47:14 +08:00
parent d62c77e6e0
commit b42869e655
3 changed files with 2 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libsupport_zynq/src/abort.rs
View File

@ -4,7 +4,6 @@ use libboard_zynq::{println, stdio};
#[link_section = ".text.boot"] #[link_section = ".text.boot"]
#[no_mangle] #[no_mangle]
#[naked]
pub unsafe extern "C" fn UndefinedInstruction() { pub unsafe extern "C" fn UndefinedInstruction() {
stdio::drop_uart(); stdio::drop_uart();
println!("UndefinedInstruction"); println!("UndefinedInstruction");
@ -13,7 +12,6 @@ pub unsafe extern "C" fn UndefinedInstruction() {
#[link_section = ".text.boot"] #[link_section = ".text.boot"]
#[no_mangle] #[no_mangle]
#[naked]
pub unsafe extern "C" fn SoftwareInterrupt() { pub unsafe extern "C" fn SoftwareInterrupt() {
stdio::drop_uart(); stdio::drop_uart();
println!("SoftwareInterrupt"); println!("SoftwareInterrupt");
@ -22,7 +20,6 @@ pub unsafe extern "C" fn SoftwareInterrupt() {
#[link_section = ".text.boot"] #[link_section = ".text.boot"]
#[no_mangle] #[no_mangle]
#[naked]
pub unsafe extern "C" fn PrefetchAbort() { pub unsafe extern "C" fn PrefetchAbort() {
stdio::drop_uart(); stdio::drop_uart();
println!("PrefetchAbort"); println!("PrefetchAbort");
@ -31,7 +28,6 @@ pub unsafe extern "C" fn PrefetchAbort() {
#[link_section = ".text.boot"] #[link_section = ".text.boot"]
#[no_mangle] #[no_mangle]
#[naked]
pub unsafe extern "C" fn DataAbort() { pub unsafe extern "C" fn DataAbort() {
stdio::drop_uart(); stdio::drop_uart();
@ -43,7 +39,6 @@ pub unsafe extern "C" fn DataAbort() {
#[link_section = ".text.boot"] #[link_section = ".text.boot"]
#[no_mangle] #[no_mangle]
#[naked]
pub unsafe extern "C" fn ReservedException() { pub unsafe extern "C" fn ReservedException() {
stdio::drop_uart(); stdio::drop_uart();
println!("ReservedException"); println!("ReservedException");
@ -52,7 +47,6 @@ pub unsafe extern "C" fn ReservedException() {
#[link_section = ".text.boot"] #[link_section = ".text.boot"]
#[no_mangle] #[no_mangle]
#[naked]
#[cfg(feature = "dummy_irq_handler")] #[cfg(feature = "dummy_irq_handler")]
pub unsafe extern "C" fn IRQ() { pub unsafe extern "C" fn IRQ() {
stdio::drop_uart(); stdio::drop_uart();
@ -62,7 +56,6 @@ pub unsafe extern "C" fn IRQ() {
#[link_section = ".text.boot"] #[link_section = ".text.boot"]
#[no_mangle] #[no_mangle]
#[naked]
pub unsafe extern "C" fn FIQ() { pub unsafe extern "C" fn FIQ() {
stdio::drop_uart(); stdio::drop_uart();
println!("FIQ"); println!("FIQ");

7
libsupport_zynq/src/boot.rs
View File

@ -20,7 +20,6 @@ static mut CORE1_ENABLED: VolatileCell<bool> = VolatileCell::new(false);
#[link_section = ".text.boot"] #[link_section = ".text.boot"]
#[no_mangle] #[no_mangle]
#[naked]
pub unsafe extern "C" fn Reset() -> ! { pub unsafe extern "C" fn Reset() -> ! {
match MPIDR.read().cpu_id() { match MPIDR.read().cpu_id() {
0 => { 0 => {
@ -38,9 +37,8 @@ pub unsafe extern "C" fn Reset() -> ! {
} }
} }
#[naked]
#[inline(never)] #[inline(never)]
unsafe fn boot_core0() -> ! { unsafe extern "C" fn boot_core0() -> ! {
l1_cache_init(); l1_cache_init();
enable_fpu(); enable_fpu();
@ -65,9 +63,8 @@ unsafe fn boot_core0() -> ! {
}); });
} }
#[naked]
#[inline(never)] #[inline(never)]
unsafe fn boot_core1() -> ! { unsafe extern "C" fn boot_core1() -> ! {
l1_cache_init(); l1_cache_init();
let mpcore = mpcore::RegisterBlock::mpcore(); let mpcore = mpcore::RegisterBlock::mpcore();

1
libsupport_zynq/src/lib.rs
View File

@ -1,6 +1,5 @@
#![no_std] #![no_std]
#![feature(naked_functions)]
#![feature(alloc_error_handler)] #![feature(alloc_error_handler)]
#![feature(panic_info_message)] #![feature(panic_info_message)]