diff --git a/sys/riscv/include/riscvreg.h b/sys/riscv/include/riscvreg.h
index 7b08085fe81..3f93428bff8 100644
--- a/sys/riscv/include/riscvreg.h
+++ b/sys/riscv/include/riscvreg.h
@@ -51,12 +51,14 @@
 #define	EXCP_INSTR_ACCESS_FAULT		1
 #define	EXCP_INSTR_ILLEGAL		2
 #define	EXCP_INSTR_BREAKPOINT		3
-#define	EXCP_RESERVED_0			4
+#define	EXCP_LOAD_ADDR_MISALIGNED	4
 #define	EXCP_LOAD_ACCESS_FAULT		5
-#define	EXCP_AMO_ADDR_MISALIGNED	6
+#define	EXCP_STORE_ADDR_MISALIGNED	6
 #define	EXCP_STORE_ACCESS_FAULT		7
-#define	EXCP_ENV_CALL			8
-#define	EXCP_RESERVED_1			9
+#define	EXCP_UMODE_ENV_CALL		8
+#define	EXCP_SMODE_ENV_CALL		9
+#define	EXCP_HMODE_ENV_CALL		10
+#define	EXCP_MMODE_ENV_CALL		11
 #define	EXCP_INTR			(1 << 31)
 #define	EXCP_INTR_SOFTWARE		0
 #define	EXCP_INTR_TIMER			1