From 193184fb271ed2964498cdbf20312457e93b3ef9 Mon Sep 17 00:00:00 2001
From: Florian Zaruba <florian@openhwgroup.org>
Date: Tue, 19 Sep 2023 10:11:49 +0200
Subject: [PATCH] Unify `ZiCondExtEn` flag

Signed-off-by: Florian Zaruba <florian@openhwgroup.org>
---
 core/alu.sv                | 2 +-
 core/cva6.sv               | 2 +-
 core/decoder.sv            | 4 ++--
 core/include/config_pkg.sv | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/core/alu.sv b/core/alu.sv
index a26d188d06c..ad6f611bbd9 100644
--- a/core/alu.sv
+++ b/core/alu.sv
@@ -302,7 +302,7 @@ module alu import ariane_pkg::*; #(
                 default: ; // default case to suppress unique warning
             endcase
         end
-        if (CVA6Cfg.RCONDEXT) begin
+        if (CVA6Cfg.ZiCondExtEn) begin
            unique case (fu_data_i.operation)
            CZERO_EQZ : result_o = (|fu_data_i.operand_b) ? fu_data_i.operand_a : '0;  // move zero to rd if rs2 is equal to zero else rs1
            CZERO_NEZ : result_o = (|fu_data_i.operand_b) ? '0 : fu_data_i.operand_a; // move zero to rd if rs2 is nonzero else rs1
diff --git a/core/cva6.sv b/core/cva6.sv
index 64f8a72f8f3..1e6863f8a76 100644
--- a/core/cva6.sv
+++ b/core/cva6.sv
@@ -177,7 +177,7 @@ module cva6 import ariane_pkg::*; #(
     CVA6Cfg.RVC,
     CVA6Cfg.XFVec,
     CVA6Cfg.CvxifEn,
-    CVA6Cfg.RCONDEXT,
+    CVA6Cfg.ZiCondExtEn,
     // Extended
     bit'(RVF),
     bit'(RVD),
diff --git a/core/decoder.sv b/core/decoder.sv
index 392b305f655..d6613154eb9 100644
--- a/core/decoder.sv
+++ b/core/decoder.sv
@@ -580,7 +580,7 @@ module decoder import ariane_pkg::*; #(
                                 end
                             endcase
                         end
-                        if (CVA6Cfg.RCONDEXT) begin
+                        if (CVA6Cfg.ZiCondExtEn) begin
                             unique case ({instr.rtype.funct7, instr.rtype.funct3})
                                 //Conditional move
                                 {7'b000_0111, 3'b101}: instruction_o.op = ariane_pkg::CZERO_EQZ;     // czero.eqz
@@ -591,7 +591,7 @@ module decoder import ariane_pkg::*; #(
                             endcase
                         end
                         //VCS coverage on
-                        unique case ({ariane_pkg::BITMANIP, CVA6Cfg.RCONDEXT})
+                        unique case ({ariane_pkg::BITMANIP, CVA6Cfg.ZiCondExtEn})
                           2'b00 : illegal_instr = illegal_instr_non_bm;
                           2'b01 : illegal_instr = illegal_instr_non_bm & illegal_instr_zic;
                           2'b10 : illegal_instr = illegal_instr_non_bm & illegal_instr_bm;
diff --git a/core/include/config_pkg.sv b/core/include/config_pkg.sv
index bec56d941ab..f98dc5fee92 100644
--- a/core/include/config_pkg.sv
+++ b/core/include/config_pkg.sv
@@ -49,7 +49,7 @@ package config_pkg;
       bit RVC;
       bit XFVec;
       bit CvxifEn;
-      bit RCONDEXT;
+      bit ZiCondExtEn;
       // Calculated
       bit RVF;
       bit RVD;
@@ -117,7 +117,7 @@ package config_pkg;
       RVC: bit'(1),
       XFVec: bit'(0),
       CvxifEn: bit'(1),
-      EnableZiCond: bit'(0),
+      ZiCondExtEn: bit'(0),
       // Extended
       RVF: bit'(0),
       RVD: bit'(0),