Skip to content

Commit 4d22bff

Browse files
stnoltingstnolting
authored
Merge pull request #396 from stnolting/hdl_reworks
[rtl] minor edits and cleanups
2 parents 1f81f89 + 5a39f6b commit 4d22bff

File tree

5 files changed

+53
-17
lines changed

5 files changed

+53
-17
lines changed

‎CHANGELOG.md

+1
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ mimpid = 0x01040312 => 01.04.03.12 => Version 01.04.03.12 => v1.4.3.12
3232

3333
| Date (*dd.mm.yyyy*) | Version | Comment |
3434
|:-------------------:|:-------:|:--------|
35+
| 24.08.2022 | 1.7.5.7 | minor rtl cleanups [#396](https://github.com/stnolting/neorv32/pull/396) |
3536
| 20.08.2022 | 1.7.5.6 | :sparkles: update software framework to GCC 12.1.0 (new prebuilt toolchains available!) [#391](https://github.com/stnolting/neorv32/pull/391) |
3637
| 18.08.2022 | 1.7.5.5 | :lock: add **TRNG** read data protection; [#389](https://github.com/stnolting/neorv32/pull/389) |
3738
| 18.08.2022 | 1.7.5.4 | minor rtl cleanup in **PWM** module; [#388](https://github.com/stnolting/neorv32/pull/388) |

‎rtl/core/neorv32_cpu_control.vhd

+15-14
Original file line numberDiff line numberDiff line change
@@ -2564,18 +2564,17 @@ begin
25642564

25652565
-- Debug Control --------------------------------------------------------------------------
25662566
-- -------------------------------------------------------------------------------------------
2567-
ocd_en:
2568-
if (CPU_EXTENSION_RISCV_DEBUG = true) generate
2569-
debug_control: process(rstn_i, clk_i)
2570-
begin
2571-
if (rstn_i = '0') then
2572-
debug_ctrl.state <= DEBUG_OFFLINE;
2573-
debug_ctrl.ext_halt_req <= '0';
2574-
elsif rising_edge(clk_i) then
2575-
-- external halt request (from Debug Module) --
2576-
debug_ctrl.ext_halt_req <= db_halt_req_i;
2577-
2578-
-- state machine --
2567+
debug_control: process(rstn_i, clk_i)
2568+
begin
2569+
if (rstn_i = '0') then
2570+
debug_ctrl.state <= DEBUG_OFFLINE;
2571+
debug_ctrl.ext_halt_req <= '0';
2572+
elsif rising_edge(clk_i) then
2573+
-- external halt request (from Debug Module) --
2574+
debug_ctrl.ext_halt_req <= db_halt_req_i;
2575+
2576+
-- state machine --
2577+
if (CPU_EXTENSION_RISCV_DEBUG = true) then
25792578
case debug_ctrl.state is
25802579

25812580
when DEBUG_OFFLINE => -- not in debug mode, waiting for entering request
@@ -2605,9 +2604,11 @@ begin
26052604
debug_ctrl.state <= DEBUG_OFFLINE;
26062605

26072606
end case;
2607+
else -- debug mode not implemented
2608+
debug_ctrl.state <= DEBUG_OFFLINE;
26082609
end if;
2609-
end process debug_control;
2610-
end generate; --/ocd_en
2610+
end if;
2611+
end process debug_control;
26112612

26122613
-- CPU is *in* debug mode --
26132614
debug_ctrl.running <= '1' when ((debug_ctrl.state = DEBUG_ONLINE) or (debug_ctrl.state = DEBUG_EXIT)) and (CPU_EXTENSION_RISCV_DEBUG = true) else '0';

‎rtl/core/neorv32_cpu_cp_shifter.vhd

-1
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,6 @@ architecture neorv32_cpu_cp_shifter_rtl of neorv32_cpu_cp_shifter is
7070
done : std_ulogic;
7171
cnt : std_ulogic_vector(index_size_f(data_width_c)-1 downto 0);
7272
sreg : std_ulogic_vector(data_width_c-1 downto 0);
73-
res : std_ulogic_vector(data_width_c-1 downto 0);
7473
end record;
7574
signal shifter : shifter_t;
7675

‎rtl/core/neorv32_fifo.vhd

+8-1
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,14 @@ begin
163163
-- "asynchronous" read --
164164
fifo_read_async:
165165
if (FIFO_RSYNC = false) generate
166-
rdata_o <= fifo.buf when (FIFO_DEPTH = 1) else fifo.data(to_integer(unsigned(fifo.r_pnt(fifo.r_pnt'left-1 downto 0))));
166+
fifo_read: process(fifo)
167+
begin
168+
if (FIFO_DEPTH = 1) then
169+
rdata_o <= fifo.buf;
170+
else
171+
rdata_o <= fifo.data(to_integer(unsigned(fifo.r_pnt(fifo.r_pnt'left-1 downto 0))));
172+
end if;
173+
end process fifo_read;
167174
end generate;
168175

169176
-- synchronous read --

‎rtl/core/neorv32_package.vhd

+29-1
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ package neorv32_package is
6363
-- Architecture Constants (do not modify!) ------------------------------------------------
6464
-- -------------------------------------------------------------------------------------------
6565
constant data_width_c : natural := 32; -- native data path width - do not change!
66-
constant hw_version_c : std_ulogic_vector(31 downto 0) := x"01070506"; -- NEORV32 version - no touchy!
66+
constant hw_version_c : std_ulogic_vector(31 downto 0) := x"01070507"; -- NEORV32 version - no touchy!
6767
constant archid_c : natural := 19; -- official RISC-V architecture ID - hands off!
6868

6969
-- Check if we're inside the Matrix -------------------------------------------------------
@@ -111,6 +111,7 @@ package neorv32_package is
111111
function xor_reduce_f(a : std_ulogic_vector) return std_ulogic;
112112
function to_hexchar_f(input : std_ulogic_vector(3 downto 0)) return character;
113113
function to_hstring32_f(input : std_ulogic_vector(31 downto 0)) return string;
114+
function hexchar_to_stdulogicvector_f(input : character) return std_ulogic_vector;
114115
function bit_rev_f(input : std_ulogic_vector) return std_ulogic_vector;
115116
function is_power_of_two_f(input : natural) return boolean;
116117
function bswap32_f(input : std_ulogic_vector) return std_ulogic_vector;
@@ -2396,6 +2397,33 @@ package body neorv32_package is
23962397
return res_v;
23972398
end function to_hstring32_f;
23982399

2400+
-- Function: Convert hex char to 4-bit std_ulogic_vector ----------------------------------
2401+
-- -------------------------------------------------------------------------------------------
2402+
function hexchar_to_stdulogicvector_f(input : character) return std_ulogic_vector is
2403+
variable res_v : std_ulogic_vector(3 downto 0);
2404+
begin
2405+
case input is
2406+
when '0' => res_v := x"0";
2407+
when '1' => res_v := x"1";
2408+
when '2' => res_v := x"2";
2409+
when '3' => res_v := x"3";
2410+
when '4' => res_v := x"4";
2411+
when '5' => res_v := x"5";
2412+
when '6' => res_v := x"6";
2413+
when '7' => res_v := x"7";
2414+
when '8' => res_v := x"8";
2415+
when '9' => res_v := x"9";
2416+
when 'a' | 'A' => res_v := x"a";
2417+
when 'b' | 'B' => res_v := x"b";
2418+
when 'c' | 'C' => res_v := x"c";
2419+
when 'd' | 'D' => res_v := x"d";
2420+
when 'e' | 'E' => res_v := x"e";
2421+
when 'f' | 'F' => res_v := x"f";
2422+
when others => res_v := x"0";
2423+
end case;
2424+
return res_v;
2425+
end function hexchar_to_stdulogicvector_f;
2426+
23992427
-- Function: Bit reversal -----------------------------------------------------------------
24002428
-- -------------------------------------------------------------------------------------------
24012429
function bit_rev_f(input : std_ulogic_vector) return std_ulogic_vector is

0 commit comments

Comments
 (0)