aneuhaeuser/novaOS
1
0
Fork 0
mirror of https://github.com/iceHtwoO/novaOS.git synced 2026-04-17 04:32:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Trying to fix exception in el1

Browse Source
This commit is contained in:
Alexander Neuhäuser
2025-06-25 11:44:40 +02:00
parent 1ff752e3dd
commit fe8e5e000a
12 changed files with 159 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
src/main.rs
View File

@@ -5,6 +5,7 @@
use core::{
arch::{asm, global_asm},
panic::PanicInfo,
ptr::write_volatile,
};
use nova::{
@@ -12,18 +13,19 @@ use nova::{
mailbox::read_soc_temp,
peripherals::{
gpio::{
gpio_get_state, gpio_high, gpio_low, gpio_pull_up, set_falling_edge_detect,
set_gpio_function, GPIOFunction,
blink_gpio, gpio_pull_up, set_falling_edge_detect, set_gpio_function, GPIOFunction,
},
uart::{print, uart_init},
uart::{print, print_u32, uart_init},
},
timer::{delay_nops, sleep_ms, sleep_us},
timer::{delay_nops, sleep_us},
};
global_asm!(include_str!("vector.S"));
extern "C" {
fn el2_to_el1();
static mut __bss_start: u32;
static mut __bss_end: u32;
}
#[panic_handler]
@@ -47,6 +49,9 @@ pub unsafe extern "C" fn _start() {
#[no_mangle]
pub extern "C" fn main() -> ! {
unsafe {
zero_bss();
}
enable_uart();
// Set ACT Led to Outout
@@ -59,14 +64,24 @@ pub extern "C" fn main() -> ! {
print("Hello World!\r\n");
unsafe {
asm!("mrs x0, SCTLR_EL1");
el2_to_el1();
}
loop {}
}
unsafe fn zero_bss() {
let mut bss: *mut u32 = &raw mut __bss_start as *mut u32;
while bss < &raw mut __bss_end as *mut u32 {
write_volatile(bss, 0);
bss = bss.add(1);
}
}
#[no_mangle]
pub extern "C" fn kernel_main() -> ! {
print("AAA\r\n");
print_current_el_str();
sleep_us(500_000);
@@ -78,38 +93,13 @@ pub extern "C" fn kernel_main() -> ! {
set_falling_edge_detect(26, true);
loop {
//let temp = read_soc_temp();
//u32_to_ascii(temp as u8);
let temp = read_soc_temp();
print_u32(temp);
let _ = gpio_high(29);
sleep_ms(500); // 0.5s
let _ = gpio_low(29);
sleep_ms(500); // 0.5s
print_gpio_state();
blink_gpio(29, 500);
}
}
fn print_gpio_state() {
let state = gpio_get_state(26);
let ascii_byte = b'0' + state;
let data = [ascii_byte];
let s = str::from_utf8(&data).unwrap();
print(s);
print("\r\n");
}
fn u32_to_ascii(val: u8) {
let ascii_byte = b'0' + val;
let data = [ascii_byte];
let s = str::from_utf8(&data).unwrap();
print(s);
print("C\r\n");
}
pub fn get_current_el() -> u64 {
let el: u64;
unsafe {