Add parameters to enable Zicfiss and Zicfilp

pulp-platform · Apr 15, 2024 · ed868dc · ed868dc
1 parent dbaecc5
commit ed868dc
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 1 deletion.
diff --git a/core/cva6.sv b/core/cva6.sv
@@ -203,6 +203,8 @@ module cva6
     CVA6Cfg.XFVec,
     CVA6Cfg.CvxifEn,
     CVA6Cfg.ZiCondExtEn,
+    CVA6Cfg.ZiCfiSSEn,
+    CVA6Cfg.ZiCfiLPEn,
     CVA6Cfg.RVSCLIC,
     // Extended
     bit'(RVF),

diff --git a/core/include/config_pkg.sv b/core/include/config_pkg.sv
@@ -76,6 +76,10 @@ package config_pkg;
     bit                          CvxifEn;
     // Zicond RISC-V extension
     bit                          ZiCondExtEn;
+    // Control-Flow Integrity - Zicfiss extension
+    bit                          ZiCfiSSEn;
+    // Control-Flow Integrity - Zicfilp extension
+    bit                          ZiCfiLPEn;
     // CLIC extension
     bit                          RVSCLIC;
     // Single precision FP RISC-V extension
@@ -108,7 +112,7 @@ package config_pkg;
     bit                          RVU;
     // Address to jump when halt request
     logic [63:0]                 HaltAddress;
-    // Address to jump when exception 
+    // Address to jump when exception
     logic [63:0]                 ExceptionAddress;
     // Return address stack depth
     int unsigned                 RASDepth;

diff --git a/core/include/cv64a6_imafdcsclic_sv39_config_pkg.sv b/core/include/cv64a6_imafdcsclic_sv39_config_pkg.sv
@@ -27,6 +27,8 @@ package cva6_config_pkg;
   localparam CVA6ConfigVExtEn = 0;
   localparam CVA6ConfigHExtEn = 1;
   localparam CVA6ConfigZiCondExtEn = 1;
+  localparam CVA6ConfigZiCfiSSEn = 1;
+  localparam CVA6ConfigZiCfiLPEn = 1;
   localparam CVA6ConfigSclicExtEn = 1;
 
   localparam CVA6ConfigAxiIdWidth = 4;
@@ -98,6 +100,8 @@ package cva6_config_pkg;
       XFVec: bit'(CVA6ConfigFVecEn),
       CvxifEn: bit'(CVA6ConfigCvxifEn),
       ZiCondExtEn: bit'(CVA6ConfigZiCondExtEn),
+      ZiCfiSSEn: bit'(CVA6ConfigZiCfiSSEn),
+      ZiCfiLPEn: bit'(CVA6ConfigZiCfiLPEn),
       RVSCLIC: bit'(CVA6ConfigSclicExtEn),
       // Extended
       RVF: