🐛 [control] fix CTZ decoding

bug introduced in v1.10.3.6
stnolting · Sep 14, 2024 · 4de6a5f · 4de6a5f
1 parent a1f3c5f
commit 4de6a5f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/rtl/core/neorv32_cpu_control.vhd b/rtl/core/neorv32_cpu_control.vhd
@@ -655,7 +655,7 @@ begin
     -- BITMANIP instruction --
     if CPU_EXTENSION_RISCV_B then -- implemented at all?
       -- register-immediate operation --
-      if ((f7_v = "0110000") and (f3_v = "001") and ((f5_v = "00000") or (f5_v = "00000") or (f5_v = "00010") or (f5_v = "00100") or (f5_v = "00101"))) or -- CLZ, CTZ, CPOP, SEXT.[B/H]
+      if ((f7_v = "0110000") and (f3_v = "001") and ((f5_v = "00000") or (f5_v = "00001") or (f5_v = "00010") or (f5_v = "00100") or (f5_v = "00101"))) or -- CLZ, CTZ, CPOP, SEXT.[B/H]
          ((f7_v = "0110000") and (f3_v = "101")) or -- RORI
          ((f7_v = "0010100") and (f3_v = "101") and (f5_v = "00111")) or -- ORCB
          ((f7_v = "0100100") and (f3_v(1 downto 0) = "01")) or -- BCLRI / BEXTI

diff --git a/rtl/core/neorv32_package.vhd b/rtl/core/neorv32_package.vhd
@@ -29,7 +29,7 @@ package neorv32_package is
 
   -- Architecture Constants -----------------------------------------------------------------
   -- -------------------------------------------------------------------------------------------
-  constant hw_version_c : std_ulogic_vector(31 downto 0) := x"01100307"; -- hardware version
+  constant hw_version_c : std_ulogic_vector(31 downto 0) := x"01100308"; -- hardware version
   constant archid_c     : natural := 19; -- official RISC-V architecture ID
   constant XLEN         : natural := 32; -- native data path width