From 9c7fbc44e0d292408bba1f5b0d1c443aaae6beac Mon Sep 17 00:00:00 2001 From: Kristine Dosvik Date: Wed, 13 Sep 2023 06:50:23 +0200 Subject: [PATCH 1/2] use correct csr privlevel path Signed-off-by: Kristine Dosvik --- cv32e40s/tb/uvmt/uvmt_cv32e40s_tb.sv | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cv32e40s/tb/uvmt/uvmt_cv32e40s_tb.sv b/cv32e40s/tb/uvmt/uvmt_cv32e40s_tb.sv index d1bd86d09e..c10a3116a6 100644 --- a/cv32e40s/tb/uvmt/uvmt_cv32e40s_tb.sv +++ b/cv32e40s/tb/uvmt/uvmt_cv32e40s_tb.sv @@ -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), @@ -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), From 5d8a77cf1fa8475418599740b7e7b2ccf663ca46 Mon Sep 17 00:00:00 2001 From: Kristine Dosvik Date: Wed, 13 Sep 2023 11:02:57 +0200 Subject: [PATCH 2/2] update core hash Signed-off-by: Kristine Dosvik --- cv32e40s/sim/ExternalRepos.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cv32e40s/sim/ExternalRepos.mk b/cv32e40s/sim/ExternalRepos.mk index d3fe3666cd..fa7a997dbe 100644 --- a/cv32e40s/sim/ExternalRepos.mk +++ b/cv32e40s/sim/ExternalRepos.mk @@ -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