From d8728e319c31cedda9e2d901ebcdf37afb6488cb Mon Sep 17 00:00:00 2001
From: Eyck Jentzsch <eyck@minres.com>
Date: Fri, 21 Nov 2025 17:41:35 +0100
Subject: [PATCH] fixes stack pointer adjustment

---
 env/entry.S | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/env/entry.S b/env/entry.S
index b74004f..17e5321 100644
--- a/env/entry.S
+++ b/env/entry.S
@@ -10,7 +10,11 @@
   .align 2
   .global trap_entry
 trap_entry:
-  addi sp, sp, -32*REGBYTES
+#ifdef __riscv_abi_rve
+  addi sp, sp, -12*REGBYTES
+#else
+  addi sp, sp, -28*REGBYTES
+#endif
 
   sw  x1,  1*REGBYTES(sp)
   sw  x5,  5*REGBYTES(sp)
@@ -78,6 +82,9 @@ trap_entry:
   lw x29, 29*REGBYTES(sp)
   lw x30, 30*REGBYTES(sp)
   lw x31, 31*REGBYTES(sp)
+  addi sp, sp, 28*REGBYTES
+#else
+  addi sp, sp, 12*REGBYTES
 #endif
   mret