riscv/rocket-chip
1
0
Fork 0
Code Releases Activity

make sure access to invalid physical address treated as exception

Browse Source
This commit is contained in:
Howard Mao
2015-09-22 09:42:27 -07:00
parent 16c748576a
commit 9eb988a4c6
4 changed files with 17 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
rocket/src/main/scala/nbdcache.scala
View File

@ -32,7 +32,6 @@ abstract trait L1HellaCacheParameters extends L1CacheParameters {
val sdqDepth = params(StoreDataQueueDepth)
val nMSHRs = params(NMSHRs)
val nIOMSHRs = params(NIOMSHRs)
val mmioBase = params(MMIOBase)
}
abstract class L1HellaCacheBundle extends Bundle with L1HellaCacheParameters
@ -788,8 +787,8 @@ class HellaCache extends L1HellaCacheModule {
io.cpu.xcpt.ma.ld := s1_read && misaligned
io.cpu.xcpt.ma.st := s1_write && misaligned
io.cpu.xcpt.pf.ld := !s1_req.phys && s1_read && dtlb.io.resp.xcpt_ld
io.cpu.xcpt.pf.st := !s1_req.phys && s1_write && dtlb.io.resp.xcpt_st
io.cpu.xcpt.pf.ld := s1_read && dtlb.io.resp.xcpt_ld
io.cpu.xcpt.pf.st := s1_write && dtlb.io.resp.xcpt_st
assert (!(Reg(next=
(io.cpu.xcpt.ma.ld || io.cpu.xcpt.ma.st || io.cpu.xcpt.pf.ld || io.cpu.xcpt.pf.st)) &&