Merge [shm]call into ecall, [shm]ret into eret

2 files changed, 2 insertions, 2 deletions

diff --git a/v/entry.S b/v/entry.S
index c3c884d..d0dcfc3 100644
--- a/v/entry.S
+++ b/v/entry.S
@@ -73,7 +73,7 @@ pop_tf:
   LOAD  x30,30*REGBYTES(a0)
   LOAD  x31,31*REGBYTES(a0)
   LOAD  a0,10*REGBYTES(a0)
-  mret
+  eret
 
   .global  trap_entry
 trap_entry:
diff --git a/v/vm.c b/v/vm.c
index 7880b88..67920e5 100644
--- a/v/vm.c
+++ b/v/vm.c
@@ -160,7 +160,7 @@ static void restore_vector(trapframe_t* tf)
 
 void handle_trap(trapframe_t* tf)
 {
-  if (tf->cause == CAUSE_SCALL)
+  if (tf->cause == CAUSE_ECALL)
   {
     int n = tf->gpr[10];