From 93bd98f6c0791f6227a4073b56f3b304abd0292d Mon Sep 17 00:00:00 2001
From: mwojcik <mw@m-labs.hk>
Date: Wed, 12 Oct 2022 16:21:26 +0800
Subject: [PATCH] better way of handling incorrect pc address

---
 src/runtime/src/kernel/core1.rs | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/runtime/src/kernel/core1.rs b/src/runtime/src/kernel/core1.rs
index 074eb68..7836784 100644
--- a/src/runtime/src/kernel/core1.rs
+++ b/src/runtime/src/kernel/core1.rs
@@ -10,8 +10,7 @@ use libcortex_a9::{
     enable_fpu,
     cache::{dcci_slice, iciallu, bpiall},
     asm::{dsb, isb},
-    sync_channel,
-    regs::MPIDR
+    sync_channel
 };
 use libboard_zynq::{mpcore, gic};
 use libsupport_zynq::ram;
@@ -221,17 +220,18 @@ extern fn dl_unwind_find_exidx(pc: *const u32, len_ptr: *mut u32) -> *const u32
     let length;
     let start: *const EXIDX_Entry;
     unsafe {
-        let id = MPIDR.read().cpu_id() as usize;
-        // try to look up kernel for core 1 only
-        if (&__text_start as *const u32 <= pc && pc < &__text_end as *const u32) || id == 0 {
+        if (&__text_start as *const u32 <= pc && pc < &__text_end as *const u32) {
             length = (&__exidx_end as *const EXIDX_Entry).offset_from(&__exidx_start) as u32;
             start = &__exidx_start;
-        } else {
+        } else if KERNEL_IMAGE != ptr::null() {
             let exidx = KERNEL_IMAGE.as_ref()
                 .expect("dl_unwind_find_exidx kernel image")
                 .library.get().as_ref().unwrap().exidx();
             length = exidx.len() as u32;
             start = exidx.as_ptr();
+        } else {
+            *len_ptr = 0;
+            return 0 as *const u32;
         }
         *len_ptr = length;
     }