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

Merge pull request #4 from ucb-bar/chisel3

Browse Source 
Work around Chisel3's lack of 0-width wires
This commit is contained in:
Andrew Waterman 2016-03-15 17:30:34 -07:00
commit 137b77d780
1 changed files with 36 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
groundtest/src/main/scala/generator.scala
View File

@ -59,10 +59,23 @@ class UncachedTileLinkGenerator(id: Int)
io.finished := (state === s_finished) io.finished := (state === s_finished)
val full_addr = UInt(startAddress) + Cat( val part_of_full_addr =
req_cnt, UInt(id, log2Ceil(nGens)), if (genCached) {
(if (genCached) UInt(0, 1) else UInt(0, 0)), Cat(req_cnt,
UInt(0, width = 1),
UInt(0, wordOffset)) UInt(0, wordOffset))
} else {
Cat(req_cnt,
UInt(0, wordOffset))
}
val another_part_of_full_addr =
if (log2Ceil(nGens) > 0) {
Cat(UInt(id, log2Ceil(nGens)),
part_of_full_addr)
} else {
part_of_full_addr
}
val full_addr = UInt(startAddress) + another_part_of_full_addr
val addr_block = full_addr >> UInt(tlBlockOffset) val addr_block = full_addr >> UInt(tlBlockOffset)
val addr_beat = full_addr(tlBlockOffset - 1, tlByteAddrBits) val addr_beat = full_addr(tlBlockOffset - 1, tlByteAddrBits)
@ -122,10 +135,25 @@ class HellaCacheGenerator(id: Int)
val (req_cnt, req_wrap) = Counter(io.mem.resp.valid, maxRequests) val (req_cnt, req_wrap) = Counter(io.mem.resp.valid, maxRequests)
val req_addr = UInt(startAddress) + Cat( val part_of_req_addr =
req_cnt, UInt(id, log2Ceil(nGens)), if (log2Ceil(nGens) > 0) {
(if (genUncached) UInt(1, 1) else UInt(0, 0)), if (genUncached) {
Cat(UInt(id, log2Ceil(nGens)),
UInt(1, width = 1),
UInt(0, wordOffset)) UInt(0, wordOffset))
} else {
Cat(UInt(id, log2Ceil(nGens)),
UInt(0, wordOffset))
}
} else {
if (genUncached) {
Cat(UInt(1, width = 1),
UInt(0, wordOffset))
} else {
UInt(0, wordOffset)
}
}
val req_addr = UInt(startAddress) + Cat(req_cnt, part_of_req_addr)
val req_data = Cat(UInt(id, log2Up(nGens)), req_cnt, req_addr) val req_data = Cat(UInt(id, log2Up(nGens)), req_cnt, req_addr)
io.mem.req.valid := sending && !io.finished io.mem.req.valid := sending && !io.finished