From c7235fecb59d34a0c500a218cb2adbbc36a41ac0 Mon Sep 17 00:00:00 2001 From: Yunsup Lee Date: Sun, 25 Oct 2015 10:23:46 -0700 Subject: [PATCH] further state optimization in CSRfile when not UseVM --- rocket/src/main/scala/csr.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rocket/src/main/scala/csr.scala b/rocket/src/main/scala/csr.scala index 5898941c..627831a3 100644 --- a/rocket/src/main/scala/csr.scala +++ b/rocket/src/main/scala/csr.scala @@ -293,7 +293,7 @@ class CSRFile(implicit p: Parameters) extends CoreModule()(p) io.fatc := insn_sfence_vm io.evec := Mux(io.exception || csr_xcpt, (reg_mstatus.prv << 6) + MTVEC, Mux(maybe_insn_redirect_trap, reg_stvec.sextTo(vaddrBitsExtended), - Mux(reg_mstatus.prv(1), reg_mepc, reg_sepc))) + Mux(reg_mstatus.prv(1) || Bool(!p(UseVM)), reg_mepc, reg_sepc))) io.ptbr := reg_sptbr io.csr_xcpt := csr_xcpt io.eret := insn_ret || insn_redirect_trap