Skip to content
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.

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

use correct csr privlevel path #2196

Merged
merged 2 commits into from
Sep 13, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion cv32e40s/sim/ExternalRepos.mk
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ export SHELL = /bin/bash

CV_CORE_REPO ?= https://github.com/openhwgroup/cv32e40s
CV_CORE_BRANCH ?= master
CV_CORE_HASH ?= 41cbecf7690efd0ccd75b32bc31aab09c5dede56
CV_CORE_HASH ?= 9a66cb971edca4613d5df12a869db3511ee24a75
CV_CORE_TAG ?= none

#RISCVDV_REPO ?= https://github.com/google/riscv-dv
Expand Down
4 changes: 2 additions & 2 deletions cv32e40s/tb/uvmt/uvmt_cv32e40s_tb.sv
Original file line number Diff line number Diff line change
Expand Up @@ -878,7 +878,7 @@ module uvmt_cv32e40s_tb;

//CSRs:
.mstateen0 (core_i.cs_registers_i.mstateen0_csr_i.rdata_q),
.priv_lvl (core_i.cs_registers_i.priv_lvl_i.rdata_q),
.priv_lvl (core_i.cs_registers_i.privlvl_user.priv_lvl_i.rdata_q),
.jvt (core_i.cs_registers_i.jvt_csr_i.rdata_q),
.mstatus (core_i.cs_registers_i.mstatus_csr_i.rdata_q),
.cpuctrl (core_i.cs_registers_i.xsecure.cpuctrl_csr_i.rdata_q),
Expand All @@ -888,7 +888,7 @@ module uvmt_cv32e40s_tb;

//Shadows:
.mstateen0_shadow (core_i.cs_registers_i.mstateen0_csr_i.gen_hardened.shadow_q),
.priv_lvl_shadow (core_i.cs_registers_i.priv_lvl_i.gen_hardened.shadow_q),
.priv_lvl_shadow (core_i.cs_registers_i.privlvl_user.priv_lvl_i.gen_hardened.shadow_q),
.jvt_shadow (core_i.cs_registers_i.jvt_csr_i.gen_hardened.shadow_q),
.mstatus_shadow (core_i.cs_registers_i.mstatus_csr_i.gen_hardened.shadow_q),
.cpuctrl_shadow (core_i.cs_registers_i.xsecure.cpuctrl_csr_i.gen_hardened.shadow_q),
Expand Down