🐛 fix another C-ISA loophole

stnolting · Feb 14, 2024 · 1d67e3e · 1d67e3e
1 parent 897667f
commit 1d67e3e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/rtl/core/neorv32_cpu_decompressor.vhd b/rtl/core/neorv32_cpu_decompressor.vhd
@@ -288,7 +288,7 @@ begin
                 decoded(instr_imm12_lsb_c + 2)                        <= ci_instr16_i(4);
                 decoded(instr_imm12_lsb_c + 3)                        <= ci_instr16_i(5);
                 decoded(instr_imm12_lsb_c + 4)                        <= ci_instr16_i(6);
-                if ((ci_instr16_i(12) or or_reduce_f(ci_instr16_i(6 downto 2))) = '0') then -- nzuimm = 0 -> RV32 custom / illegal
+                if (ci_instr16_i(12) = '1') then -- nzuimm[5] = 1 -> RV32 custom / illegal
                   illegal <= '1';
                 end if;
               when "10" => -- C.ANDI

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