From 6a7fe6352e964b821c1030d4671478636bb681ce Mon Sep 17 00:00:00 2001
From: Kevin Kim <kevindkim723@gmail.com>
Date: Sat, 11 Feb 2023 20:41:52 -0800
Subject: [PATCH] zbb, zbs, cnt lint fixes

---
 src/ieu/bmu/cnt.sv | 3 +++
 src/ieu/bmu/zbb.sv | 4 +---
 src/ieu/bmu/zbs.sv | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/ieu/bmu/cnt.sv b/src/ieu/bmu/cnt.sv
index dd72cd5de..430d2d382 100644
--- a/src/ieu/bmu/cnt.sv
+++ b/src/ieu/bmu/cnt.sv
@@ -53,12 +53,14 @@ module cnt #(parameter WIDTH = 32) (
         6'b00000_1: lzcA = {A[31:0],{32{1'b1}}};    //clzw
         6'b00001_0: lzcA = revA;                    //ctz
         6'b00001_1: lzcA = {revA[31:0],{32{1'b1}}}; //ctzw
+        default: lzcA = A;
       endcase 
 
       //cpop select mux
       case ({B[4:0],W64})
         6'b00010_0: popcntA = A;
         6'b00010_1: popcntA = {{32{1'b0}}, A[31:0]};
+        default: popcntA = A;
       endcase
     end
   end
@@ -70,6 +72,7 @@ module cnt #(parameter WIDTH = 32) (
       case(B[4:0])
         5'b00000: lzcA = A;
         5'b00001: lzcA = revA;
+        default: lzcA = A;
       endcase
     end
   end
diff --git a/src/ieu/bmu/zbb.sv b/src/ieu/bmu/zbb.sv
index 98996f3b8..e469fcef7 100644
--- a/src/ieu/bmu/zbb.sv
+++ b/src/ieu/bmu/zbb.sv
@@ -58,15 +58,13 @@ module zbb #(parameter WIDTH=32) (
 
   //can replace with structural mux by looking at bit 4 in rs2 field
   always_comb begin 
-      case ({Funct7, Funct3, B})
+      case ({Funct7, Funct3, B[4:0]})
       15'b0010100_101_00111: ZBBResult = OrcBResult;
       15'b0110100_101_11000: ZBBResult = Rev8Result;
       15'b0110101_101_11000: ZBBResult = Rev8Result;
       15'b0110000_001_00000: ZBBResult = czResult;
       15'b0110000_001_00010: ZBBResult = cpopResult;
       15'b0110000_001_00001: ZBBResult = czResult;
-      15'b0110101_101_11000: ZBBResult = Rev8Result;
-      15'b0110101_101_11000: ZBBResult = Rev8Result;
       15'b0000100_100_00000: ZBBResult = zexthResult; 
       15'b0110000_001_00100: ZBBResult = sextbResult;
       15'b0110000_001_00101: ZBBResult = sexthResult;
diff --git a/src/ieu/bmu/zbs.sv b/src/ieu/bmu/zbs.sv
index 740c684ba..214d6e2c0 100644
--- a/src/ieu/bmu/zbs.sv
+++ b/src/ieu/bmu/zbs.sv
@@ -43,7 +43,7 @@ module zbs #(parameter WIDTH=32) (
   assign InvResult = A ^ BMask;
   assign ClrResult = A & ~BMask;
   assign SetResult = A | BMask;
-  assign ExtResult = |(A & BMask);
+  assign ExtResult = {{(WIDTH-1){1'b0}},{|(A & BMask)}};
 
   always_comb begin
     casez ({Funct7, Funct3})