From 7872d0124c5b8b09536c05b6bae1999bf62a28c1 Mon Sep 17 00:00:00 2001
From: JeanRochCoulon <jean-roch.coulon@thalesgroup.com>
Date: Fri, 10 Nov 2023 12:15:42 +0100
Subject: [PATCH] improve case coding style to improve CC (#1607)

---
 core/load_unit.sv | 32 ++++++++++++++++++--------------
 1 file changed, 18 insertions(+), 14 deletions(-)

diff --git a/core/load_unit.sv b/core/load_unit.sv
index 385aa5d2ef..ef9ac26dfe 100644
--- a/core/load_unit.sv
+++ b/core/load_unit.sv
@@ -476,23 +476,27 @@ module load_unit
       result_o = {{riscv::XLEN - 32 + 16{rdata_sign_bit}}, shifted_data[15:0]};
       ariane_pkg::LB, ariane_pkg::LBU:
       result_o = {{riscv::XLEN - 32 + 24{rdata_sign_bit}}, shifted_data[7:0]};
-      ariane_pkg::FLW: begin
+      default: begin
+        // FLW, FLH and FLB have been defined here in default case to improve Code Coverage
         if (CVA6Cfg.FpPresent) begin
-          result_o = {{riscv::XLEN - 32{rdata_sign_bit}}, shifted_data[31:0]};
-        end
-      end
-      ariane_pkg::FLH: begin
-        if (CVA6Cfg.FpPresent) begin
-          result_o = {{riscv::XLEN - 32 + 16{rdata_sign_bit}}, shifted_data[15:0]};
-        end
-      end
-      ariane_pkg::FLB: begin
-        if (CVA6Cfg.FpPresent) begin
-          result_o = {{riscv::XLEN - 32 + 24{rdata_sign_bit}}, shifted_data[7:0]};
+          unique case (ldbuf_rdata.operation)
+            ariane_pkg::FLW: begin
+              result_o = {{riscv::XLEN - 32{rdata_sign_bit}}, shifted_data[31:0]};
+            end
+            ariane_pkg::FLH: begin
+              result_o = {{riscv::XLEN - 32 + 16{rdata_sign_bit}}, shifted_data[15:0]};
+            end
+            ariane_pkg::FLB: begin
+              result_o = {{riscv::XLEN - 32 + 24{rdata_sign_bit}}, shifted_data[7:0]};
+            end
+            default: begin
+              result_o = shifted_data[riscv::XLEN-1:0];
+            end
+          endcase
+        end else begin
+          result_o = shifted_data[riscv::XLEN-1:0];
         end
       end
-
-      default: result_o = shifted_data[riscv::XLEN-1:0];
     endcase
   end
   // end result mux fast