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

diplomacy: add legalize method to AddressSet

Browse Source
This commit is contained in:
Henry Cook 2017-05-09 11:12:17 -07:00
parent 3af40bff8b
commit 5f3a4ada1b
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/scala/diplomacy/Parameters.scala
View File

@ -126,6 +126,9 @@ case class AddressSet(base: BigInt, mask: BigInt) extends Ordered[AddressSet]
def contains(x: BigInt) = ((x ^ base) & ~mask) == 0 def contains(x: BigInt) = ((x ^ base) & ~mask) == 0
def contains(x: UInt) = ((x ^ UInt(base)).zext() & SInt(~mask)) === SInt(0) def contains(x: UInt) = ((x ^ UInt(base)).zext() & SInt(~mask)) === SInt(0)
// turn x into an address contained in this set
def legalize(x: UInt): UInt = base.U | (mask.U & x)
// overlap iff bitwise: both care (~mask0 & ~mask1) => both equal (base0=base1) // overlap iff bitwise: both care (~mask0 & ~mask1) => both equal (base0=base1)
def overlaps(x: AddressSet) = (~(mask | x.mask) & (base ^ x.base)) == 0 def overlaps(x: AddressSet) = (~(mask | x.mask) & (base ^ x.base)) == 0
// contains iff bitwise: x.mask => mask && contains(x.base) // contains iff bitwise: x.mask => mask && contains(x.base)

4
src/main/scala/uncore/tilelink2/Fuzzer.scala
View File

@ -136,8 +136,8 @@ class TLFuzzer(
val log_op = noiseMaker(2, inc, 0) val log_op = noiseMaker(2, inc, 0)
val amo_size = UInt(2) + noiseMaker(1, inc, 0) // word or dword val amo_size = UInt(2) + noiseMaker(1, inc, 0) // word or dword
val size = noiseMaker(sizeBits, inc, 0) val size = noiseMaker(sizeBits, inc, 0)
val addrMask = overrideAddress.map(_.max.U).getOrElse(~UInt(0, addressBits)) val rawAddr = noiseMaker(addressBits, inc, 2)
val addr = noiseMaker(addressBits, inc, 2) & ~UIntToOH1(size, addressBits) & addrMask val addr = overrideAddress.map(_.legalize(rawAddr)).getOrElse(rawAddr) & ~UIntToOH1(size, addressBits)
val mask = noiseMaker(beatBytes, inc_beat, 2) & edge.mask(addr, size) val mask = noiseMaker(beatBytes, inc_beat, 2) & edge.mask(addr, size)
val data = noiseMaker(dataBits, inc_beat, 2) val data = noiseMaker(dataBits, inc_beat, 2)