From 4082bb0528822a828c6c8e2c32d2cdb4a5ada88b Mon Sep 17 00:00:00 2001 From: NikLeberg Date: Thu, 17 Apr 2025 18:53:10 +0000 Subject: [PATCH] [pmp] fix multi-assignment with disabled NAPOT --- rtl/core/neorv32_cpu_pmp.vhd | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/rtl/core/neorv32_cpu_pmp.vhd b/rtl/core/neorv32_cpu_pmp.vhd index c69ed339..5b0b8a80 100644 --- a/rtl/core/neorv32_cpu_pmp.vhd +++ b/rtl/core/neorv32_cpu_pmp.vhd @@ -272,13 +272,6 @@ begin end process addr_masking; end generate; -- /nap_mode_enable - -- NAPOT disabled -- - nap_mode_disable: - if not NAP_EN generate - addr_mask_napot <= (others => (others => '0')); - addr_mask <= (others => (others => '0')); - end generate; - -- check region address match -- -- NA4 and NAPOT -- @@ -344,6 +337,14 @@ begin end generate; + -- NAPOT disabled -- + nap_mode_disable: + if not NAP_EN generate + addr_mask_napot <= (others => (others => '0')); + addr_mask <= (others => (others => '0')); + end generate; + + -- Access Permission Check (using static prioritization) ---------------------------------- -- -------------------------------------------------------------------------------------------