test

Author: ChinYikMing

src/emulate.c

@@ -1138,10 +1138,8 @@ static void __trap_handler(riscv_t *rv)
 
 static void _trap_handler(riscv_t *rv)
 {
-    uint32_t cause =
-        rv->priv_mode == RV_PRIV_S_MODE ? rv->csr_scause : rv->csr_mcause;
-    uint32_t tval =
-        rv->priv_mode == RV_PRIV_S_MODE ? rv->csr_stval : rv->csr_mtval;
+    uint32_t cause = RV_PRIV_IS_U_OR_S_MODE() ? rv->csr_scause : rv->csr_mcause;
+    uint32_t tval = RV_PRIV_IS_U_OR_S_MODE() ? rv->csr_stval : rv->csr_mtval;
 
     switch (cause) {
 #if !RV32_HAS(EXT_C)