From c82f983cb03d6bbe4b73918402ec52112345b8f6 Mon Sep 17 00:00:00 2001
From: heyuanjie87 <943313837@qq.com>
Date: Tue, 5 Nov 2024 16:00:36 +0800
Subject: [PATCH] =?UTF-8?q?[libcpu]riscv=E4=BD=BF=E7=94=A8call=E6=8C=87?=
 =?UTF-8?q?=E4=BB=A4=E8=A7=A3=E5=86=B3=E9=95=BF=E8=B7=B3=E8=BD=AC=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 libcpu/risc-v/common64/context_gcc.S   | 8 ++++----
 libcpu/risc-v/common64/interrupt_gcc.S | 6 ++++--
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/libcpu/risc-v/common64/context_gcc.S b/libcpu/risc-v/common64/context_gcc.S
index 8858f6c1040..ed216716b09 100644
--- a/libcpu/risc-v/common64/context_gcc.S
+++ b/libcpu/risc-v/common64/context_gcc.S
@@ -77,11 +77,11 @@
 rt_hw_context_switch_to:
     LOAD sp, (a0)
 
-    jal rt_thread_self
+    call rt_thread_self
     mv s1, a0
 
     #ifdef RT_USING_SMART
-        jal lwp_aspace_switch
+        call lwp_aspace_switch
     #endif
 
     RESTORE_CONTEXT
@@ -104,11 +104,11 @@ rt_hw_context_switch:
     LOAD sp, (a1)
 
     // restore Address Space
-    jal rt_thread_self
+    call rt_thread_self
     mv s1, a0
 
     #ifdef RT_USING_SMART
-        jal lwp_aspace_switch
+        call lwp_aspace_switch
     #endif
 
     RESTORE_CONTEXT
diff --git a/libcpu/risc-v/common64/interrupt_gcc.S b/libcpu/risc-v/common64/interrupt_gcc.S
index 16778523d99..015900a16dd 100644
--- a/libcpu/risc-v/common64/interrupt_gcc.S
+++ b/libcpu/risc-v/common64/interrupt_gcc.S
@@ -46,7 +46,8 @@ _distinguish_syscall:
 #ifdef RT_USING_SMART
     // TODO swap 8 with config macro name
     li      t1, 8
-    beq     t0, t1, syscall_entry
+    bne     t0, t1, _handle_interrupt_and_exception
+    call syscall_entry
     // syscall never return here
 #endif
 
@@ -78,7 +79,8 @@ _resume_execution:
 #ifdef RT_USING_SMART
     LOAD    t0, FRAME_OFF_SSTATUS(sp)
     andi    t0, t0, SSTATUS_SPP
-    beqz    t0, arch_ret_to_user
+    bnez    t0, _resume_kernel
+    call arch_ret_to_user
 #endif
 
 _resume_kernel: