From 0d20af829732864ed27b4dd298265fba5d38ed96 Mon Sep 17 00:00:00 2001
From: Ruige Lee <wut.ruigeli@gmail.com>
Date: Mon, 27 Jan 2025 21:48:17 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=84=E8=8C=83=E5=8C=96=E8=B0=83=E6=95=B4?=
 =?UTF-8?q?=E5=90=AF=E5=8A=A8=E6=B1=87=E7=BC=96=EF=BC=8C=E5=85=88=E5=88=9D?=
 =?UTF-8?q?=E5=A7=8B=E5=8C=96=E5=AF=84=E5=AD=98=E5=99=A8=EF=BC=8C=E5=86=8D?=
 =?UTF-8?q?=E5=8E=8B=E6=A0=88=EF=BC=8C=E5=86=8D=E5=BC=80=E4=B8=AD=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 tb/sw/src/mstStartup.S | 17 ++++++++++-------
 tb/sw/src/slvStartup.S | 17 ++++++++++-------
 2 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/tb/sw/src/mstStartup.S b/tb/sw/src/mstStartup.S
index 413f742..084413e 100644
--- a/tb/sw/src/mstStartup.S
+++ b/tb/sw/src/mstStartup.S
@@ -9,14 +9,7 @@
 
 _prog_start:
 
-	la t0, trap_entry
-	csrw mtvec, t0
-	li t0, 1 << 11
-	csrw mie, t0
 
-	csrr t0, mstatus
-	ori t0, t0, 1<<3
-	csrw mstatus, t0
 
 	li x1,  0
 	li x2,  0
@@ -50,7 +43,17 @@ _prog_start:
 	li x30, 0
 	li x31, 0
 
+	la t0, trap_entry
+	csrw mtvec, t0
+	li t0, 1 << 11
+	csrw mie, t0
+
 	li sp, 0x40011000
+
+	csrr t0, mstatus
+	ori t0, t0, 1<<3
+	csrw mstatus, t0
+
 	call main
 
 	ecall
diff --git a/tb/sw/src/slvStartup.S b/tb/sw/src/slvStartup.S
index 09a9062..1c0eb89 100644
--- a/tb/sw/src/slvStartup.S
+++ b/tb/sw/src/slvStartup.S
@@ -9,14 +9,7 @@
 
 _prog_start:
 
-	la t0, trap_entry
-	csrw mtvec, t0
-	li t0, 1 << 11
-	csrw mie, t0
 
-	csrr t0, mstatus
-	ori t0, t0, 1<<3
-	csrw mstatus, t0
 
 	li x1,  0
 	li x2,  0
@@ -50,7 +43,17 @@ _prog_start:
 	li x30, 0
 	li x31, 0
 
+	la t0, trap_entry
+	csrw mtvec, t0
+	li t0, 1 << 11
+	csrw mie, t0
+
 	li sp, 0x40011000
+
+	csrr t0, mstatus
+	ori t0, t0, 1<<3
+	csrw mstatus, t0
+
 	call main
 
 	ecall