Skip to content

Propagated M_HART_ID for parameterization #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
aignacio merged 1 commit into from
Mar 25, 2025
Merged

Propagated M_HART_ID for parameterization #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions rtl/csr.sv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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

Expand Down
6 changes: 4 additions & 2 deletions rtl/execute.sv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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),
Expand Down
6 changes: 4 additions & 2 deletions rtl/nox.sv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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),
Expand Down