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

When SFENCE.VMA has rs2 != x0, don't flush global mappings

Browse Source
This commit is contained in:
Andrew Waterman 2017-03-15 12:50:05 -07:00
parent 1b950128e1
commit 78f9f6b9ef
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/scala/rocket/TLB.scala
View File

@ -115,6 +115,7 @@ class TLB(entries: Int)(implicit edge: TLEdgeOut, p: Parameters) extends CoreMod
// permission bit arrays // permission bit arrays
val u_array = Reg(UInt(width = totalEntries)) // user permission val u_array = Reg(UInt(width = totalEntries)) // user permission
val g_array = Reg(UInt(width = totalEntries)) // global mapping
val sw_array = Reg(UInt(width = totalEntries)) // write permission val sw_array = Reg(UInt(width = totalEntries)) // write permission
val sx_array = Reg(UInt(width = totalEntries)) // execute permission val sx_array = Reg(UInt(width = totalEntries)) // execute permission
val sr_array = Reg(UInt(width = totalEntries)) // read permission val sr_array = Reg(UInt(width = totalEntries)) // read permission
@ -130,6 +131,7 @@ class TLB(entries: Int)(implicit edge: TLEdgeOut, p: Parameters) extends CoreMod
val mask = UIntToOH(waddr) val mask = UIntToOH(waddr)
valid := valid | mask valid := valid | mask
u_array := Mux(pte.u, u_array | mask, u_array & ~mask) u_array := Mux(pte.u, u_array | mask, u_array & ~mask)
g_array := Mux(pte.g, g_array | mask, g_array & ~mask)
sw_array := Mux(pte.sw() && (isSpecial || prot_w), sw_array | mask, sw_array & ~mask) sw_array := Mux(pte.sw() && (isSpecial || prot_w), sw_array | mask, sw_array & ~mask)
sx_array := Mux(pte.sx() && (isSpecial || prot_x), sx_array | mask, sx_array & ~mask) sx_array := Mux(pte.sx() && (isSpecial || prot_x), sx_array | mask, sx_array & ~mask)
sr_array := Mux(pte.sr() && (isSpecial || prot_r), sr_array | mask, sr_array & ~mask) sr_array := Mux(pte.sr() && (isSpecial || prot_r), sr_array | mask, sr_array & ~mask)
@ -196,10 +198,11 @@ class TLB(entries: Int)(implicit edge: TLEdgeOut, p: Parameters) extends CoreMod
state := s_ready state := s_ready
} }
when (sfence && io.req.bits.sfence.bits.rs1) { when (sfence) {
valid := valid & ~hits(totalEntries-1, 0) valid := Mux(io.req.bits.sfence.bits.rs1, valid & ~hits(totalEntries-1, 0),
Mux(io.req.bits.sfence.bits.rs2, valid & g_array, 0))
} }
when (sfence && !io.req.bits.sfence.bits.rs1 || multipleHits) { when (multipleHits) {
valid := 0 valid := 0
} }
} }