From eee45ff828645287d28d0eb513f119d9311fe684 Mon Sep 17 00:00:00 2001 From: morgan Date: Thu, 7 Mar 2024 12:47:16 +0800 Subject: [PATCH] main: set exception vector table addr to 0x100000 --- src/runtime/src/main.rs | 3 ++- src/satman/src/main.rs | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/runtime/src/main.rs b/src/runtime/src/main.rs index 50ffb03..1d0d274 100644 --- a/src/runtime/src/main.rs +++ b/src/runtime/src/main.rs @@ -21,7 +21,7 @@ use libboard_artiq::{identifier_read, logger, pl}; use libboard_zynq::{gic, mpcore, timer::GlobalTimer}; use libconfig::Config; use libcortex_a9::l2c::enable_l2_cache; -use libsupport_zynq::ram; +use libsupport_zynq::{exception_vectors, ram}; use log::{info, warn}; mod analyzer; @@ -77,6 +77,7 @@ static mut LOG_BUFFER: [u8; 1 << 17] = [0; 1 << 17]; #[no_mangle] pub fn main_core0() { + exception_vectors::set_vector_table(0x100000); enable_l2_cache(0x8); let mut timer = GlobalTimer::start(); diff --git a/src/satman/src/main.rs b/src/satman/src/main.rs index 5cded72..547bd96 100644 --- a/src/satman/src/main.rs +++ b/src/satman/src/main.rs @@ -38,7 +38,7 @@ use libboard_zynq::error_led::ErrorLED; use libboard_zynq::{i2c::I2c, print, println, time::Milliseconds, timer::GlobalTimer}; use libcortex_a9::{l2c::enable_l2_cache, regs::MPIDR}; use libregister::RegisterR; -use libsupport_zynq::ram; +use libsupport_zynq::{exception_vectors, ram}; use routing::Router; use subkernel::Manager as KernelManager; @@ -827,6 +827,7 @@ static mut LOG_BUFFER: [u8; 1 << 17] = [0; 1 << 17]; #[no_mangle] pub extern "C" fn main_core0() -> i32 { + exception_vectors::set_vector_table(0x100000); enable_l2_cache(0x8); let mut timer = GlobalTimer::start();