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

In TLBPermissions, don't merge regions of different types

Browse Source
This commit is contained in:
Andrew Waterman 2017-04-14 16:18:11 -07:00 committed by Andrew Waterman
parent 7871ec82c4
commit 74a7838de0
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/scala/rocket/TLBPermissions.scala
View File

@ -18,6 +18,7 @@ case class TLBPermissions(
object TLBPageLookup object TLBPageLookup
{ {
private case class TLBFixedPermissions( private case class TLBFixedPermissions(
t: RegionType.T,
r: Boolean, // readable r: Boolean, // readable
w: Boolean, // writeable w: Boolean, // writeable
x: Boolean, // executable x: Boolean, // executable
@ -47,6 +48,7 @@ object TLBPageLookup
require (m.supportsAcquireT || !m.supportsAcquireB, s"MemoryMap region ${m.name} supports AcquireB (cached read) but not AcquireT (cached write)... and rocket assumes this") require (m.supportsAcquireT || !m.supportsAcquireB, s"MemoryMap region ${m.name} supports AcquireB (cached read) but not AcquireT (cached write)... and rocket assumes this")
(m.address, TLBFixedPermissions( (m.address, TLBFixedPermissions(
t = m.regionType,
r = m.supportsGet || m.supportsAcquireB, // if cached, never uses Get r = m.supportsGet || m.supportsAcquireB, // if cached, never uses Get
w = m.supportsPutFull || m.supportsAcquireT, // if cached, never uses Put w = m.supportsPutFull || m.supportsAcquireT, // if cached, never uses Put
x = m.executable, x = m.executable,