moved privilege dfinitions into wally-constants, upgraded relevant includes

wally-pipelined/config/buildroot/wally-config.vh

@@ -46,10 +46,6 @@
 //`define N_SUPPORTED ((MISA >> 13) % 2 == 1)
 `define N_SUPPORTED 0
 
-`define M_MODE (2'b11)
-`define S_MODE (2'b01)
-`define U_MODE (2'b00)
-
 // Microarchitectural Features
 `define UARCH_PIPELINED 1
 `define UARCH_SUPERSCALR 0

wally-pipelined/config/busybear/wally-config.vh

@@ -46,10 +46,6 @@
 //`define N_SUPPORTED ((MISA >> 13) % 2 == 1)
 `define N_SUPPORTED 0
 
-`define M_MODE (2'b11)
-`define S_MODE (2'b01)
-`define U_MODE (2'b00)
-
 // Microarchitectural Features
 `define UARCH_PIPELINED 1
 `define UARCH_SUPERSCALR 0

wally-pipelined/config/coremark-64i/wally-config.vh

@@ -42,10 +42,6 @@
 //`define N_SUPPORTED ((MISA >> 13) % 2 == 1)
 `define N_SUPPORTED 0
 
-`define M_MODE (2'b11)
-`define S_MODE (2'b01)
-`define U_MODE (2'b00)
-
 // Microarchitectural Features
 `define UARCH_PIPELINED 1
 `define UARCH_SUPERSCALR 0

wally-pipelined/config/coremark/wally-config.vh

@@ -46,10 +46,6 @@
 //`define N_SUPPORTED ((MISA >> 13) % 2 == 1)
 `define N_SUPPORTED 0
 
-`define M_MODE (2'b11)
-`define S_MODE (2'b01)
-`define U_MODE (2'b00)
-
 // Microarchitectural Features
 `define UARCH_PIPELINED 1
 `define UARCH_SUPERSCALR 0

wally-pipelined/config/coremark_bare/wally-config.vh

@@ -46,10 +46,6 @@
 //`define N_SUPPORTED ((MISA >> 13) % 2 == 1)
 `define N_SUPPORTED 0
 
-`define M_MODE (2'b11)
-`define S_MODE (2'b01)
-`define U_MODE (2'b00)
-
 // Microarchitectural Features
 `define UARCH_PIPELINED 1
 `define UARCH_SUPERSCALR 0

wally-pipelined/config/rv32ic/wally-config.vh

@@ -45,10 +45,6 @@
 //`define N_SUPPORTED ((MISA >> 13) % 2 == 1)
 `define N_SUPPORTED 0
 
-`define M_MODE (2'b11)
-`define S_MODE (2'b01)
-`define U_MODE (2'b00)
-
 // Microarchitectural Features
 `define UARCH_PIPELINED 1
 `define UARCH_SUPERSCALR 0

wally-pipelined/config/rv64BP/wally-config.vh

@@ -47,10 +47,6 @@
 //`define N_SUPPORTED ((MISA >> 13) % 2 == 1)
 `define N_SUPPORTED 0
 
-`define M_MODE (2'b11)
-`define S_MODE (2'b01)
-`define U_MODE (2'b00)
-
 // Microarchitectural Features
 `define UARCH_PIPELINED 1
 `define UARCH_SUPERSCALR 0

wally-pipelined/config/rv64ic/wally-config.vh

@@ -46,10 +46,6 @@
 //`define N_SUPPORTED ((MISA >> 13) % 2 == 1)
 `define N_SUPPORTED 0
 
-`define M_MODE (2'b11)
-`define S_MODE (2'b01)
-`define U_MODE (2'b00)
-
 // Microarchitectural Features
 `define UARCH_PIPELINED 1
 `define UARCH_SUPERSCALR 0

wally-pipelined/config/rv64icfd/wally-config.vh

@@ -46,10 +46,6 @@
 //`define N_SUPPORTED ((MISA >> 13) % 2 == 1)
 `define N_SUPPORTED 0
 
-`define M_MODE (2'b11)
-`define S_MODE (2'b01)
-`define U_MODE (2'b00)
-
 // Microarchitectural Features
 `define UARCH_PIPELINED 1
 `define UARCH_SUPERSCALR 0

wally-pipelined/config/shared/wally-constants.vh

@@ -45,3 +45,9 @@
 `define SV39 8
 `define SV48 9
 
+
+// constants defining different privilege modes
+// defined in Table 1.1 of the privileged spec
+`define M_MODE (2'b11)
+`define S_MODE (2'b01)
+`define U_MODE (2'b00)

wally-pipelined/src/mmu/pmpchecker.sv

@@ -27,6 +27,7 @@
 ///////////////////////////////////////////
 
 `include "wally-config.vh"
+`include "wally-constants.vh"
 
 module pmpchecker (
   input  logic             clk, reset,

wally-pipelined/src/privileged/csr.sv

@@ -26,6 +26,7 @@
 ///////////////////////////////////////////
 
 `include "wally-config.vh"
+`include "wally-constants.vh"
 
 module csr #(parameter
   // Constants

wally-pipelined/src/privileged/csrc.sv

@@ -28,6 +28,7 @@
 ///////////////////////////////////////////
 
 `include "wally-config.vh"
+`include "wally-constants.vh"
 
 module csrc ( 
     input logic 	     clk, reset,

wally-pipelined/src/privileged/csrsr.sv

@@ -25,6 +25,7 @@
 ///////////////////////////////////////////
 
 `include "wally-config.vh"
+`include "wally-constants.vh"
 
 module csrsr (
   input  logic             clk, reset, StallW,

wally-pipelined/src/privileged/privdec.sv

@@ -25,6 +25,7 @@
 ///////////////////////////////////////////
 
 `include "wally-config.vh"
+`include "wally-constants.vh"
 
 module privdec (
   input  logic [31:20] InstrM,

wally-pipelined/src/privileged/privileged.sv

@@ -25,6 +25,7 @@
 ///////////////////////////////////////////
 
 `include "wally-config.vh"
+`include "wally-constants.vh"
 
 // *** remove signals not needed by PMA/PMP now that it is moved
 module privileged (

wally-pipelined/src/privileged/trap.sv

@@ -25,6 +25,7 @@
 ///////////////////////////////////////////
 
 `include "wally-config.vh"
+`include "wally-constants.vh"
 
 module trap (
   input  logic             clk, reset, 

wally-pipelined/testbench/testbench-busybear.sv

@@ -1,4 +1,5 @@
 `include "wally-config.vh"
+`include "wally-constants.vh"
 
 
 module testbench();