fix compilation with no CFG_DEBUG_ENABLED

mwalle · mwalle · commit cf2281b28e42 · 2013-02-24T17:13:30.000+01:00
Signed-off-by: Michael Walle &lt;michael@walle.cc&gt;
diff --git a/rtl/lm32_cpu.v b/rtl/lm32_cpu.v
@@ -1817,7 +1817,9 @@ assign dtlb_exception = (dtlb_miss_exception == `TRUE) || (dtlb_fault_exception
 assign privilege_exception = (   (usr == `TRUE)
                               && (   (csr_write_enable_q_x == `TRUE)
                                   || (eret_q_x == `TRUE)
+`ifdef CFG_DEBUG_ENABLED
                                   || (bret_q_x == `TRUE)
+`endif
                                  )
                              );
 `endif
@@ -1958,9 +1960,13 @@ assign stall_f =   (stall_d == `TRUE)
                 // wrong in case of a miss, that is one instruction is
                 // skipped.
                 || (   (itlbe == `TRUE)
+`ifdef CFG_DEBUG_ENABLED
                     && (   (debug_exception_q_w == `TRUE)
                         || (non_debug_exception_q_w == `TRUE)
                        )
+`else
+                    && (exception_q_w == `TRUE)
+`endif
                    )
 `endif
                 ;
diff --git a/rtl/lm32_include.v b/rtl/lm32_include.v
@@ -203,18 +203,20 @@
 `define LM32_ADDRESS_LSBS_WIDTH         2
 
 // Width and range of a CSR index
+`ifdef CFG_MMU_ENABLED
+`define LM32_CSR_WIDTH                  5
+`else
 `ifdef CFG_DEBUG_ENABLED
 `define LM32_CSR_WIDTH                  5
-`define LM32_CSR_RNG                    (`LM32_CSR_WIDTH-1):0
 `else
 `ifdef CFG_JTAG_ENABLED
 `define LM32_CSR_WIDTH                  4
-`define LM32_CSR_RNG                    (`LM32_CSR_WIDTH-1):0
 `else
 `define LM32_CSR_WIDTH                  3
-`define LM32_CSR_RNG                    (`LM32_CSR_WIDTH-1):0
 `endif
 `endif
+`endif
+`define LM32_CSR_RNG                    (`LM32_CSR_WIDTH-1):0
 
 // CSR indices
 `define LM32_CSR_IE                     `LM32_CSR_WIDTH'h0
@@ -243,6 +245,8 @@
 `define LM32_CSR_WP1                    `LM32_CSR_WIDTH'h19
 `define LM32_CSR_WP2                    `LM32_CSR_WIDTH'h1a
 `define LM32_CSR_WP3                    `LM32_CSR_WIDTH'h1b
+`endif
+`ifdef CFG_MMU_ENABLED
 `define LM32_CSR_PSW                    `LM32_CSR_WIDTH'h1d
 `define LM32_CSR_TLBVADDR               `LM32_CSR_WIDTH'h1e
 `define LM32_CSR_TLBPADDR               `LM32_CSR_WIDTH'h1f  // write only

Original file line number	Diff line number	Diff line change
@@ -1817,7 +1817,9 @@ assign dtlb_exception = (dtlb_miss_exception == `TRUE) \|\| (dtlb_fault_exception
`1817`	`1817`	assign privilege_exception = ( (usr == `TRUE)
`1818`	`1818`	&& ( (csr_write_enable_q_x == `TRUE)
`1819`	`1819`	\|\| (eret_q_x == `TRUE)
	`1820`	+`ifdef CFG_DEBUG_ENABLED
`1820`	`1821`	\|\| (bret_q_x == `TRUE)
	`1822`	+`endif
`1821`	`1823`	`)`
`1822`	`1824`	`);`
`1823`	`1825`	`endif
@@ -1958,9 +1960,13 @@ assign stall_f = (stall_d == `TRUE)
`1958`	`1960`	`// wrong in case of a miss, that is one instruction is`
`1959`	`1961`	`// skipped.`
`1960`	`1962`	\|\| ( (itlbe == `TRUE)
	`1963`	+`ifdef CFG_DEBUG_ENABLED
`1961`	`1964`	&& ( (debug_exception_q_w == `TRUE)
`1962`	`1965`	\|\| (non_debug_exception_q_w == `TRUE)
`1963`	`1966`	`)`
	`1967`	+`else
	`1968`	+ && (exception_q_w == `TRUE)
	`1969`	+`endif
`1964`	`1970`	`)`
`1965`	`1971`	`endif
`1966`	`1972`	`;`