From 401a4e22c3e19d3ffae7d4360890fe4e4c44c959 Mon Sep 17 00:00:00 2001 From: Ian Kersz Date: Thu, 20 Mar 2025 12:26:34 -0300 Subject: [PATCH] Propagated M_HART_ID for parameterization --- rtl/csr.sv | 5 +++-- rtl/execute.sv | 6 ++++-- rtl/nox.sv | 6 ++++-- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/rtl/csr.sv b/rtl/csr.sv index a2c6e7f..19b5091 100644 --- a/rtl/csr.sv +++ b/rtl/csr.sv @@ -11,7 +11,8 @@ module csr import nox_utils_pkg::*; #( parameter int SUPPORT_DEBUG = 1, - parameter int MTVEC_DEFAULT_VAL = 'h1000 // 4KB + parameter int MTVEC_DEFAULT_VAL = 'h1000, // 4KB + parameter int unsigned M_HART_ID = `M_HART_ID )( input clk, input rst, @@ -178,7 +179,7 @@ module csr //RV_CSR_MVENDORID: csr_rd_o = `M_VENDOR_ID; //RV_CSR_MARCHID: csr_rd_o = `M_ARCH_ID; //RV_CSR_MIMPLID: csr_rd_o = `M_IMPL_ID; - RV_CSR_MHARTID: csr_rd_o = `M_HART_ID; + RV_CSR_MHARTID: csr_rd_o = M_HART_ID; default: csr_rd_o = rdata_t'('0); endcase diff --git a/rtl/execute.sv b/rtl/execute.sv index cb86604..7b3bcdb 100644 --- a/rtl/execute.sv +++ b/rtl/execute.sv @@ -11,7 +11,8 @@ module execute import nox_utils_pkg::*; #( parameter int SUPPORT_DEBUG = 1, - parameter int MTVEC_DEFAULT_VAL = 'h1000 // 4KB + parameter int MTVEC_DEFAULT_VAL = 'h1000, // 4KB + parameter int unsigned M_HART_ID = `M_HART_ID )( input clk, input rst, @@ -229,7 +230,8 @@ module execute csr #( .SUPPORT_DEBUG (SUPPORT_DEBUG), - .MTVEC_DEFAULT_VAL (MTVEC_DEFAULT_VAL) + .MTVEC_DEFAULT_VAL (MTVEC_DEFAULT_VAL), + .M_HART_ID (M_HART_ID) ) u_csr ( .clk (clk), .rst (rst), diff --git a/rtl/nox.sv b/rtl/nox.sv index ad6db6c..90c0063 100644 --- a/rtl/nox.sv +++ b/rtl/nox.sv @@ -16,7 +16,8 @@ module nox parameter int TRAP_ON_MIS_LSU_ADDR = 1, // Trap in case of misaligned addr on LSU parameter int TRAP_ON_LSU_ERROR = 1, // Trap in case of LSU error parameter int FETCH_IF_ID = 0, - parameter int LSU_IF_ID = 1 + parameter int LSU_IF_ID = 1, + parameter int unsigned M_HART_ID = `M_HART_ID )( input clk, input arst, @@ -173,7 +174,8 @@ module nox execute #( .SUPPORT_DEBUG (SUPPORT_DEBUG), - .MTVEC_DEFAULT_VAL (MTVEC_DEFAULT_VAL) + .MTVEC_DEFAULT_VAL (MTVEC_DEFAULT_VAL), + .M_HART_ID (M_HART_ID) ) u_execute ( .clk (clk), .rst (rst),