From 96ba787e252c38abe08f039c052a4be378dfa42c Mon Sep 17 00:00:00 2001
From: Fan Yang <93824713+helloeagleyang@users.noreply.github.com>
Date: Mon, 15 Jul 2024 17:51:32 +0800
Subject: [PATCH] Bugfix/fix weak handle trap in riscv common crash rv64 trap
 handling (#9189)

* [bsp][hpmicro] add weak handle_trap implementation

- added weak handle_trap implementation

Signed-off-by: Fan YANG <fan.yang@hpmicro.com>

* [libcpu][risc-v][common] remove weak handle_trap function

- removed weak handle_trap function from trap_common.c

Signed-off-by: Fan YANG <fan.yang@hpmicro.com>

---------

Signed-off-by: Fan YANG <fan.yang@hpmicro.com>
---
 bsp/hpmicro/hpm5300evk/startup/HPM5361/trap.c     | 7 +++++++
 bsp/hpmicro/hpm5301evklite/startup/HPM5301/trap.c | 7 +++++++
 bsp/hpmicro/hpm6200evk/startup/HPM6280/trap.c     | 7 +++++++
 bsp/hpmicro/hpm6300evk/startup/HPM6360/trap.c     | 7 +++++++
 bsp/hpmicro/hpm6750evk/startup/HPM6750/trap.c     | 7 +++++++
 bsp/hpmicro/hpm6750evk2/startup/HPM6750/trap.c    | 7 +++++++
 bsp/hpmicro/hpm6750evkmini/startup/HPM6750/trap.c | 7 +++++++
 bsp/hpmicro/hpm6800evk/startup/HPM6880/trap.c     | 7 +++++++
 libcpu/risc-v/common/trap_common.c                | 7 -------
 9 files changed, 56 insertions(+), 7 deletions(-)

diff --git a/bsp/hpmicro/hpm5300evk/startup/HPM5361/trap.c b/bsp/hpmicro/hpm5300evk/startup/HPM5361/trap.c
index b87eaee524..d041d4785a 100644
--- a/bsp/hpmicro/hpm5300evk/startup/HPM5361/trap.c
+++ b/bsp/hpmicro/hpm5300evk/startup/HPM5361/trap.c
@@ -302,3 +302,10 @@ void trap_entry(void)
     write_fcsr(fcsr);
 #endif
 }
+
+/**
+ * Trap Handler
+ */
+rt_weak void handle_trap(rt_uint32_t mcause, rt_uint32_t mepc, rt_uint32_t sp)
+{
+}
diff --git a/bsp/hpmicro/hpm5301evklite/startup/HPM5301/trap.c b/bsp/hpmicro/hpm5301evklite/startup/HPM5301/trap.c
index b87eaee524..d9c7ce6d47 100644
--- a/bsp/hpmicro/hpm5301evklite/startup/HPM5301/trap.c
+++ b/bsp/hpmicro/hpm5301evklite/startup/HPM5301/trap.c
@@ -302,3 +302,10 @@ void trap_entry(void)
     write_fcsr(fcsr);
 #endif
 }
+
+/**
+ * Trap Handler
+ */
+rt_weak void handle_trap(rt_uint32_t mcause, rt_uint32_t mepc, rt_uint32_t sp)
+{
+}
\ No newline at end of file
diff --git a/bsp/hpmicro/hpm6200evk/startup/HPM6280/trap.c b/bsp/hpmicro/hpm6200evk/startup/HPM6280/trap.c
index b87eaee524..d9c7ce6d47 100644
--- a/bsp/hpmicro/hpm6200evk/startup/HPM6280/trap.c
+++ b/bsp/hpmicro/hpm6200evk/startup/HPM6280/trap.c
@@ -302,3 +302,10 @@ void trap_entry(void)
     write_fcsr(fcsr);
 #endif
 }
+
+/**
+ * Trap Handler
+ */
+rt_weak void handle_trap(rt_uint32_t mcause, rt_uint32_t mepc, rt_uint32_t sp)
+{
+}
\ No newline at end of file
diff --git a/bsp/hpmicro/hpm6300evk/startup/HPM6360/trap.c b/bsp/hpmicro/hpm6300evk/startup/HPM6360/trap.c
index b87eaee524..d9c7ce6d47 100644
--- a/bsp/hpmicro/hpm6300evk/startup/HPM6360/trap.c
+++ b/bsp/hpmicro/hpm6300evk/startup/HPM6360/trap.c
@@ -302,3 +302,10 @@ void trap_entry(void)
     write_fcsr(fcsr);
 #endif
 }
+
+/**
+ * Trap Handler
+ */
+rt_weak void handle_trap(rt_uint32_t mcause, rt_uint32_t mepc, rt_uint32_t sp)
+{
+}
\ No newline at end of file
diff --git a/bsp/hpmicro/hpm6750evk/startup/HPM6750/trap.c b/bsp/hpmicro/hpm6750evk/startup/HPM6750/trap.c
index b87eaee524..d9c7ce6d47 100644
--- a/bsp/hpmicro/hpm6750evk/startup/HPM6750/trap.c
+++ b/bsp/hpmicro/hpm6750evk/startup/HPM6750/trap.c
@@ -302,3 +302,10 @@ void trap_entry(void)
     write_fcsr(fcsr);
 #endif
 }
+
+/**
+ * Trap Handler
+ */
+rt_weak void handle_trap(rt_uint32_t mcause, rt_uint32_t mepc, rt_uint32_t sp)
+{
+}
\ No newline at end of file
diff --git a/bsp/hpmicro/hpm6750evk2/startup/HPM6750/trap.c b/bsp/hpmicro/hpm6750evk2/startup/HPM6750/trap.c
index b87eaee524..d9c7ce6d47 100644
--- a/bsp/hpmicro/hpm6750evk2/startup/HPM6750/trap.c
+++ b/bsp/hpmicro/hpm6750evk2/startup/HPM6750/trap.c
@@ -302,3 +302,10 @@ void trap_entry(void)
     write_fcsr(fcsr);
 #endif
 }
+
+/**
+ * Trap Handler
+ */
+rt_weak void handle_trap(rt_uint32_t mcause, rt_uint32_t mepc, rt_uint32_t sp)
+{
+}
\ No newline at end of file
diff --git a/bsp/hpmicro/hpm6750evkmini/startup/HPM6750/trap.c b/bsp/hpmicro/hpm6750evkmini/startup/HPM6750/trap.c
index b87eaee524..d9c7ce6d47 100644
--- a/bsp/hpmicro/hpm6750evkmini/startup/HPM6750/trap.c
+++ b/bsp/hpmicro/hpm6750evkmini/startup/HPM6750/trap.c
@@ -302,3 +302,10 @@ void trap_entry(void)
     write_fcsr(fcsr);
 #endif
 }
+
+/**
+ * Trap Handler
+ */
+rt_weak void handle_trap(rt_uint32_t mcause, rt_uint32_t mepc, rt_uint32_t sp)
+{
+}
\ No newline at end of file
diff --git a/bsp/hpmicro/hpm6800evk/startup/HPM6880/trap.c b/bsp/hpmicro/hpm6800evk/startup/HPM6880/trap.c
index b87eaee524..d9c7ce6d47 100644
--- a/bsp/hpmicro/hpm6800evk/startup/HPM6880/trap.c
+++ b/bsp/hpmicro/hpm6800evk/startup/HPM6880/trap.c
@@ -302,3 +302,10 @@ void trap_entry(void)
     write_fcsr(fcsr);
 #endif
 }
+
+/**
+ * Trap Handler
+ */
+rt_weak void handle_trap(rt_uint32_t mcause, rt_uint32_t mepc, rt_uint32_t sp)
+{
+}
\ No newline at end of file
diff --git a/libcpu/risc-v/common/trap_common.c b/libcpu/risc-v/common/trap_common.c
index 3cbbfeb008..6f7352cd56 100644
--- a/libcpu/risc-v/common/trap_common.c
+++ b/libcpu/risc-v/common/trap_common.c
@@ -109,10 +109,3 @@ rt_weak void rt_show_stack_frame(void)
     rt_kprintf("t6      : 0x%08x\r\n", s_stack_frame->t6);
 #endif
 }
-
-/**
- * Trap Handler
- */
-rt_weak void handle_trap(rt_uint32_t mcause, rt_uint32_t mepc, rt_uint32_t sp)
-{
-}
\ No newline at end of file