diff --git a/src/target/riscv/encoding.h b/src/target/riscv/encoding.h
index 5f05015ea7..3ac537c377 100644
--- a/src/target/riscv/encoding.h
+++ b/src/target/riscv/encoding.h
@@ -2831,6 +2831,8 @@
 #define CSR_VTYPE 0xc21
 #define CSR_VLENB 0xc22
 #define CSR_SSTATUS 0x100
+#define CSR_SEDELEG 0x102
+#define CSR_SIDELEG 0x103
 #define CSR_SIE 0x104
 #define CSR_STVEC 0x105
 #define CSR_SCOUNTEREN 0x106
@@ -2892,6 +2894,8 @@
 #define CSR_UTVT 0x7
 #define CSR_UNXTI 0x45
 #define CSR_UINTSTATUS 0x46
+#define CSR_USCRATCHCSW 0x48
+#define CSR_USCRATCHCSWL 0x49
 #define CSR_STVT 0x107
 #define CSR_SNXTI 0x145
 #define CSR_SINTSTATUS 0x146
@@ -4584,6 +4588,8 @@ DECLARE_CSR(vl, CSR_VL)
 DECLARE_CSR(vtype, CSR_VTYPE)
 DECLARE_CSR(vlenb, CSR_VLENB)
 DECLARE_CSR(sstatus, CSR_SSTATUS)
+DECLARE_CSR(sedeleg, CSR_SEDELEG)
+DECLARE_CSR(sideleg, CSR_SIDELEG)
 DECLARE_CSR(sie, CSR_SIE)
 DECLARE_CSR(stvec, CSR_STVEC)
 DECLARE_CSR(scounteren, CSR_SCOUNTEREN)
@@ -4645,6 +4651,8 @@ DECLARE_CSR(stopi, CSR_STOPI)
 DECLARE_CSR(utvt, CSR_UTVT)
 DECLARE_CSR(unxti, CSR_UNXTI)
 DECLARE_CSR(uintstatus, CSR_UINTSTATUS)
+DECLARE_CSR(uscratchcsw, CSR_USCRATCHCSW)
+DECLARE_CSR(uscratchcswl, CSR_USCRATCHCSWL)
 DECLARE_CSR(stvt, CSR_STVT)
 DECLARE_CSR(snxti, CSR_SNXTI)
 DECLARE_CSR(sintstatus, CSR_SINTSTATUS)
diff --git a/tools/syntacore/ide_cloak.tcl b/tools/syntacore/ide_cloak.tcl
index 5f3f410539..b6d7a5a13b 100755
--- a/tools/syntacore/ide_cloak.tcl
+++ b/tools/syntacore/ide_cloak.tcl
@@ -105,6 +105,10 @@ proc generateIdeCloak { } {
     vtype \
     vxrm \
     vxsat \
+    sedeleg \
+    sideleg \
+    uscratchcsw \
+    uscratchcswl \
   ]
 
   set CSRS_TO_HIDE [generateListOfCloakedAddresses $IDE_CSRS]