From 22e8e06ac7f0c095794afc7eb3b78c6346af74bd Mon Sep 17 00:00:00 2001 From: Kip Macsai-Goren Date: Fri, 4 Jun 2021 17:55:07 -0400 Subject: [PATCH] moved privilege dfinitions into wally-constants, upgraded relevant includes --- wally-pipelined/config/buildroot/wally-config.vh | 4 ---- wally-pipelined/config/busybear/wally-config.vh | 4 ---- wally-pipelined/config/coremark-64i/wally-config.vh | 4 ---- wally-pipelined/config/coremark/wally-config.vh | 4 ---- wally-pipelined/config/coremark_bare/wally-config.vh | 4 ---- wally-pipelined/config/rv32ic/wally-config.vh | 4 ---- wally-pipelined/config/rv64BP/wally-config.vh | 4 ---- wally-pipelined/config/rv64ic/wally-config.vh | 4 ---- wally-pipelined/config/rv64icfd/wally-config.vh | 4 ---- wally-pipelined/config/shared/wally-constants.vh | 6 ++++++ wally-pipelined/src/mmu/pmpchecker.sv | 1 + wally-pipelined/src/privileged/csr.sv | 1 + wally-pipelined/src/privileged/csrc.sv | 1 + wally-pipelined/src/privileged/csrsr.sv | 1 + wally-pipelined/src/privileged/privdec.sv | 1 + wally-pipelined/src/privileged/privileged.sv | 1 + wally-pipelined/src/privileged/trap.sv | 1 + wally-pipelined/testbench/testbench-busybear.sv | 1 + 18 files changed, 14 insertions(+), 36 deletions(-) diff --git a/wally-pipelined/config/buildroot/wally-config.vh b/wally-pipelined/config/buildroot/wally-config.vh index 7e8a01c4e..b8e77032d 100644 --- a/wally-pipelined/config/buildroot/wally-config.vh +++ b/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 diff --git a/wally-pipelined/config/busybear/wally-config.vh b/wally-pipelined/config/busybear/wally-config.vh index 0d3cc4f01..114d3cb47 100644 --- a/wally-pipelined/config/busybear/wally-config.vh +++ b/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 diff --git a/wally-pipelined/config/coremark-64i/wally-config.vh b/wally-pipelined/config/coremark-64i/wally-config.vh index 367289943..8edc381e2 100644 --- a/wally-pipelined/config/coremark-64i/wally-config.vh +++ b/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 diff --git a/wally-pipelined/config/coremark/wally-config.vh b/wally-pipelined/config/coremark/wally-config.vh index 0e89b3d07..d515e7222 100644 --- a/wally-pipelined/config/coremark/wally-config.vh +++ b/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 diff --git a/wally-pipelined/config/coremark_bare/wally-config.vh b/wally-pipelined/config/coremark_bare/wally-config.vh index 800cdead4..a175d1f4c 100644 --- a/wally-pipelined/config/coremark_bare/wally-config.vh +++ b/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 diff --git a/wally-pipelined/config/rv32ic/wally-config.vh b/wally-pipelined/config/rv32ic/wally-config.vh index 170b4a8cd..d629a6e2a 100644 --- a/wally-pipelined/config/rv32ic/wally-config.vh +++ b/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 diff --git a/wally-pipelined/config/rv64BP/wally-config.vh b/wally-pipelined/config/rv64BP/wally-config.vh index 688ea8658..eb0fd7c2c 100644 --- a/wally-pipelined/config/rv64BP/wally-config.vh +++ b/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 diff --git a/wally-pipelined/config/rv64ic/wally-config.vh b/wally-pipelined/config/rv64ic/wally-config.vh index dad3948fe..8f8ef85c8 100644 --- a/wally-pipelined/config/rv64ic/wally-config.vh +++ b/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 diff --git a/wally-pipelined/config/rv64icfd/wally-config.vh b/wally-pipelined/config/rv64icfd/wally-config.vh index f5607a8c1..7b769faa0 100644 --- a/wally-pipelined/config/rv64icfd/wally-config.vh +++ b/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 diff --git a/wally-pipelined/config/shared/wally-constants.vh b/wally-pipelined/config/shared/wally-constants.vh index be0f7688b..3e3358d29 100644 --- a/wally-pipelined/config/shared/wally-constants.vh +++ b/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) \ No newline at end of file diff --git a/wally-pipelined/src/mmu/pmpchecker.sv b/wally-pipelined/src/mmu/pmpchecker.sv index 261475a4d..9d7b3ce9c 100644 --- a/wally-pipelined/src/mmu/pmpchecker.sv +++ b/wally-pipelined/src/mmu/pmpchecker.sv @@ -27,6 +27,7 @@ /////////////////////////////////////////// `include "wally-config.vh" +`include "wally-constants.vh" module pmpchecker ( input logic clk, reset, diff --git a/wally-pipelined/src/privileged/csr.sv b/wally-pipelined/src/privileged/csr.sv index fd7f204eb..2cc0b5720 100644 --- a/wally-pipelined/src/privileged/csr.sv +++ b/wally-pipelined/src/privileged/csr.sv @@ -26,6 +26,7 @@ /////////////////////////////////////////// `include "wally-config.vh" +`include "wally-constants.vh" module csr #(parameter // Constants diff --git a/wally-pipelined/src/privileged/csrc.sv b/wally-pipelined/src/privileged/csrc.sv index fa5eea1a4..e0e66285b 100644 --- a/wally-pipelined/src/privileged/csrc.sv +++ b/wally-pipelined/src/privileged/csrc.sv @@ -28,6 +28,7 @@ /////////////////////////////////////////// `include "wally-config.vh" +`include "wally-constants.vh" module csrc ( input logic clk, reset, diff --git a/wally-pipelined/src/privileged/csrsr.sv b/wally-pipelined/src/privileged/csrsr.sv index 0b36df491..93d5dc655 100644 --- a/wally-pipelined/src/privileged/csrsr.sv +++ b/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, diff --git a/wally-pipelined/src/privileged/privdec.sv b/wally-pipelined/src/privileged/privdec.sv index 1330a62bc..4fa272da9 100644 --- a/wally-pipelined/src/privileged/privdec.sv +++ b/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, diff --git a/wally-pipelined/src/privileged/privileged.sv b/wally-pipelined/src/privileged/privileged.sv index 0ca8ba4c6..d01a739f7 100644 --- a/wally-pipelined/src/privileged/privileged.sv +++ b/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 ( diff --git a/wally-pipelined/src/privileged/trap.sv b/wally-pipelined/src/privileged/trap.sv index ee696d829..1a3cbbf07 100644 --- a/wally-pipelined/src/privileged/trap.sv +++ b/wally-pipelined/src/privileged/trap.sv @@ -25,6 +25,7 @@ /////////////////////////////////////////// `include "wally-config.vh" +`include "wally-constants.vh" module trap ( input logic clk, reset, diff --git a/wally-pipelined/testbench/testbench-busybear.sv b/wally-pipelined/testbench/testbench-busybear.sv index 9d150731e..7c9232df7 100644 --- a/wally-pipelined/testbench/testbench-busybear.sv +++ b/wally-pipelined/testbench/testbench-busybear.sv @@ -1,4 +1,5 @@ `include "wally-config.vh" +`include "wally-constants.vh" module testbench();